Support vCPE automation in OOM-based env

Change-Id: I716aa4718722c45160c5b002616ce03d4d0c6a59
Issue-ID: INT-593
Signed-off-by: Kang Xi <kang.xi@huawei.com>

1 files changed, 5 insertions, 4 deletions

diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py
index c4737296b..26f27fb7a 100755
--- a/test/vcpe/vcpe.py
+++ b/test/vcpe/vcpe.py
@@ -131,12 +131,13 @@ def deploy_custom_service():
     custom_service = vcpe_custom_service.CustomService(vcpecommon)
 
     # clean up
-    #host_dic = {k: vcpecommon.hosts[k] for k in nodes}
-    #if not vcpecommon.delete_vxlan_interfaces(host_dic):
-    #    sys.exit()
+    host_dic = {k: vcpecommon.hosts[k] for k in nodes}
+    if False:
+        if not vcpecommon.delete_vxlan_interfaces(host_dic):
+            sys.exit()
+        custom_service.del_all_vgw_stacks(vcpecommon.vgw_name_keyword)
 
     #custom_service.clean_up_sdnc()
-    #custom_service.del_all_vgw_stacks(vcpecommon.vgw_name_keyword)
 
     # create new service
     csar_file = vcpecommon.find_file('rescust', 'csar', 'csar')