X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=test%2Fvcpe%2Fvcpe.py;h=3fb96c55e3014dc931b2be3128fff235ac5ee915;hb=refs%2Fheads%2Fcasablanca;hp=81e45f334e0845d22e956bceac18f7b944f38410;hpb=ec9fe0e5a07ac2cdb650cd5cc9a9c883122da780;p=integration.git

diff --git a/test/vcpe/vcpe.py b/test/vcpe/vcpe.py
index 81e45f334..8f888c6d5 100755
--- a/test/vcpe/vcpe.py
+++ b/test/vcpe/vcpe.py
@@ -28,11 +28,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):
@@ -159,7 +163,7 @@ def closed_loop(lossrate=0):
     time.sleep(2)
     vcpecommon.del_vgmux_ves_collector()
 
-    logger.info('Staring vGMUX data reporting to DCAE')
+    logger.info('Starting vGMUX data reporting to DCAE')
     time.sleep(2)
     vcpecommon.set_vgmux_ves_collector()
 
@@ -174,9 +178,9 @@ def init_so_sdnc():
     logger = logging.getLogger('__name__')
     vcpecommon = VcpeCommon()
     config_sdnc_so.insert_customer_service_to_so(vcpecommon)
-    config_sdnc_so.insert_customer_service_to_sdnc(vcpecommon)
-    vgw_vfmod_name_index=0
-    self.save_object(vgw_vfmod_name_index, vgw_vfmod_name_index_file)
+    #config_sdnc_so.insert_customer_service_to_sdnc(vcpecommon)
+    vgw_vfmod_name_index=  0
+    vcpecommon.save_object(vgw_vfmod_name_index, vcpecommon.vgw_vfmod_name_index_file)
 
 
 def tmp_sniro():
@@ -188,6 +192,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')
 
@@ -222,4 +230,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()