pcn-router: code updated

- Changed IP addresses and routes from the notation with the netmask to the notation with prefix length (CIDR).
- The new ports do not require a mandatory IP when they are created.
- Changed the name arp-entry in arp-table

Signed-off-by: Francesco Messina <francescomessina92@hotmail.com>

Author: francescomessina

src/polycubed/src/cube.cpp

@@ -164,9 +164,13 @@ std::shared_ptr<PortIface> Cube::add_port(const std::string &name,
     peerB.set_status(IFACE_STATUS::UP);
     peerA.set_namespace(prefix_ns + get_name());
     peerA.set_status(IFACE_STATUS::UP);
-    if (conf.count("ip") && conf.count("netmask")) {
-      int prefix = polycube::service::utils::get_netmask_length(conf.at("netmask").get<std::string>());
-      peerA.set_ip(conf.at("ip").get<std::string>(), prefix);
+    if (conf.count("ip")) {
+      std::string ip_address;
+      std::string netmask;
+      polycube::service::utils::split_ip_and_prefix(
+                conf.at("ip").get<std::string>(), ip_address, netmask);
+      int prefix = polycube::service::utils::get_netmask_length(netmask);
+      peerA.set_ip(ip_address, prefix);
     } else if (conf.count("ipv6")) {
       peerA.set_ipv6(conf.at("ipv6").get<std::string>());
     }

src/services/pcn-router/datamodel/router.yang

@@ -19,35 +19,19 @@ module router {
 
   uses "polycube-standard-base:standard-base-yang-module" {
      augment ports {
-       leaf ip {
-        type inet:ipv4-address;
-        mandatory true;
-        description "IP address of the port";
-        polycube-base:cli-example "207.46.130.1";
-      }
-
-      leaf netmask {
-        type inet:ipv4-address;
-        mandatory true;
-        description "Netmask of the port";
-        polycube-base:cli-example "255.255.255.0";
+      leaf ip {
+        type inet:ipv4-prefix;
+        description "IP address and prefix of the port";
+        polycube-base:cli-example "10.0.0.1/24";
       }
 
       list secondaryip {
-        description "Secondary IP address for the port";
-        key "ip netmask";
+        description "Additional IP addresses for the port";
+        key "ip";
         leaf ip {
-          type inet:ipv4-address;
-          mandatory true;
-          description "Seconadary IP address of the port";
-          polycube-base:cli-example "207.46.131.1";
-        }
-
-        leaf netmask {
-          type inet:ipv4-address;
-          mandatory true;
-          description "Secondary netmask of the port";
-          polycube-base:cli-example "255.255.255.0";
+          type inet:ipv4-prefix;
+          description "Secondary IP address and prefix of the port";
+          polycube-base:cli-example "10.0.0.2/24";
         }
       }
 
@@ -60,20 +44,13 @@ module router {
   }
 
   list route {
-    key "network netmask nexthop";
+    key "network nexthop";
     description "Entry associated with the routing table";
     leaf network {
-      type inet:ipv4-address;
+      type inet:ipv4-prefix;
       mandatory true;
       description "Destination network IP";
-      polycube-base:cli-example "123.13.34.0";
-    }
-
-    leaf netmask {
-      type inet:ipv4-address;
-      mandatory true;
-      description "Destination network netmask";
-      polycube-base:cli-example "255.255.255.0";
+      polycube-base:cli-example "10.0.0.0/24";
     }
 
     leaf nexthop {
@@ -99,7 +76,7 @@ module router {
     }
   }
 
-  list arp-entry {
+  list arp-table {
     key "address";
     description "Entry associated with the ARP table";
     leaf address {
@@ -110,7 +87,7 @@ module router {
     }
 
     leaf mac {
-      type string;
+      type yang:mac-address;
       mandatory true;
       description "Destination MAC address";
       polycube-base:cli-example "C5:13:2D:36:27:9B";

src/services/pcn-router/src/ArpEntry.cpp

@@ -0,0 +1,54 @@
+/*
+ * Copyright 2018 The Polycube Authors
+ *
+ * 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.
+ */
+
+// TODO: Modify these methods with your own implementation
+
+#include "ArpTable.h"
+#include "Router.h"
+
+ArpTable::ArpTable(Router &parent, const ArpTableJsonObject &conf)
+    : ArpTableBase(parent) {
+  logger()->info("Creating ArpTable instance");
+}
+
+ArpTable::ArpTable(Router &parent, const std::string &mac,
+                   const std::string &ip, const std::string &interface)
+    : ArpTableBase(parent), mac_(mac), ip_(ip), interface_(interface) {}
+
+ArpTable::~ArpTable() {}
+
+std::string ArpTable::getAddress() {
+  // This method retrieves the address value.
+  return ip_;
+}
+
+std::string ArpTable::getMac() {
+  // This method retrieves the mac value.
+  return mac_;
+}
+
+void ArpTable::setMac(const std::string &value) {
+  throw std::runtime_error("ArpTable::setMac: Method not implemented");
+}
+
+std::string ArpTable::getInterface() {
+  // This method retrieves the interface value.
+  return interface_;
+}
+
+void ArpTable::setInterface(const std::string &value) {
+  throw std::runtime_error("ArpTable::setInterface: Method not implemented");
+}

src/services/pcn-router/src/ArpTable.cpp

@@ -16,36 +16,28 @@
 
 #pragma once
 
-#include "../interface/ArpEntryInterface.h"
-#include "polycube/services/utils.h"
-
-#include <spdlog/spdlog.h>
+#include "../base/ArpTableBase.h"
 
 class Router;
 
-using namespace io::swagger::server::model;
+using namespace polycube::service::model;
 
 struct arp_entry {
   uint64_t mac;
   uint32_t port;
 } __attribute__((packed));
 
-class ArpEntry : public ArpEntryInterface {
+class ArpTable : public ArpTableBase {
  public:
-  ArpEntry(Router &parent, const ArpEntryJsonObject &conf);
-  ArpEntry(Router &parent, const std::string &mac, const std::string &ip,
-           const std::string &interface);
-  virtual ~ArpEntry();
-
-  std::shared_ptr<spdlog::logger> logger();
-  void update(const ArpEntryJsonObject &conf) override;
-  ArpEntryJsonObject toJsonObject() override;
+  ArpTable(Router &parent, const ArpTableJsonObject &conf);
+  ArpTable(Router &parent, const std::string &mac, const std::string &ip,
+          const std::string &interface);
+  virtual ~ArpTable();
 
   /// <summary>
-  /// Outgoing interface
+  /// Destination IP address
   /// </summary>
-  std::string getInterface() override;
-  void setInterface(const std::string &value) override;
+  std::string getAddress() override;
 
   /// <summary>
   /// Destination MAC address
@@ -54,13 +46,12 @@ class ArpEntry : public ArpEntryInterface {
   void setMac(const std::string &value) override;
 
   /// <summary>
-  /// Destination IP address
+  /// Outgoing interface
   /// </summary>
-  std::string getAddress() override;
+  std::string getInterface() override;
+  void setInterface(const std::string &value) override;
 
  private:
-  Router &parent_;
-
   std::string mac_;
   std::string ip_;
   std::string interface_;

src/services/pcn-router/src/ArpEntry.h src/services/pcn-router/src/ArpTable.hsrc/services/pcn-router/src/ArpEntry.h renamed to src/services/pcn-router/src/ArpTable.h

@@ -2,39 +2,44 @@ include(${PROJECT_SOURCE_DIR}/cmake/LoadFileAsVariable.cmake)
 
 aux_source_directory(serializer SERIALIZER_SOURCES)
 aux_source_directory(api API_SOURCES)
-aux_source_directory(default-src SRC_SOURCES)
+aux_source_directory(base BASE_SOURCES)
 
 include_directories(serializer)
-include_directories(interface)
-include_directories(default-src)
 include_directories(/usr/include/libnl3)
 
+if (NOT DEFINED POLYCUBE_STANDALONE_SERVICE OR POLYCUBE_STANDALONE_SERVICE)
+  find_package(PkgConfig REQUIRED)
+  pkg_check_modules(POLYCUBE libpolycube)
+  include_directories(${POLYCUBE_INCLUDE_DIRS})
+endif(NOT DEFINED POLYCUBE_STANDALONE_SERVICE OR POLYCUBE_STANDALONE_SERVICE)
+
 # Needed to load files as variables
 include_directories(${CMAKE_CURRENT_BINARY_DIR})
 
 add_library(pcn-router SHARED
   ${SERIALIZER_SOURCES}
   ${API_SOURCES}
-  ${SRC_SOURCES}
-  ArpEntry.cpp
+  ${BASE_SOURCES}
+  ArpTable.cpp
   Ports.cpp
   PortsSecondaryip.cpp
   Route.cpp
   Router.cpp
   Router-lib.cpp
   CircularBuffer.cpp
-  UtilityMethods.cpp)
+  Utils.cpp)
 
-# load ebpf datapath code in std::string variables
-load_file_as_variable(pcn-router Router_dp.c router_code)
+# load ebpf datapath code a variable
+load_file_as_variable(pcn-router
+  Router_dp.c
+  router_code)
 
 # load datamodel in a variable
-load_file_as_variable(pcn-router ../datamodel/router.yang router_datamodel)
+load_file_as_variable(pcn-router
+  ../datamodel/router.yang
+  router_datamodel)
 
-target_link_libraries(pcn-router
-  polycube
-  tins
-  uuid)
+target_link_libraries(pcn-router ${POLYCUBE_LIBRARIES})
 
 # Specify shared library install directory