16 files changed, 9 insertions, 95 deletions
diff --git a/test/ete/labs/gwu/apt-proxy.sh b/test/ete/labs/gwu/apt-proxy.sh
index d69415bd8..e1c4f0891 100755
--- a/test/ete/labs/gwu/apt-proxy.sh
+++ b/test/ete/labs/gwu/apt-proxy.sh
@@ -13,6 +13,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
diff --git a/test/ete/labs/gwu/onap-openstack-template.env b/test/ete/labs/gwu/onap-openstack-template.env
index 97adca265..16e147d20 100644
--- a/test/ete/labs/gwu/onap-openstack-template.env
+++ b/test/ete/labs/gwu/onap-openstack-template.env
@@ -40,7 +40,7 @@ parameters:
 
   dmaap_topic: AUTO
 
-  artifacts_version: 1.1.1
+  artifacts_version: 1.2.0-SNAPSHOT
 
   openstack_tenant_id: ${OS_PROJECT_ID}
 
@@ -89,6 +89,11 @@ parameters:
   vid_ip_addr: 172.16.8.1
   clamp_ip_addr: 172.16.12.1
   openo_ip_addr: 172.16.14.1
+  music_ip_addr: 172.16.15.1
+  oof_ip_addr: 172.16.16.1
+  aaf_ip_addr: 172.16.13.1
+  sms_ip_addr: 172.16.13.2
+  nbi_ip_addr: 172.16.17.1
 
   ###########################
   #                         #
@@ -96,6 +101,7 @@ parameters:
   #                         #
   ###########################
 
+  dcae_deployment_profile: R2MVP
   dnsaas_config_enabled: false
   dnsaas_region: RegionOne
   dnsaas_keystone_url: http://192.168.1.11:5000/v3
diff --git a/test/ete/labs/huawei/apt-proxy.sh b/test/ete/labs/huawei/apt-proxy.sh
index 37018ca6b..b95299302 100755
--- a/test/ete/labs/huawei/apt-proxy.sh
+++ b/test/ete/labs/huawei/apt-proxy.sh
@@ -11,6 +11,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
diff --git a/test/ete/labs/tlab/apt-proxy.sh b/test/ete/labs/tlab/apt-proxy.sh
index f2094ee2f..3cf547452 100755
--- a/test/ete/labs/tlab/apt-proxy.sh
+++ b/test/ete/labs/tlab/apt-proxy.sh
@@ -11,6 +11,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
diff --git a/test/ete/labs/tlab/onap-openstack-template.env b/test/ete/labs/tlab/onap-openstack-template.env
index 3da2ca937..3b702c48e 100644
--- a/test/ete/labs/tlab/onap-openstack-template.env
+++ b/test/ete/labs/tlab/onap-openstack-template.env
@@ -92,6 +92,7 @@ parameters:
   music_ip_addr: 10.0.15.1
   oof_ip_addr: 10.0.16.1
   aaf_ip_addr: 10.0.13.1
+  sms_ip_addr: 10.0.13.2
   nbi_ip_addr: 10.0.17.1
 
   ###########################
