diff options
| author |   Marcel Enguehard <mengueha+fdio@cisco.com> | 2017-07-19 11:26:26 +0200 |
|---|---|---|
| committer | Marcel Enguehard <mengueha+fdio@cisco.com> | 2017-07-19 11:51:26 +0000 |
| commit | 3e6678f9c692553e8902da4d6fb1fe6c087db1f4 (patch) | |
| tree | 580a46ca5de22a044319eabb295ad980d50589ec /vicn/resource/vpp/vpp_host.py | |
| parent | 08c4f765cf29dbd6e9a616c542552417eece14fc (diff) | |
* GUI resource
* MemIf interface for VPP
* Better netmodel integration
* Draft documentation
* New tutorials
* Improved monitoring and error handling
* Refactored IP addresses and prefixes representation
* Improved image mgmt for LXD
* Various bugfixes and code refactoring
Change-Id: I90da6cf7b5716bc7deb6bf4e24d3f9f01b5a9b0f
Signed-off-by: Marcel Enguehard <mengueha+fdio@cisco.com>
Diffstat (limited to 'vicn/resource/vpp/vpp_host.py')
| -rw-r--r-- | vicn/resource/vpp/vpp_host.py | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/vicn/resource/vpp/vpp_host.py b/vicn/resource/vpp/vpp_host.py index 954d1d32..29094451 100644 --- a/vicn/resource/vpp/vpp_host.py +++ b/vicn/resource/vpp/vpp_host.py @@ -23,6 +23,7 @@ from vicn.core.attribute import Attribute, Multiplicity from vicn.core.exception import ResourceNotFound from vicn.core.requirement import Requirement from vicn.core.task import BashTask, task, EmptyTask +from vicn.core.task import inherit_parent from vicn.resource.linux.application import LinuxApplication from vicn.resource.linux.file import TextFile from vicn.resource.node import Node @@ -41,7 +42,7 @@ CMD_APP_ARMOR_RELOAD = ''' CMD_SYSCTL_HUGEPAGES = 'sysctl -w vm.nr_hugepages={nb_hp}' DEFAULT_NB_HUGEPAGES = 1024 CMD_GREP_UIO_DEV = 'ls /dev | grep uio' -CMD_CREATE_UIO_DEVICES = "dpdk_nic_bind --bind=igb_uio {pci_address}" +CMD_CREATE_UIO_DEVICES = "dpdk-devbind --bind=igb_uio {pci_address}" class VPPHost(LinuxApplication): """ @@ -75,7 +76,7 @@ class VPPHost(LinuxApplication): description = 'Dpdk devices on the node', multiplicity = Multiplicity.OneToMany) - __package_names__ = ['dpdk', 'vpp-dpdk-dkms'] + __package_names__ = ['vpp-dpdk-dkms', 'vpp-dpdk-dev'] #-------------------------------------------------------------------------- # Constructor and Accessors @@ -89,6 +90,7 @@ class VPPHost(LinuxApplication): # Resource lifecycle #-------------------------------------------------------------------------- + @inherit_parent def __subresources__(self): app_armor_file = TextFile(node = self.node, filename = FN_APPARMOR_DPDK_SCRIPT, @@ -100,6 +102,7 @@ class VPPHost(LinuxApplication): overwrite = True) return app_armor_file | startup_conf + @inherit_parent @task def __get__(self): """ @@ -108,6 +111,7 @@ class VPPHost(LinuxApplication): """ raise ResourceNotFound + @inherit_parent def __create__(self): modules = BashTask(self.node, CMD_INSERT_MODULES) app_armor_reload = BashTask(self.node, CMD_APP_ARMOR_RELOAD) @@ -132,8 +136,6 @@ class VPPHost(LinuxApplication): return ((modules | app_armor_reload) | sysctl_hugepages) > \ (disable_vpp > create_uio) - __delete__ = None - #-------------------------------------------------------------------------- # Attributes #-------------------------------------------------------------------------- |