X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=test%2Fvcpe%2Fvcpe_custom_service.py;h=36012f7b0fb062657257d40aa3a6ef8aa4e8c586;hb=refs%2Fheads%2Fcasablanca;hp=af76803aa47ef5caf4743c9c343fb190ca4da030;hpb=6c76239eea08066bdaf352326e92b161904cf1a1;p=integration.git

diff --git a/test/vcpe/vcpe_custom_service.py b/test/vcpe/vcpe_custom_service.py
index af76803aa..36012f7b0 100755
--- a/test/vcpe/vcpe_custom_service.py
+++ b/test/vcpe/vcpe_custom_service.py
@@ -66,15 +66,25 @@ class CustomService:
             print(' 6. ping the web server: ping {0}'.format('10.2.0.10'))
             print(' 7. wget http://{0}'.format('10.2.0.10'))
 
-    def create_custom_service(self, csar_file, vgw_template_file, preload_dict=None):
+    def create_custom_service(self, csar_file, vgw_template_file, vgw_gra_template_file, preload_dict=None):
         name_suffix = datetime.now().strftime('%Y%m%d%H%M')
-        brg_mac = self.vcpecommon.get_brg_mac_from_sdnc()
+        if self.vcpecommon.oom_mode:
+            brg_mac = str(raw_input("Enter the BRG MAC address: "))
+        else:
+            brg_mac = self.vcpecommon.get_brg_mac_from_sdnc()
+        brg_mac_enc = brg_mac.replace(':', '-')
+        # get name index
+        self.vgw_vfmod_name_index= self.vcpecommon.load_object(self.vcpecommon.vgw_vfmod_name_index_file)
+        self.vgw_vfmod_name_index=self.vgw_vfmod_name_index + 1
+        self.vcpecommon.save_object(self.vgw_vfmod_name_index,self.vcpecommon.vgw_vfmod_name_index_file)
         # preload vGW
         if preload_dict:
             preloader = preload.Preload(self.vcpecommon)
-            parameters_to_change = ['vgw_private_ip_0', 'vgw_private_ip_1', 'vg_vgmux_tunnel_vni']
+            parameters_to_change = ['vgw_private_ip_0', 'vgw_private_ip_1', 'vgw_private_ip_2','vg_vgmux_tunnel_vni']
             self.vcpecommon.increase_ip_address_or_vni_in_template(vgw_template_file, parameters_to_change)
             preloader.preload_vgw(vgw_template_file, brg_mac, preload_dict, name_suffix)
+            # preload vGW-GRA
+            preloader.preload_vgw_gra(vgw_gra_template_file, brg_mac_enc, preload_dict, name_suffix, str(self.vgw_vfmod_name_index))
 
         # create service
         so = soutils.SoUtils(self.vcpecommon, 'v5')