services: remove generate_code and generate_code_vector

In most of the cases those functions only return a constant variable,
so remove them and use the variable directly.

Signed-off-by: Mauricio Vasquez B <mauriciovasquezbernal@gmail.com>

src/services/pcn-ddosmitigator/src/Ddosmitigator.cpp

@@ -19,7 +19,7 @@
 
 Ddosmitigator::Ddosmitigator(const std::string name,
                              const DdosmitigatorJsonObject &conf)
-    : TransparentCube(conf.getBase(), {generate_code()}, {}) {
+    : TransparentCube(conf.getBase(), {ddosmitigator_code}, {}) {
   logger()->info("Creating Ddosmitigator instance {0}", name);
 
   auto value = conf.getStats();
@@ -84,14 +84,6 @@ void Ddosmitigator::packet_in(polycube::service::Sense sense,
   logger()->info("packet in event");
 }
 
-std::string Ddosmitigator::generate_code() {
-  return ddosmitigator_code;
-}
-
-std::vector<std::string> Ddosmitigator::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 void Ddosmitigator::replaceAll(std::string &str, const std::string &from,
                                const std::string &to) {
   if (from.empty())

src/services/pcn-ddosmitigator/src/Ddosmitigator.h

@@ -35,8 +35,6 @@ class Ddosmitigator : public polycube::service::TransparentCube,
  public:
   Ddosmitigator(const std::string name, const DdosmitigatorJsonObject &conf);
   virtual ~Ddosmitigator();
-  std::string generate_code();
-  std::vector<std::string> generate_code_vector();
 
   void update(const DdosmitigatorJsonObject &conf) override;
   DdosmitigatorJsonObject toJsonObject() override;

src/services/pcn-firewall/src/Firewall.cpp

@@ -18,7 +18,7 @@
 #include "Firewall_dp.h"
 
 Firewall::Firewall(const std::string name, const FirewallJsonObject &conf)
-    : Cube(conf.getBase(), {generate_code()}, {}) {
+    : Cube(conf.getBase(), {firewall_code}, {}) {
   logger()->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [Firewall] [%n] [%l] %v");
   logger()->info("Creating Firewall instance");
 
@@ -149,14 +149,6 @@ FirewallJsonObject Firewall::toJsonObject() {
   return conf;
 }
 
-std::string Firewall::generate_code() {
-  return firewall_code;
-}
-
-std::vector<std::string> Firewall::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 void Firewall::packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                          const std::vector<uint8_t> &packet) {
   logger()->info("Packet received from port {0}", port.name());

src/services/pcn-firewall/src/Firewall.h

@@ -66,8 +66,6 @@ class Firewall : public polycube::service::Cube<Ports>,
  public:
   Firewall(const std::string name, const FirewallJsonObject &conf);
   virtual ~Firewall();
-  std::string generate_code();
-  std::vector<std::string> generate_code_vector();
   void packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                  const std::vector<uint8_t> &packet) override;
 

src/services/pcn-helloworld/src/Helloworld.cpp

@@ -25,7 +25,7 @@
 using namespace polycube::service;
 
 Helloworld::Helloworld(const std::string name, const HelloworldJsonObject &conf)
-    : Cube(conf.getBase(), {generate_code()}, {}) {
+    : Cube(conf.getBase(), {helloworld_code_ingress}, {}) {
   logger()->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [helloworld] [%n] [%l] %v");
   logger()->info("Creating helloworld instance");
 
@@ -84,14 +84,6 @@ HelloworldJsonObject Helloworld::toJsonObject() {
   return conf;
 }
 
-std::string Helloworld::generate_code() {
-  return helloworld_code_ingress;
-}
-
-std::vector<std::string> Helloworld::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 void Helloworld::packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                            const std::vector<uint8_t> &packet) {
   logger()->info("packet arrived to the slowpath from port {0}", port.name());

src/services/pcn-helloworld/src/Helloworld.h

@@ -36,8 +36,6 @@ class Helloworld : public polycube::service::Cube<Ports>,
  public:
   Helloworld(const std::string name, const HelloworldJsonObject &conf);
   virtual ~Helloworld();
-  std::string generate_code();
-  std::vector<std::string> generate_code_vector();
   void packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                  const std::vector<uint8_t> &packet) override;
 

src/services/pcn-k8sfilter/src/K8sfilter.cpp

@@ -22,7 +22,7 @@
 #include <cinttypes>
 
 K8sfilter::K8sfilter(const std::string name, const K8sfilterJsonObject &conf)
-    : Cube(conf.getBase(), {generate_code()}, {}) {
+    : Cube(conf.getBase(), {k8sfilter_code}, {}) {
   logger()->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [K8sfilter] [%n] [%l] %v");
   logger()->info("Creating K8sfilter instance");
 
@@ -63,14 +63,6 @@ K8sfilterJsonObject K8sfilter::toJsonObject() {
   return conf;
 }
 
-std::string K8sfilter::generate_code() {
-  return k8sfilter_code;
-}
-
-std::vector<std::string> K8sfilter::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 void K8sfilter::packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                           const std::vector<uint8_t> &packet) {
   logger()->info("Packet received from port {0}", port.name());

src/services/pcn-k8sfilter/src/K8sfilter.h

@@ -36,8 +36,6 @@ class K8sfilter : public polycube::service::Cube<Ports>,
  public:
   K8sfilter(const std::string name, const K8sfilterJsonObject &conf);
   virtual ~K8sfilter();
-  std::string generate_code();
-  std::vector<std::string> generate_code_vector();
   void packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                  const std::vector<uint8_t> &packet) override;
 

src/services/pcn-k8switch/src/K8switch.cpp

@@ -24,7 +24,7 @@ using namespace polycube::service;
 using namespace Tins;
 
 K8switch::K8switch(const std::string name, const K8switchJsonObject &conf)
-    : Cube(conf.getBase(), {generate_code()}, {}) {
+    : Cube(conf.getBase(), {}, {}) {
   logger()->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [K8switch] [%n] [%l] %v");
   logger()->info("Creating K8switch instance");
 
@@ -125,23 +125,6 @@ K8switchJsonObject K8switch::toJsonObject() {
   return conf;
 }
 
-std::string K8switch::generate_code() {
-  // this code is compiled on contruction, return stub code that compiles
-  // fast, anyway this will be updated soon
-  const std::string stub_k8switch_code = R"POLYCUBE_DP(
-  static __always_inline
-  int handle_rx(struct CTXTYPE *ctx, struct pkt_metadata *md) {
-    return RX_DROP;
-  }
-  )POLYCUBE_DP";
-
-  return stub_k8switch_code;
-}
-
-std::vector<std::string> K8switch::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 void K8switch::packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                          const std::vector<uint8_t> &packet) {}
 

src/services/pcn-k8switch/src/K8switch.h

@@ -66,8 +66,6 @@ class K8switch : public polycube::service::Cube<Ports>,
  public:
   K8switch(const std::string name, const K8switchJsonObject &conf);
   virtual ~K8switch();
-  std::string generate_code();
-  std::vector<std::string> generate_code_vector();
   void packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                  const std::vector<uint8_t> &packet) override;
 

src/services/pcn-loadbalancer-dsr/src/Lbdsr.cpp

@@ -20,7 +20,7 @@
 #include "Lbdsr_dp.h"
 
 Lbdsr::Lbdsr(const std::string name, const LbdsrJsonObject &conf)
-    : Cube(conf.getBase(), {generate_code(true)}, {}) {
+    : Cube(conf.getBase(), {getCode(true)}, {}) {
   logger()->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [Lbdsr] [%n] [%l] %v");
   logger()->info("Creating Lbdsr instance");
 
@@ -81,14 +81,6 @@ LbdsrJsonObject Lbdsr::toJsonObject() {
   return conf;
 }
 
-std::string Lbdsr::generate_code(bool first = false) {
-  return getCode(first);
-}
-
-std::vector<std::string> Lbdsr::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 void Lbdsr::packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                       const std::vector<uint8_t> &packet) {
   logger()->info("Packet received from port {0}", port.name());

src/services/pcn-loadbalancer-dsr/src/Lbdsr.h

@@ -38,8 +38,6 @@ class Lbdsr : public polycube::service::Cube<Ports>, public LbdsrInterface {
  public:
   Lbdsr(const std::string name, const LbdsrJsonObject &conf);
   virtual ~Lbdsr();
-  std::string generate_code(bool first);
-  std::vector<std::string> generate_code_vector();
   void packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                  const std::vector<uint8_t> &packet) override;
 

src/services/pcn-loadbalancer-rp/src/Lbrp.cpp

@@ -25,7 +25,7 @@
 using namespace Tins;
 
 Lbrp::Lbrp(const std::string name, const LbrpJsonObject &conf)
-    : Cube(conf.getBase(), {generate_code()}, {}) {
+    : Cube(conf.getBase(), {lbrp_code}, {}) {
   logger()->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [Lbrp] [%n] [%l] %v");
   logger()->info("Creating Lbrp instance");
 
@@ -83,14 +83,6 @@ LbrpJsonObject Lbrp::toJsonObject() {
   return conf;
 }
 
-std::string Lbrp::generate_code() {
-  return lbrp_code;
-}
-
-std::vector<std::string> Lbrp::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 void Lbrp::packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                      const std::vector<uint8_t> &packet) {
   EthernetII eth(&packet[0], packet.size());

src/services/pcn-loadbalancer-rp/src/Lbrp.h

@@ -40,8 +40,6 @@ class Lbrp : public polycube::service::Cube<Ports>, public LbrpInterface {
  public:
   Lbrp(const std::string name, const LbrpJsonObject &conf);
   virtual ~Lbrp();
-  std::string generate_code();
-  std::vector<std::string> generate_code_vector();
   void packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                  const std::vector<uint8_t> &packet) override;
 

src/services/pcn-nat/src/Nat.cpp

@@ -104,10 +104,6 @@ std::string Nat::generate_code() {
   return defines.str() /*+ nat_code*/;
 }
 
-std::vector<std::string> Nat::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 std::string Nat::getExternalIpString() {
   return external_ip_;
 }

src/services/pcn-nat/src/Nat.h

@@ -60,7 +60,6 @@ class Nat : public polycube::service::TransparentCube, public NatInterface {
   Nat(const std::string name, const NatJsonObject &conf);
   virtual ~Nat();
   std::string generate_code();
-  std::vector<std::string> generate_code_vector();
 
   void update(const NatJsonObject &conf) override;
   NatJsonObject toJsonObject() override;

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

@@ -27,7 +27,7 @@ using namespace Tins;
 
 Simplebridge::Simplebridge(const std::string name,
                            const SimplebridgeJsonObject &conf)
-    : Cube(conf.getBase(), {generate_code()}, {}), quit_thread_(false) {
+    : Cube(conf.getBase(), {simplebridge_code}, {}), quit_thread_(false) {
   logger()->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [Simplebridge] [%n] [%l] %v");
   logger()->info("Creating Simplebridge instance");
 
@@ -108,14 +108,6 @@ SimplebridgeJsonObject Simplebridge::toJsonObject() {
   return conf;
 }
 
-std::string Simplebridge::generate_code() {
-  return simplebridge_code;
-}
-
-std::vector<std::string> Simplebridge::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 void Simplebridge::packet_in(Ports &port,
                              polycube::service::PacketInMetadata &md,
                              const std::vector<uint8_t> &packet) {

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

@@ -42,8 +42,6 @@ class Simplebridge : public polycube::service::Cube<Ports>,
  public:
   Simplebridge(const std::string name, const SimplebridgeJsonObject &conf);
   virtual ~Simplebridge();
-  std::string generate_code();
-  std::vector<std::string> generate_code_vector();
   void packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                  const std::vector<uint8_t> &packet) override;
 

src/services/pcn-simpleforwarder/src/Simpleforwarder.cpp

@@ -21,7 +21,7 @@
 
 Simpleforwarder::Simpleforwarder(const std::string name,
                                  const SimpleforwarderJsonObject &conf)
-    : Cube(conf.getBase(), {generate_code()}, {}) {
+    : Cube(conf.getBase(), {simpleforwarder_code}, {}) {
   logger()->set_pattern(
       "[%Y-%m-%d %H:%M:%S.%e] [Simpleforwarder] [%n] [%l] %v");
   logger()->info("Creating Simpleforwarder instance");
@@ -72,14 +72,6 @@ SimpleforwarderJsonObject Simpleforwarder::toJsonObject() {
   return conf;
 }
 
-std::string Simpleforwarder::generate_code() {
-  return simpleforwarder_code;
-}
-
-std::vector<std::string> Simpleforwarder::generate_code_vector() {
-  throw std::runtime_error("Method not implemented");
-}
-
 void Simpleforwarder::packet_in(Ports &port,
                                 polycube::service::PacketInMetadata &md,
                                 const std::vector<uint8_t> &packet) {

src/services/pcn-simpleforwarder/src/Simpleforwarder.h

@@ -38,8 +38,6 @@ class Simpleforwarder : public polycube::service::Cube<Ports>,
   Simpleforwarder(const std::string name,
                   const SimpleforwarderJsonObject &conf);
   virtual ~Simpleforwarder();
-  std::string generate_code();
-  std::vector<std::string> generate_code_vector();
   void packet_in(Ports &port, polycube::service::PacketInMetadata &md,
                  const std::vector<uint8_t> &packet) override;