Packages+Error handling for VppHost 55/5855/1
authorMarcel Enguehard <[email protected]>
Fri, 24 Mar 2017 15:28:52 +0000 (16:28 +0100)
committerMarcel Enguehard <[email protected]>
Fri, 24 Mar 2017 15:28:52 +0000 (16:28 +0100)
Change-Id: I3ef3711b21c385a191d09be3823588309eece2ca
Signed-off-by: Marcel Enguehard <[email protected]>
vicn/resource/vpp/vpp_host.py

index 134e65b..600d556 100644 (file)
@@ -75,7 +75,7 @@ class VPPHost(LinuxApplication):
             description = 'Dpdk devices on the node',
             multiplicity = Multiplicity.OneToMany)
 
-    __package_names__ = ['dpdk', 'vpp', 'vpp-dpdk-dkms']
+    __package_names__ = ['dpdk', 'vpp-dpdk-dkms']
 
     #--------------------------------------------------------------------------
     # Constructor and Accessors
@@ -120,8 +120,8 @@ class VPPHost(LinuxApplication):
         # container, vpp cannot create those devices, therefore we need to
         # create them in the host and then mount them on each container running
         # vpp (and using a physical nic)
-        stop_vpp = BashTask(self.node, CMD_VPP_STOP_SERVICE
-        disable_vpp = BashTask(self.node, CMD_VPP_DISABLE
+        stop_vpp = BashTask(self.node, CMD_VPP_STOP_SERVICE + " || true")
+        disable_vpp = BashTask(self.node, CMD_VPP_DISABLE + " || true")
         disable_vpp = stop_vpp > disable_vpp
 
         create_uio = EmptyTask()