update vfc sfc version

[integration.git] / test / vcpe / vcpe.py

diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py
index 3fb96c5..f9c1778 100755 (executable)
--- a/test/vcpe/vcpe.py
+++ b/test/vcpe/vcpe.py
@@ -2,6 +2,7 @@
 import sys
 import logging
 from vcpecommon import *
+import sdcutils
 import soutils
 from datetime import datetime
 import preload
@@ -28,11 +29,15 @@ def config_sniro(vcpecommon, vgmux_svc_instance_uuid, vbrg_svc_instance_uuid):
     brg_ar_name = None
     vgw_name = None
     for model in parser.vnf_models:
-        if 'tunnel' in model['modelCustomizationName']:
+        logger.info('modelCustomizationName = %s', model['modelCustomizationName'])
+        if 'tunnel' in model['modelCustomizationName'].lower():
+            logger.info('tunnel is in %s', model['modelCustomizationName'])
             tunnelxconn_ar_name = model['modelCustomizationName']
-        elif 'brg' in model['modelCustomizationName']:
+        elif 'brg' in model['modelCustomizationName'].lower():
+            logger.info('brg is in %s', model['modelCustomizationName'])
             brg_ar_name = model['modelCustomizationName']
-        elif 'vgw' in model['modelCustomizationName']:
+        #elif 'vgw' in model['modelCustomizationName']:
+        else:
             vgw_name = model['modelCustomizationName']
 
     if not (tunnelxconn_ar_name and brg_ar_name and vgw_name):
@@ -178,6 +183,10 @@ def init_so_sdnc():
     vgw_vfmod_name_index=  0
     vcpecommon.save_object(vgw_vfmod_name_index, vcpecommon.vgw_vfmod_name_index_file)
 
+def download_vcpe_service_templates():
+    vcpecommon = VcpeCommon()
+    sdc = sdcutils.SdcUtils(vcpecommon)
+    sdc.get_service_list()
 
 def tmp_sniro():
     logger = logging.getLogger(__name__)
@@ -188,6 +197,10 @@ def tmp_sniro():
     # Setting up SNIRO
     config_sniro(vcpecommon, svc_instance_uuid['gmux'], svc_instance_uuid['brg'])
 
+def test(): 
+    vcpecommon = VcpeCommon()
+    print("oom-k8s-04 public ip: %s" % (vcpecommon.get_vm_public_ip_by_nova('oom-k8s-04')))
+
 if __name__ == '__main__':
     logging.basicConfig(level=logging.DEBUG, format='%(message)s')
 
@@ -209,6 +222,7 @@ if __name__ == '__main__':
     elif sys.argv[1] == 'init':
         if 'y' == raw_input('Ready to add customer service data to SDNC and SO DBs? This is needed only once.'
                             'y/n: ').lower():
+            download_vcpe_service_templates()
             init_so_sdnc()
     elif sys.argv[1] == 'infra':
         if 'y' == raw_input('Ready to deploy infrastructure? y/n: ').lower():
@@ -222,4 +236,8 @@ if __name__ == '__main__':
         closed_loop(0)
     elif sys.argv[1] == 'brg':
         deploy_brg_only()
+    elif sys.argv[1] == 'sniro':
+        tmp_sniro()
+    elif sys.argv[1] == 'test':
+        test()