pcn-firewall: add insert/delete actions; porting to new codegen

this commit introduces support for insert/delete rules
this commit uses last version of code generation

Signed-off-by: Matteo Bertrone <m.bertrone@gmail.com>

Author: mbertrone

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

@@ -230,6 +230,26 @@ module firewall {
       }
     }
 
+    action insert {
+      input {
+        leaf id {
+          type uint32;
+        }
+        uses "firewall:rule-fields";
+      }
+      output {
+        leaf id {
+          type uint32;
+        }
+      }
+    }
+
+    action delete {
+      input {
+        uses "firewall:rule-fields";
+      }
+    }
+
     action reset-counters {
       description "Reset the counters to 0 for the chain.";
       output {

src/services/pcn-firewall/src/CMakeLists.txt

@@ -2,29 +2,33 @@ 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(modules MODULES)
+aux_source_directory(base BASE_SOURCES)
 
 include_directories(serializer)
-include_directories(interface)
-include_directories(default-src)
 include_directories(modules)
 
+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-firewall SHARED
   ${SERIALIZER_SOURCES}
   ${API_SOURCES}
-  ${SRC_SOURCES}
   ${MODULES}
+  ${BASE_SOURCES}
   Chain.cpp
   ChainRule.cpp
   ChainStats.cpp
   SessionTable.cpp
   Firewall.cpp
-  Firewall-lib.cpp
-  Utils.cpp)
+  Utils.cpp
+  Firewall-lib.cpp)
 
 # load ebpf datapath code in std::string variables
 load_file_as_variable(pcn-firewall datapaths/Firewall_ActionLookup_dp.c firewall_code_actionlookup)
