Introduce a mac_address_t on the API and in VPP

Change-Id: I05d6c2cb5d34de469eb050e4ee10dc6b954c986d
Signed-off-by: Neale Ranns <neale.ranns@cisco.com>

5 files changed, 171 insertions, 2 deletions

diff --git a/extras/vom/vom/Makefile.am b/extras/vom/vom/Makefile.am
index f976b6fad90..797bef0f611 100644
--- a/extras/vom/vom/Makefile.am
+++ b/extras/vom/vom/Makefile.am
@@ -80,6 +80,7 @@ endif
 
 libvom_la_SOURCES = 			\
 	types.cpp			\
+	api_types.cpp			\
 	arp_proxy_binding_cmds.cpp 	\
 	arp_proxy_binding.cpp		\
 	arp_proxy_config_cmds.cpp	\
diff --git a/extras/vom/vom/api_types.cpp b/extras/vom/vom/api_types.cpp
new file mode 100644
index 00000000000..1b9ff2913a1
--- /dev/null
+++ b/extras/vom/vom/api_types.cpp
@@ -0,0 +1,123 @@
+/*
+ * Copyright (c) 2018 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <vom/api_types.hpp>
+
+namespace VOM {
+
+static vapi_type_ip4_address
+to_api(const boost::asio::ip::address_v4& a)
+{
+  vapi_type_ip4_address v;
+
+  std::copy_n(a.to_bytes().data(), 4, v.address);
+
+  return v;
+}
+
+static vapi_type_ip6_address
+to_api(const boost::asio::ip::address_v6& a)
+{
+  vapi_type_ip6_address v;
+
+  std::copy_n(a.to_bytes().data(), 16, v.address);
+
+  return v;
+}
+
+vapi_type_address
+to_api(const ip_address_t& a)
+{
+  if (a.is_v4()) {
+    vapi_type_address v = {
+      .af = ADDRESS_IP4,
+      .un =
+        {
+          .ip4 = to_api(a.to_v4()),
+        },
+    };
+    return (v);
+  } else {
+    vapi_type_address v = {
+      .af = ADDRESS_IP6,
+      .un =
+        {
+          .ip6 = to_api(a.to_v6()),
+        },
+    };
+    return (v);
+  }
+}
+
+ip_address_t
+from_api(const vapi_type_address& v)
+{
+  boost::asio::ip::address addr;
+
+  if (ADDRESS_IP6 == v.af) {
+    std::array<uint8_t, 16> a;
+    std::copy(v.un.ip6.address, v.un.ip6.address + 16, std::begin(a));
+    boost::asio::ip::address_v6 v6(a);
+    addr = v6;
+  } else {
+    std::array<uint8_t, 4> a;
+    std::copy(v.un.ip6.address, v.un.ip6.address + 4, std::begin(a));
+    boost::asio::ip::address_v4 v4(a);
+    addr = v4;
+  }
+
+  return addr;
+}
+
+vapi_type_mac_address
+to_api(const mac_address_t& a)
+{
+  vapi_type_mac_address v;
+
+  std::copy(std::begin(a.bytes), std::end(a.bytes), v.bytes);
+
+  return (v);
+}
+
+mac_address_t
+from_api(const vapi_type_mac_address& v)
+{
+  return mac_address_t(v.bytes);
+}
+
+route::prefix_t
+from_api(const vapi_type_prefix& v)
+{
+  return route::prefix_t(from_api(v.address), v.address_length);
+}
+
+vapi_type_prefix
+to_api(const route::prefix_t& p)
+{
+  vapi_type_prefix v = {
+    .address = to_api(p.address()), .address_length = p.mask_width(),
+  };
+
+  return v;
+}
+};
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "mozilla")
+ * End:
+ */
diff --git a/extras/vom/vom/api_types.hpp b/extras/vom/vom/api_types.hpp
new file mode 100644
index 00000000000..b555fc3c752
--- /dev/null
+++ b/extras/vom/vom/api_types.hpp
@@ -0,0 +1,45 @@
+/*
+ * Copyright (c) 2018 Cisco and/or its affiliates.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at:
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <boost/asio/ip/address.hpp>
+#include <vom/prefix.hpp>
+#include <vom/types.hpp>
+
+#include <vapi/ip.api.vapi.hpp>
+
+namespace VOM {
+
+typedef boost::asio::ip::address ip_address_t;
+
+vapi_type_address to_api(const ip_address_t& a);
+
+ip_address_t from_api(const vapi_type_address& v);
+
+vapi_type_mac_address to_api(const mac_address_t& a);
+
+mac_address_t from_api(const vapi_type_mac_address& v);
+
+route::prefix_t from_api(const vapi_type_prefix&);
+
+vapi_type_prefix to_api(const route::prefix_t&);
+};
+
+/*
+ * fd.io coding-style-patch-verification: ON
+ *
+ * Local Variables:
+ * eval: (c-set-style "mozilla")
+ * End:
+ */
diff --git a/extras/vom/vom/types.cpp b/extras/vom/vom/types.cpp
index c6093ebd15d..a67a7f360f9 100644
--- a/extras/vom/vom/types.cpp
+++ b/extras/vom/vom/types.cpp
@@ -109,7 +109,7 @@ operator<<(std::ostream& os, const handle_t& h)
   return (os);
 }
 
-mac_address_t::mac_address_t(uint8_t b[6])
+mac_address_t::mac_address_t(const uint8_t b[6])
 {
   std::copy(b, b + 6, std::begin(bytes));
 }
diff --git a/extras/vom/vom/types.hpp b/extras/vom/vom/types.hpp
index 7b08d831352..ab214085d16 100644
--- a/extras/vom/vom/types.hpp
+++ b/extras/vom/vom/types.hpp
@@ -289,7 +289,7 @@ std::ostream& operator<<(std::ostream& os, const handle_t& h);
  */
 struct mac_address_t
 {
-  mac_address_t(uint8_t bytes[6]);
+  mac_address_t(const uint8_t bytes[6]);
   mac_address_t(const std::string& str);
   mac_address_t(std::initializer_list<uint8_t> bytes);
   /**