Merge "Improve description of push policy for vFW" into casablanca

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

diff --git a/test/vcpe/preload.py b/test/vcpe/preload.py
index c4efafd..0108566 100755 (executable)
--- a/test/vcpe/preload.py
+++ b/test/vcpe/preload.py
@@ -121,6 +121,15 @@ class Preload:
         self.logger.info('Preloading vGW')
         return self.preload(template_file, replace_dict, self.vcpecommon.sdnc_preload_vnf_url)
 
+    def preload_vgw_gra(self, template_file, brg_mac, commont_dict, name_suffix, vgw_vfmod_name_index):
+        replace_dict = {'${brg_mac}': brg_mac,
+                        '${suffix}': name_suffix,
+                        '${vgw_vfmod_name_index}': vgw_vfmod_name_index
+                        }
+        replace_dict.update(commont_dict)
+        self.logger.info('Preloading vGW-GRA')
+        return self.preload(template_file, replace_dict, self.vcpecommon.sdnc_preload_gra_url)
+
     def preload_vfmodule(self, template_file, service_instance_id, vnf_model, vfmodule_model, common_dict, name_suffix):
         """
         :param template_file:
@@ -145,6 +154,9 @@ class Preload:
                         '${service_type}': service_instance_id,
                         '${generic_vnf_name}': vnf_model['modelCustomizationName'],
                         '${vnf_name}': vfmodule_name,
+                        '${mr_ip_addr}': self.vcpecommon.mr_ip_addr,
+                        '${mr_ip_port}': self.vcpecommon.mr_ip_port,
+                        '${sdnc_oam_ip}': self.vcpecommon.sdnc_oam_ip,
                         '${suffix}': name_suffix}
         replace_dict.update(common_dict)
         self.logger.info('Preloading VF Module ' + vfmodule_name)