@@ -41,11 +45,11 @@ load_file_as_variable(pcn-firewall datapaths/Firewall_Parser_dp.c firewall_code_
 load_file_as_variable(pcn-firewall datapaths/Firewall_TcpFlagsLookup_dp.c firewall_code_tcpflagslookup)
 
 # load datamodel in a variable
-load_file_as_variable(pcn-firewall ../datamodel/firewall.yang firewall_datamodel)
+load_file_as_variable(pcn-firewall
+  ../datamodel/firewall.yang
+  firewall_datamodel)
 
-target_link_libraries(pcn-firewall
-  polycube
-  uuid)
+target_link_libraries(pcn-firewall ${POLYCUBE_LIBRARIES})
 
 # Specify shared library install directory
 

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

@@ -17,7 +17,7 @@
 #include "Chain.h"
 #include "Firewall.h"
 
-Chain::Chain(Firewall &parent, const ChainJsonObject &conf) : parent_(parent) {
+Chain::Chain(Firewall &parent, const ChainJsonObject &conf) : ChainBase(parent) {
   update(conf);
 }
 
@@ -608,3 +608,11 @@ void Chain::delRuleList() {
     applyRules();
   }
 }
+
+ChainInsertOutputJsonObject Chain::insert(ChainInsertInputJsonObject input) {
+  throw std::runtime_error("Chain::ChainInsertOutput: Method not implemented");
+}
+
+void Chain::deletes(ChainDeleteInputJsonObject input) {
+  throw std::runtime_error("Chain::: Method not implemented");
+}

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

@@ -21,17 +21,18 @@
 #include <mutex>
 #include <thread>
 
-#include "../interface/ChainInterface.h"
+#include "base/ChainBase.h"
+
 #include "ChainRule.h"
 #include "ChainStats.h"
 #include "Firewall.h"
 
 class Firewall;
 class ChainRule;
 
-using namespace io::swagger::server::model;
+using namespace polycube::service::model;
 
-class Chain : public ChainInterface {
+class Chain : public ChainBase {
   friend class ChainRule;
   friend class ChainStats;
 
@@ -79,13 +80,14 @@ class Chain : public ChainInterface {
   void delRuleList() override;
 
   ChainAppendOutputJsonObject append(ChainAppendInputJsonObject input) override;
+  ChainInsertOutputJsonObject insert(ChainInsertInputJsonObject input) override;
+  void deletes(ChainDeleteInputJsonObject input) override;
   ChainResetCountersOutputJsonObject resetCounters() override;
   ChainApplyRulesOutputJsonObject applyRules() override;
 
   uint32_t getNrRules();
 
  private:
-  Firewall &parent_;
   ActionEnum defaultAction = ActionEnum::DROP;
   ChainNameEnum name;
   std::vector<std::shared_ptr<ChainRule>> rules_;

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

@@ -19,7 +19,7 @@
 #include "Firewall.h"
 
 ChainRule::ChainRule(Chain &parent, const ChainRuleJsonObject &conf)
-    : parent_(parent), id(conf.getId()) {
+    : ChainRuleBase(parent), id(conf.getId()) {
   update(conf);
 }
 

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

@@ -16,17 +16,15 @@
 
 #pragma once
 
-#include "../interface/ChainRuleInterface.h"
 #include "defines.h"
 
-#include <inttypes.h>
-#include <spdlog/spdlog.h>
+#include "base/ChainRuleBase.h"
 
 class Chain;
 
-using namespace io::swagger::server::model;
+using namespace polycube::service::model;
 
-class ChainRule : public ChainRuleInterface {
+class ChainRule : public ChainRuleBase {
   friend class ChainStats;
   friend class Chain;
 
@@ -102,8 +100,6 @@ class ChainRule : public ChainRuleInterface {
   static int ChainRuleConntrackEnum_to_int(const ConntrackstatusEnum &status);
 
  private:
-  Chain &parent_;
-
   uint32_t id;
 
   ConntrackstatusEnum conntrack;

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

@@ -18,7 +18,7 @@
 #include "Firewall.h"
 
 ChainStats::ChainStats(Chain &parent, const ChainStatsJsonObject &conf)
-    : parent_(parent) {
+    : ChainStatsBase(parent) {
   this->counter = conf;
 }
 

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

@@ -16,15 +16,13 @@
 
 #pragma once
 
-#include "../interface/ChainStatsInterface.h"
-
-#include <spdlog/spdlog.h>
+#include "base/ChainStatsBase.h"
 
 class Chain;
 
-using namespace io::swagger::server::model;
+using namespace polycube::service::model;
 
-class ChainStats : public ChainStatsInterface {
+class ChainStats : public ChainStatsBase {
   friend class ChainRule;
   friend class Chain;
 
@@ -98,7 +96,6 @@ class ChainStats : public ChainStatsInterface {
   uint32_t getId() override;
 
  private:
-  Chain &parent_;
   ChainStatsJsonObject counter;
 
   static std::shared_ptr<ChainStats> getDefaultActionCounters(Chain &parent);

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

@@ -2,11 +2,8 @@
 * firewall API
 * firewall API generated from firewall.yang
 *
-* OpenAPI spec version: 1.0.0
-*
-* NOTE: This class is auto generated by the swagger code generator program.
-* https://github.com/polycube-network/swagger-codegen.git
-* branch polycube
+* NOTE: This file is auto generated by polycube-codegen
+* https://github.com/polycube-network/polycube-codegen
 */
 
 
@@ -16,7 +13,7 @@
 #include "../datamodel/firewall.h" // generated from datamodel
 
 #define SERVICE_PYANG_GIT ""
-#define SERVICE_SWAGGER_CODEGEN_GIT "implement_help_in_framework/be2c60c"
+#define SERVICE_SWAGGER_CODEGEN_GIT "GIT_REPO_ID"
 
 #include <polycube/services/shared_library.h>
 

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

@@ -18,7 +18,7 @@
 #include "Firewall_dp.h"
 
 Firewall::Firewall(const std::string name, const FirewallJsonObject &conf)
-    : TransparentCube(conf.getBase(), {firewall_code}, {firewall_code}) {
+    : TransparentCube(conf.getBase(), {firewall_code}, {firewall_code}), FirewallBase(name) {
   logger()->set_pattern("[%Y-%m-%d %H:%M:%S.%e] [Firewall] [%n] [%l] %v");
   logger()->info("Creating Firewall instance");
 
@@ -95,50 +95,6 @@ Firewall::~Firewall() {
   TransparentCube::dismount();
 }
 
-void Firewall::update(const FirewallJsonObject &conf) {
-  // This method updates all the object/parameter in Firewall object specified
-  // in the conf JsonObject.
-  TransparentCube::set_conf(conf.getBase());
-
-  if (conf.chainIsSet()) {
-    for (auto &i : conf.getChain()) {
-      auto name = i.getName();
-      auto m = getChain(name);
-      m->update(i);
-    }
-  }
-
-  if (conf.acceptEstablishedIsSet()) {
-    setAcceptEstablished(conf.getAcceptEstablished());
-  }
-
-  if (conf.conntrackIsSet()) {
-    setConntrack(conf.getConntrack());
-  }
-
-  if (conf.interactiveIsSet()) {
-    setInteractive(conf.getInteractive());
-  }
-}
-
-FirewallJsonObject Firewall::toJsonObject() {
-  FirewallJsonObject conf;
-  conf.setBase(TransparentCube::to_json());
-
-  // Remove comments when you implement all sub-methods
-  for (auto &i : getChainList()) {
-    conf.addChain(i->toJsonObject());
-  }
-
-  conf.setConntrack(getConntrack());
-
-  conf.setAcceptEstablished(getAcceptEstablished());
-
-  conf.setInteractive(getInteractive());
-
-  return conf;
-}
-
 void Firewall::packet_in(polycube::service::Sense sense,
                                       polycube::service::PacketInMetadata &md,
                                       const std::vector<uint8_t> &packet) {
@@ -361,24 +317,10 @@ void Firewall::addChain(const ChainNameEnum &name,
                   std::forward_as_tuple(*this, namedChain));
 }
 
-void Firewall::addChainList(const std::vector<ChainJsonObject> &conf) {
-  for (auto &i : conf) {
-    ChainNameEnum name_ = i.getName();
-    addChain(name_, i);
-  }
-}
-
-void Firewall::replaceChain(const ChainNameEnum &name,
-                            const ChainJsonObject &conf) {
-  delChain(name);
-  ChainNameEnum name_ = conf.getName();
-  addChain(name_, conf);
-}
-
 void Firewall::delChain(const ChainNameEnum &name) {
   throw std::runtime_error("Method not supported.");
 }
 
 void Firewall::delChainList() {
   throw std::runtime_error("Method not supported.");
-}
+}