diff --git a/test/ete/labs/windriver/Integration-Jenkins-DNS-openrc b/test/ete/labs/windriver/Integration-Jenkins-DNS-openrc
deleted file mode 100644
index 313cf125a..000000000
--- a/test/ete/labs/windriver/Integration-Jenkins-DNS-openrc
+++ /dev/null
@@ -1,10 +0,0 @@
-export OS_PROJECT_ID=bf80d09fbc804b42b3bc727d6cf1fcbe
-
-export OS_PROJECT_NAME=Integration-Jenkins
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-00-DNS-openrc b/test/ete/labs/windriver/Integration-SB-00-DNS-openrc
deleted file mode 100644
index cfbe22fe6..000000000
--- a/test/ete/labs/windriver/Integration-SB-00-DNS-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=a813ac529c6d4b44a3308ed38bcd7480
-export OS_PROJECT_NAME=Integration-SB-00
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-01-DNS-openrc b/test/ete/labs/windriver/Integration-SB-01-DNS-openrc
deleted file mode 100644
index e9007da94..000000000
--- a/test/ete/labs/windriver/Integration-SB-01-DNS-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=4318a6c5788449cc97c88fd745b554b9
-export OS_PROJECT_NAME=Integration-SB-01
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-02-DNS-openrc b/test/ete/labs/windriver/Integration-SB-02-DNS-openrc
deleted file mode 100644
index 968904d34..000000000
--- a/test/ete/labs/windriver/Integration-SB-02-DNS-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=89fee629f5f044739fb64380be63b6da
-export OS_PROJECT_NAME=Integration-SB-02
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-03-DNS-openrc b/test/ete/labs/windriver/Integration-SB-03-DNS-openrc
deleted file mode 100644
index 44073b759..000000000
--- a/test/ete/labs/windriver/Integration-SB-03-DNS-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=29fb1a7806e84d8fbc93fa3945f1e2a5
-export OS_PROJECT_NAME=Integration-SB-03
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-04-DNS-openrc b/test/ete/labs/windriver/Integration-SB-04-DNS-openrc
deleted file mode 100644
index d7ba190a7..000000000
--- a/test/ete/labs/windriver/Integration-SB-04-DNS-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=024b911be9514ed7885af0c6bf6f68c8
-export OS_PROJECT_NAME=Integration-SB-04
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-05-DNS-openrc b/test/ete/labs/windriver/Integration-SB-05-DNS-openrc
deleted file mode 100644
index f7612630c..000000000
--- a/test/ete/labs/windriver/Integration-SB-05-DNS-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=d4e1d9e89456490cb7213092086e5c66
-export OS_PROJECT_NAME=Integration-SB-05
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-06-DNS-openrc b/test/ete/labs/windriver/Integration-SB-06-DNS-openrc
deleted file mode 100644
index 5f211585a..000000000
--- a/test/ete/labs/windriver/Integration-SB-06-DNS-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=2d7c6ec2cf9147fa974fa059b3673d7a
-export OS_PROJECT_NAME=Integration-SB-06
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/Integration-SB-07-DNS-openrc b/test/ete/labs/windriver/Integration-SB-07-DNS-openrc
deleted file mode 100644
index 170859f87..000000000
--- a/test/ete/labs/windriver/Integration-SB-07-DNS-openrc
+++ /dev/null
@@ -1,9 +0,0 @@
-export OS_PROJECT_ID=885777d5e9074f31ad7801f9e6876b84
-export OS_PROJECT_NAME=Integration-SB-07
-export OS_USER_DOMAIN_NAME=Default
-export OS_USERNAME=demo
-export OS_PASSWORD=onapdemo
-export OS_AUTH_URL=http://10.12.25.5:5000/v3
-export OS_IDENTITY_API_VERSION=3
-export OS_REGION_NAME=RegionOne
-export OS_INTERFACE=public
diff --git a/test/ete/labs/windriver/apt-proxy.sh b/test/ete/labs/windriver/apt-proxy.sh
index 54b15bba6..365b5d015 100755
--- a/test/ete/labs/windriver/apt-proxy.sh
+++ b/test/ete/labs/windriver/apt-proxy.sh
@@ -11,6 +11,3 @@ sed -i '/#!\/bin\/bash/a\
             Acquire::https::Proxy "DIRECT";\
             EOF\
             apt-get -y update' $1
-
-# don't use insecure docker proxy in dcae
-perl -i -0pe 's/(?<=dcae_c_vm:)(.*?)\{ get_param: nexus_docker_repo \}/$1"nexus3.onap.org:10001"/s' $1
diff --git a/test/ete/labs/windriver/onap-openstack-template.env b/test/ete/labs/windriver/onap-openstack-template.env
index 6f4ea8783..da4b0e7e5 100644
--- a/test/ete/labs/windriver/onap-openstack-template.env
+++ b/test/ete/labs/windriver/onap-openstack-template.env
@@ -92,6 +92,7 @@ parameters:
   music_ip_addr: 10.0.15.1
   oof_ip_addr: 10.0.16.1
   aaf_ip_addr: 10.0.13.1
+  sms_ip_addr: 10.0.13.2
   nbi_ip_addr: 10.0.17.1
 
   ###########################