diff options
Diffstat (limited to 'vicn/resource/vpp')
-rw-r--r-- | vicn/resource/vpp/cicn.py | 18 | ||||
-rw-r--r-- | vicn/resource/vpp/dpdk_device.py | 6 | ||||
-rw-r--r-- | vicn/resource/vpp/vpp.py | 16 | ||||
-rw-r--r-- | vicn/resource/vpp/vpp_host.py | 10 |
4 files changed, 25 insertions, 25 deletions
diff --git a/vicn/resource/vpp/cicn.py b/vicn/resource/vpp/cicn.py index be523a6c..1a68f11f 100644 --- a/vicn/resource/vpp/cicn.py +++ b/vicn/resource/vpp/cicn.py @@ -51,14 +51,14 @@ class CICNForwarder(Forwarder): mandatory=True, requirements = [Requirement('vpp')], reverse_name='cicn') - numa_node = Attribute(Integer, - description = 'Numa node on which vpp will run', + numa_node = Attribute(Integer, + description = 'Numa node on which vpp will run', default = None) - core = Attribute(Integer, + core = Attribute(Integer, description = 'Core belonging the numa node on which vpp will run', default = None) - enable_worker = Attribute(Bool, - description = 'Enable one worker for packet processing', + enable_worker = Attribute(Bool, + description = 'Enable one worker for packet processing', default = False) #__packages__ = ['vpp-plugin-cicn'] @@ -70,14 +70,14 @@ class CICNForwarder(Forwarder): def parse(rv): if rv.return_value > 0 or 'cicn: not enabled' in rv.stdout: raise ResourceNotFound - return BashTask(self.node, CMD_VPP_CICN_GET, + return BashTask(self.node, CMD_VPP_CICN_GET, lock = self.node.vpp.vppctl_lock, parse=parse) def __create__(self): #self.node.vpp.plugins.append("cicn") lock = self.node.vpp.vppctl_lock - create_task = BashTask(self.node, CMD_VPP_ENABLE_PLUGIN, + create_task = BashTask(self.node, CMD_VPP_ENABLE_PLUGIN, {'plugin' : 'cicn'}, lock = lock) face_task = EmptyTask() @@ -89,7 +89,7 @@ class CICNForwarder(Forwarder): return {} for face in self.faces: - face_task = face_task > BashTask(self.node, CMD_VPP_ADD_ICN_FACE, + face_task = face_task > BashTask(self.node, CMD_VPP_ADD_ICN_FACE, {'face':face}, parse = (lambda x : parse_face(x, face)), lock = lock) @@ -99,7 +99,7 @@ class CICNForwarder(Forwarder): if route.node is self.node: self.routes.append(route) for route in self.routes: - route_task = route_task > BashTask(self.node, + route_task = route_task > BashTask(self.node, CMD_VPP_ADD_ICN_ROUTE, {'route' : route}, lock = lock) return (wait_resource_task(self.node.vpp) > create_task) > (face_task > route_task) diff --git a/vicn/resource/vpp/dpdk_device.py b/vicn/resource/vpp/dpdk_device.py index 69449e48..472ee26f 100644 --- a/vicn/resource/vpp/dpdk_device.py +++ b/vicn/resource/vpp/dpdk_device.py @@ -27,9 +27,9 @@ class DpdkDevice(PhyInterface): A DpdkDevice is a physical net device supported by Dpdk and with parameters specific to VPP. """ - numa_node = Attribute(Integer, + numa_node = Attribute(Integer, description = 'NUMA node on the same PCI bus as the DPDK card') - socket_mem = Attribute(Integer, - description = 'Memory used by the vpp forwarder', + socket_mem = Attribute(Integer, + description = 'Memory used by the vpp forwarder', default = 512) mac_address = Attribute(String) diff --git a/vicn/resource/vpp/vpp.py b/vicn/resource/vpp/vpp.py index f9d10703..0edbe9b8 100644 --- a/vicn/resource/vpp/vpp.py +++ b/vicn/resource/vpp/vpp.py @@ -55,11 +55,11 @@ class VPP(Resource): node = Attribute(Node, multiplicity = Multiplicity.OneToOne, reverse_name = 'vpp') - numa_node = Attribute(Integer, + numa_node = Attribute(Integer, description = 'Numa node on which vpp will run') - core = Attribute(Integer, + core = Attribute(Integer, description = 'Core belonging the numa node on which vpp will run') - enable_worker = Attribute(Bool, + enable_worker = Attribute(Bool, description = 'Enable one worker for packet processing', default = False) @@ -88,8 +88,8 @@ class VPP(Resource): return BashTask(self.node, CMD_GET) def __subresources__(self): - self.dpdk_setup_file = TextFile(node = self.node, - filename = FN_VPP_DPDK_SCRIPT, + self.dpdk_setup_file = TextFile(node = self.node, + filename = FN_VPP_DPDK_SCRIPT, overwrite = True) return self.dpdk_setup_file @@ -137,7 +137,7 @@ class VPP(Resource): # Add the core on which running vpp and the dpdk parameters setup = TPL_VPP_DPDK_DAEMON_SCRIPT + 'cpu {' - + setup = setup + ''' \n main-core ''' + str(self.core) if self.enable_worker: @@ -145,7 +145,7 @@ class VPP(Resource): setup = setup + '''\n corelist-workers ''' + str(cpu_worker) setup = setup + '''\n}\n\n dpdk { ''' - + for dpdk_dev in dpdk_list: setup = setup + ''' \n ''' + dpdk_dev @@ -175,7 +175,7 @@ class VPP(Resource): def _set_plugins(self): cmd = None for plugin in self.plugins: - cmd = cmd > BashTask(self.node, CMD_VPP_ENABLE_PLUGIN, + cmd = cmd > BashTask(self.node, CMD_VPP_ENABLE_PLUGIN, {'plugin' : plugin}) return cmd diff --git a/vicn/resource/vpp/vpp_host.py b/vicn/resource/vpp/vpp_host.py index 600d5566..954d1d32 100644 --- a/vicn/resource/vpp/vpp_host.py +++ b/vicn/resource/vpp/vpp_host.py @@ -55,7 +55,7 @@ class VPPHost(LinuxApplication): Host must be configured to let vpp to work into container: - install new apparmor profile (to let the container to read - hugepages info in /sys/kernel/mm/hugepages) + hugepages info in /sys/kernel/mm/hugepages) - set hugepages into the host """ @@ -96,7 +96,7 @@ class VPPHost(LinuxApplication): overwrite = True) startup_conf = TextFile(node = self.node, filename = FN_VPP_DPDK_SCRIPT, - content = TPL_VPP_DPDK_DAEMON_SCRIPT, + content = TPL_VPP_DPDK_DAEMON_SCRIPT, overwrite = True) return app_armor_file | startup_conf @@ -111,7 +111,7 @@ class VPPHost(LinuxApplication): def __create__(self): modules = BashTask(self.node, CMD_INSERT_MODULES) app_armor_reload = BashTask(self.node, CMD_APP_ARMOR_RELOAD) - sysctl_hugepages = BashTask(self.node, CMD_SYSCTL_HUGEPAGES, + sysctl_hugepages = BashTask(self.node, CMD_SYSCTL_HUGEPAGES, {'nb_hp': DEFAULT_NB_HUGEPAGES}) # Hook @@ -126,9 +126,9 @@ class VPPHost(LinuxApplication): create_uio = EmptyTask() for device in self.dpdk_devices: - create_uio = create_uio > BashTask(self.node, + create_uio = create_uio > BashTask(self.node, CMD_CREATE_UIO_DEVICES, {'pci_address' : device}) - + return ((modules | app_armor_reload) | sysctl_hugepages) > \ (disable_vpp > create_uio) |