summaryrefslogtreecommitdiffstats
path: root/test/ete
diff options
context:
space:
mode:
Diffstat (limited to 'test/ete')
-rwxr-xr-xtest/ete/labs/gwu/apt-proxy.sh3
-rwxr-xr-xtest/ete/labs/huawei/apt-proxy.sh3
-rwxr-xr-xtest/ete/labs/tlab/apt-proxy.sh3
-rw-r--r--test/ete/labs/tlab/onap-openstack-template.env1
-rwxr-xr-xtest/ete/labs/windriver/apt-proxy.sh3
-rw-r--r--test/ete/labs/windriver/onap-openstack-template.env1
-rwxr-xr-xtest/ete/scripts/install_openstack_cli.sh6
7 files changed, 5 insertions, 15 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/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/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
###########################
diff --git a/test/ete/scripts/install_openstack_cli.sh b/test/ete/scripts/install_openstack_cli.sh
index 8f1529606..842034eef 100755
--- a/test/ete/scripts/install_openstack_cli.sh
+++ b/test/ete/scripts/install_openstack_cli.sh
@@ -24,10 +24,10 @@ else
ONAP_VENV=$(mktemp -d --suffix=_onap_venv)
virtualenv ${ONAP_VENV}
source ${ONAP_VENV}/bin/activate
-
+
pip install --upgrade pip
- pip install openstacksdk==0.9.19 python-openstackclient python-heatclient python-designateclient
-
+ pip install python-openstackclient python-heatclient python-designateclient
+
echo "ONAP_VENV=${ONAP_VENV}" >> $WORKSPACE/env.properties
fi
echo "ONAP_VENV=${ONAP_VENV}"