Update lab RC files

Change-Id: Ie50b3c75047f1dac0af471e46c04ecd02c0dee82
Issue-ID: INT-532
Signed-off-by: gwu <gary.i.wu@huawei.com>

10 files changed, 13 insertions, 27 deletions

diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh
index e1c4f0891..74a180bd0 100755
--- a/test/ete/labs/gwu/apt-proxy.sh
+++ b/test/ete/labs/gwu/apt-proxy.sh
@@ -5,7 +5,7 @@ sed -i '/#!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
-              "insecure-registries" : ["192.168.1.51:5000"]\
+              "insecure-registries" : ["192.168.2.20:5000"]\
             }\
             EOF\
             cat > /etc/apt/apt.conf.d/30proxy<<EOF\
diff --git a/test/ete/labs/gwu/onap-heat-openrc b/test/ete/labs/gwu/onap-heat-openrc
new file mode 120000
index 000000000..f398cdbcb
--- /dev/null
+++ b/test/ete/labs/gwu/onap-heat-openrc
@@ -0,0 +1 @@
+../../../../deployment/heat/onap-oom/env/gwu/onap-heat-openrc
\ No newline at end of file
diff --git a/test/ete/labs/gwu/onap-oom-openrc b/test/ete/labs/gwu/onap-oom-openrc
new file mode 120000
index 000000000..d0bcd6765
--- /dev/null
+++ b/test/ete/labs/gwu/onap-oom-openrc
@@ -0,0 +1 @@
+../../../../deployment/heat/onap-oom/env/gwu/onap-oom-openrc
\ No newline at end of file
diff --git a/test/ete/labs/gwu/onap-openrc b/test/ete/labs/gwu/onap-openrc
deleted file mode 100644
index 1a452fa0a..000000000
--- a/test/ete/labs/gwu/onap-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=4c93f99551604bf7af25a8f80c7f34cb
-export OS_PROJECT_DOMAIN_NAME=Default
-export OS_USER_DOMAIN_NAME=Default
-export OS_PROJECT_NAME=onap
-export OS_USERNAME=demo
-export OS_PASSWORD=demo
-export OS_AUTH_URL=http://controller:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_IMAGE_API_VERSION=2
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index ec5648ccf..516312ba9 100644
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -6,7 +6,7 @@ parameters:
   #                                            #
   ##############################################
 
-  public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df
+  public_net_id: bfd766f4-ccb5-4d14-944a-fcf1a94a824c
 
   public_net_name: provider
 
@@ -24,13 +24,13 @@ parameters:
 
   vm_base_name: onap
 
-  key_name: onap_key
+  key_name: onap-key
 
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh
 
   nexus_artifact_repo: https://nexus.onap.org
 
-  nexus_docker_repo: 192.168.1.51:5000
+  nexus_docker_repo: 192.168.2.20:5000
 
   nexus_username: anonymous
 
diff --git a/test/ete/labs/huawei/apt-proxy.sh b/test/ete/labs/huawei/apt-proxy.sh
index b95299302..6fec3d03e 100755
--- a/test/ete/labs/huawei/apt-proxy.sh
+++ b/test/ete/labs/huawei/apt-proxy.sh
@@ -3,11 +3,11 @@ sed -i '/#!\/bin\/bash/a\
             mkdir -p /etc/docker\
             cat > /etc/docker/daemon.json <<EOF\
             {\
-              "insecure-registries" : ["10.145.122.118:5000"]\
+              "insecure-registries" : ["10.145.123.23:5000"]\
             }\
             EOF\
             cat > /etc/apt/apt.conf.d/30proxy<<EOF\
-            Acquire::http { Proxy "http://10.145.122.118:3142"; };\
+            Acquire::http { Proxy "http://10.145.122.117:8000"; };\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
diff --git a/test/ete/labs/huawei/onap-beijing-oom-openrc b/test/ete/labs/huawei/onap-beijing-oom-openrc
deleted file mode 100644
index cc6df8b91..000000000
--- a/test/ete/labs/huawei/onap-beijing-oom-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_DOMAIN_NAME=Default
-export OS_USER_DOMAIN_NAME=Default
-export OS_PROJECT_ID=3d228d2fcbb7447bbba3cde703431bc1
-export OS_PROJECT_NAME=onap-beijing-oom
-export OS_USERNAME=demo
-export OS_PASSWORD=demo
-export OS_AUTH_URL=http://controller.neo.futurewei.com:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_IMAGE_API_VERSION=2
diff --git a/test/ete/labs/huawei/onap-heat-openrc b/test/ete/labs/huawei/onap-heat-openrc
new file mode 120000
index 000000000..1a3b2b1c1
--- /dev/null
+++ b/test/ete/labs/huawei/onap-heat-openrc
@@ -0,0 +1 @@
+../../../../deployment/heat/onap-oom/env/huawei/onap-heat-openrc
\ No newline at end of file
diff --git a/test/ete/labs/huawei/onap-oom-openrc b/test/ete/labs/huawei/onap-oom-openrc
new file mode 120000
index 000000000..775759c65
--- /dev/null
+++ b/test/ete/labs/huawei/onap-oom-openrc
@@ -0,0 +1 @@
+../../../../deployment/heat/onap-oom/env/huawei/onap-oom-openrc
\ No newline at end of file
diff --git a/test/ete/labs/huawei/onap-openstack-template.env b/test/ete/labs/huawei/onap-openstack-template.env
index 033644a54..ee4f229d1 100644
--- a/test/ete/labs/huawei/onap-openstack-template.env
+++ b/test/ete/labs/huawei/onap-openstack-template.env
@@ -6,7 +6,7 @@ parameters:
   #                                            #
   ##############################################
 
-  public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4
+  public_net_id: 7baa99ac-43a0-4013-9dfb-bbb94fdcd91a
 
   public_net_name: provider
 
@@ -24,13 +24,13 @@ parameters:
 
   vm_base_name: onap
 
-  key_name: onap_key
+  key_name: onap-key
 
   pub_key: ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh
 
   nexus_artifact_repo: https://nexus.onap.org
 
-  nexus_docker_repo: 10.145.122.118:5000
+  nexus_docker_repo: 10.145.123.23:5000
 
   nexus_username: anonymous