Merge pull request #131 from polycube-network/pr/remove_mac_simple_br…

…idge

pcn-simplebridge: remove mac from ports

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

@@ -16,17 +16,7 @@ module simplebridge {
   polycube-base:service-name "simplebridge";
   polycube-base:service-min-kernel-version "4.11.0";
 
-  uses "polycube-standard-base:standard-base-yang-module" {
-    augment ports {
-      leaf mac {
-        type yang:mac-address;
-        description "MAC address of the port";
-        config true;
-        polycube-base:init-only-config;
-        polycube-base:cli-example "C5:13:2D:36:27:9B";
-      }
-    }
-  }
+  uses "polycube-standard-base:standard-base-yang-module";
 
   container fdb {
     leaf aging-time {

src/services/pcn-simplebridge/src/Ports.cpp

@@ -22,15 +22,7 @@
 Ports::Ports(polycube::service::Cube<Ports> &parent,
              std::shared_ptr<polycube::service::PortIface> port,
              const PortsJsonObject &conf)
-    : PortsBase(parent, port) {
-  // This MAC address is not used in the datapath. We set only the variable here
-  if (conf.macIsSet()) {
-    mac_ = conf.getMac();
-  } else {
-    mac_ = utils::get_random_mac();
-    logger()->info("[Ports] New port add with random mac: {0}", mac_);
-  }
-}
+    : PortsBase(parent, port) {}
 
 Ports::~Ports() {
   try {
@@ -53,9 +45,3 @@ Ports::~Ports() {
         e.what());
   }
 }
-
-std::string Ports::getMac() {
-  // This method retrieves the mac value.
-  return mac_;
-}
-

src/services/pcn-simplebridge/src/Ports.h

@@ -29,11 +29,6 @@ class Ports : public PortsBase {
       const PortsJsonObject &conf);
   virtual ~Ports();
 
-  /// <summary>
-  /// MAC address of the port
-  /// </summary>
-  std::string getMac() override;
-
  private:
   std::string mac_;
 };

src/services/pcn-simplebridge/src/api/SimplebridgeApi.cpp

@@ -486,31 +486,6 @@ Response read_simplebridge_ports_list_by_id_handler(
   }
 }
 
-Response read_simplebridge_ports_mac_by_id_handler(
-  const char *name, const Key *keys,
-  size_t num_keys ) {
-  // Getting the path params
-  std::string unique_name { name };
-  std::string unique_portsName;
-  for (size_t i = 0; i < num_keys; ++i) {
-    if (!strcmp(keys[i].name, "ports_name")) {
-      unique_portsName = std::string { keys[i].value.string };
-      break;
-    }
-  }
-
-
-  try {
-
-    auto x = read_simplebridge_ports_mac_by_id(unique_name, unique_portsName);
-    nlohmann::json response_body;
-    response_body = x;
-    return { kOk, ::strdup(response_body.dump().c_str()) };
-  } catch(const std::exception &e) {
-    return { kGenericError, ::strdup(e.what()) };
-  }
-}
-
 Response replace_simplebridge_by_id_handler(
   const char *name, const Key *keys,
   size_t num_keys ,

src/services/pcn-simplebridge/src/api/SimplebridgeApi.h

@@ -56,7 +56,6 @@ Response read_simplebridge_fdb_entry_port_by_id_handler(const char *name, const
 Response read_simplebridge_list_by_id_handler(const char *name, const Key *keys, size_t num_keys);
 Response read_simplebridge_ports_by_id_handler(const char *name, const Key *keys, size_t num_keys);
 Response read_simplebridge_ports_list_by_id_handler(const char *name, const Key *keys, size_t num_keys);
-Response read_simplebridge_ports_mac_by_id_handler(const char *name, const Key *keys, size_t num_keys);
 Response replace_simplebridge_by_id_handler(const char *name, const Key *keys, size_t num_keys, const char *value);
 Response replace_simplebridge_fdb_by_id_handler(const char *name, const Key *keys, size_t num_keys, const char *value);
 Response replace_simplebridge_fdb_entry_by_id_handler(const char *name, const Key *keys, size_t num_keys, const char *value);

src/services/pcn-simplebridge/src/api/SimplebridgeApiImpl.cpp

@@ -451,24 +451,6 @@ read_simplebridge_ports_list_by_id(const std::string &name) {
   return m;
 }
 
-/**
-* @brief   Read mac by ID
-*
-* Read operation of resource: mac*
-*
-* @param[in] name ID of name
-* @param[in] portsName ID of ports_name
-*
-* Responses:
-* std::string
-*/
-std::string
-read_simplebridge_ports_mac_by_id(const std::string &name, const std::string &portsName) {
-  auto simplebridge = get_cube(name);
-  auto ports = simplebridge->getPorts(portsName);
-  return ports->getMac();
-
-}
 
 /**
 * @brief   Replace fdb by ID

src/services/pcn-simplebridge/src/api/SimplebridgeApiImpl.h

@@ -59,7 +59,6 @@ namespace SimplebridgeApiImpl {
   std::vector<SimplebridgeJsonObject> read_simplebridge_list_by_id();
   PortsJsonObject read_simplebridge_ports_by_id(const std::string &name, const std::string &portsName);
   std::vector<PortsJsonObject> read_simplebridge_ports_list_by_id(const std::string &name);
-  std::string read_simplebridge_ports_mac_by_id(const std::string &name, const std::string &portsName);
   void replace_simplebridge_by_id(const std::string &name, const SimplebridgeJsonObject &value);
   void replace_simplebridge_fdb_by_id(const std::string &name, const FdbJsonObject &value);
   void replace_simplebridge_fdb_entry_by_id(const std::string &name, const std::string &address, const FdbEntryJsonObject &value);

src/services/pcn-simplebridge/src/base/PortsBase.cpp

@@ -29,7 +29,6 @@ PortsJsonObject PortsBase::toJsonObject() {
   conf.setBase(Port::to_json());
 
   conf.setName(getName());
-  conf.setMac(getMac());
 
   return conf;
 }

src/services/pcn-simplebridge/src/base/PortsBase.h

@@ -35,16 +35,11 @@ class PortsBase: public polycube::service::Port {
  public:
   PortsBase(polycube::service::Cube<Ports> &parent,
       std::shared_ptr<polycube::service::PortIface> port);
-  
+
   virtual ~PortsBase();
   virtual void update(const PortsJsonObject &conf);
   virtual PortsJsonObject toJsonObject();
 
-  /// <summary>
-  /// MAC address of the port
-  /// </summary>
-  virtual std::string getMac() = 0;
-
   std::shared_ptr<spdlog::logger> logger();
  protected:
   Simplebridge &parent_;

src/services/pcn-simplebridge/src/serializer/PortsJsonObject.cpp

@@ -19,22 +19,17 @@ namespace model {
 
 PortsJsonObject::PortsJsonObject() {
   m_nameIsSet = false;
-  m_macIsSet = false;
 }
 
 PortsJsonObject::PortsJsonObject(const nlohmann::json &val) :
   JsonObjectBase(val) {
   m_nameIsSet = false;
-  m_macIsSet = false;
 
 
   if (val.count("name")) {
     setName(val.at("name").get<std::string>());
   }
 
-  if (val.count("mac")) {
-    setMac(val.at("mac").get<std::string>());
-  }
 }
 
 nlohmann::json PortsJsonObject::toJson() const {
@@ -47,10 +42,6 @@ nlohmann::json PortsJsonObject::toJson() const {
     val["name"] = m_name;
   }
 
-  if (m_macIsSet) {
-    val["mac"] = m_mac;
-  }
-
   return val;
 }
 
@@ -69,24 +60,6 @@ bool PortsJsonObject::nameIsSet() const {
 
 
 
-std::string PortsJsonObject::getMac() const {
-  return m_mac;
-}
-
-void PortsJsonObject::setMac(std::string value) {
-  m_mac = value;
-  m_macIsSet = true;
-}
-
-bool PortsJsonObject::macIsSet() const {
-  return m_macIsSet;
-}
-
-void PortsJsonObject::unsetMac() {
-  m_macIsSet = false;
-}
-
-
 }
 }
 }

src/services/pcn-simplebridge/src/serializer/PortsJsonObject.h

@@ -43,19 +43,9 @@ class  PortsJsonObject : public JsonObjectBase {
   void setName(std::string value);
   bool nameIsSet() const;
 
-  /// <summary>
-  /// MAC address of the port
-  /// </summary>
-  std::string getMac() const;
-  void setMac(std::string value);
-  bool macIsSet() const;
-  void unsetMac();
-
 private:
   std::string m_name;
   bool m_nameIsSet;
-  std::string m_mac;
-  bool m_macIsSet;
 };
 
 }