commit 63a0afd8ee0062f8998214973ef3ccd62f2c3bf7
author Yang Xu <yang.xu3@huawei.com> Tue Nov 20 16:01:01 2018 -0500
committer Yang Xu <yang.xu3@huawei.com> Tue Nov 20 21:20:38 2018 +0000
tree e64ea296fa73d7f362149272df12f612b94f44d8
parent 91b9f09a69c0ed29600f39f4b326203d865090f4

Fix issues in vcpe test script

1. SDNC GRA url issue
2. Add mr ip and port to prepload
3. Allow SO service_recipe table to be populated
4. Add SDNC ip to preload
5. Add vfmoduleName section in SO request
6. Set Generic NeutronNet shared as False

Change-Id: Iba4ff695759ceab53e33367092b6b59678e082e7
Issue-ID: INT-717
Signed-off-by: Yang Xu <yang.xu3@huawei.com>
(cherry picked from commit 1a0a0466716419880ab6b1fc6a94ec82a2966cb0)

test/vcpe/preload.py

diff --git a/test/vcpe/preload.py b/test/vcpe/preload.py
index 0d451d2..0108566 100755
--- a/test/vcpe/preload.py
+++ b/test/vcpe/preload.py
@@ -128,7 +128,7 @@
                         }
         replace_dict.update(commont_dict)
         self.logger.info('Preloading vGW-GRA')
-        return self.preload(template_file, replace_dict, self.vcpecommon.sdnc_preload_vnf_url)
+        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):
         """
@@ -156,6 +156,7 @@
                         '${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)