From: Bartek Grzybowski Date: Fri, 13 Sep 2019 06:54:14 +0000 (+0200) Subject: Remove hardcoded SDNC pod name in vcpe scripts X-Git-Tag: 6.0.0-ONAP~369 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=863af9a6582448560ca3d56852056658d0da16eb;p=integration.git Remove hardcoded SDNC pod name in vcpe scripts Sdnc pod name is set as a property in VcpeCommon class and it should be used across the script. Also removed hardcoded public net prefix in get_pod_node_public_ip and use class property where it's assigned. Change-Id: I0308c808a764ff114fc43591aed34d9695207fe5 Signed-off-by: Bartek Grzybowski Issue-ID: TEST-212 --- diff --git a/test/vcpe/vcpecommon.py b/test/vcpe/vcpecommon.py index 0ee22da49..e34eebe2f 100755 --- a/test/vcpe/vcpecommon.py +++ b/test/vcpe/vcpecommon.py @@ -94,9 +94,9 @@ class VcpeCommon: self.vgw_VfModuleModelInvariantUuid = '26d6a718-17b2-4ba8-8691-c44343b2ecd2' # OOM: this is the address that the brg and bng will nat for sdnc access - 10.0.0.x address of k8 host for sdnc-0 container - self.sdnc_oam_ip = self.get_pod_node_oam_ip('sdnc-sdnc-0') - # OOM: this is a k8s host external IP, e.g. oom-k8s-01 IP - self.oom_so_sdnc_aai_ip = self.get_pod_node_public_ip('sdnc-sdnc-0') + self.sdnc_oam_ip = self.get_pod_node_oam_ip(self.sdnc_controller_pod) + # OOM: this is a k8s host external IP, e.g. oom-k8s-01 IP + self.oom_so_sdnc_aai_ip = self.get_pod_node_public_ip(self.sdnc_controller_pod) # OOM: this is a k8s host external IP, e.g. oom-k8s-01 IP self.oom_dcae_ves_collector = self.oom_so_sdnc_aai_ip # OOM: this is a k8s host external IP, e.g. oom-k8s-01 IP @@ -382,7 +382,7 @@ class VcpeCommon: break if ret is None: - ret = raw_input("Enter sdnc-sdnc-0 pod cluster node OAM IP address(10.0.0.0/16): ") + ret = raw_input("Enter " + self.sdnc_controller_pod + " pod cluster node OAM IP address(10.0.0.0/16): ") return ret def get_pod_node_public_ip(self, pod): @@ -404,7 +404,7 @@ class VcpeCommon: break if ret is None: - ret = raw_input("Enter sdnc-sdnc-0 pod cluster node public IP address(i.e. 10.12.0.0/16): ") + ret = raw_input("Enter " + self.sdnc_controller_pod + " pod cluster node public IP address(i.e. " + self.external_net_addr + "): ") return ret def get_vm_public_ip_by_nova(self, vm):