Merge "[ROBOT] Version bump for Guilin"
diff --git a/INFO.yaml b/INFO.yaml
index 3506651..6f15913 100644
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -101,6 +101,11 @@
company: 'orange'
id: 'jardellos'
timezone: 'Europe/Paris'
+ - name: 'Lasse Kaihlavirta'
+ email: 'l.kaihlavirt@partner.samsung.com'
+ company: 'samsung'
+ id: 'kaihlavi'
+ timezone: 'Europe/Helsinki'
tsc:
approval: 'https://lists.onap.org/pipermail/onap-tsc'
changes:
@@ -131,3 +136,6 @@
- type: 'Addition'
name: 'Thierry Hardy'
link: 'https://lists.onap.org/g/onap-tsc/message/7102'
+ - type: 'Addition'
+ name: 'Lasse Kaihlavirta'
+ link: 'https://lists.onap.org/g/onap-tsc/message/7280'
diff --git a/resources/config/eteshare/config/robot_properties.py b/resources/config/eteshare/config/robot_properties.py
index 9ef41c4..ef12c9a 100644
--- a/resources/config/eteshare/config/robot_properties.py
+++ b/resources/config/eteshare/config/robot_properties.py
@@ -247,7 +247,7 @@
GLOBAL_SO_REQDB_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_REQDB_IP_ADDR + ':' + GLOBAL_SO_REQDB_SERVER_PORT
GLOBAL_SO_SDNC_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_SDNC_IP_ADDR + ':' + GLOBAL_SO_SDNC_SERVER_PORT
GLOBAL_SO_VFC_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_VFC_IP_ADDR + ':' + GLOBAL_SO_VFC_SERVER_PORT
-GLOBAL_SO_VNFM_ENDPOINT = 'https://' + GLOBAL_INJECTED_SO_VNFM_IP_ADDR + ':' + GLOBAL_SO_VNFM_SERVER_PORT
+GLOBAL_SO_VNFM_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_VNFM_IP_ADDR + ':' + GLOBAL_SO_VNFM_SERVER_PORT
GLOBAL_SO_NSSMF_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_NSSMF_IP_ADDR + ':' + GLOBAL_SO_NSSMF_SERVER_PORT
#GLOBAL_SO_VNFM_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_VNFM_IP_ADDR + ':' + GLOBAL_SO_VNFM_SERVER_PORT
# music info - everything is from the private oam network (also called onap private network)
diff --git a/values.yaml b/values.yaml
index 0e4bba0..bbc4a95 100644
--- a/values.yaml
+++ b/values.yaml
@@ -22,7 +22,7 @@
# application image
repository: nexus3.onap.org:10001
-image: onap/testsuite:1.7.0
+image: onap/testsuite:1.7.2
pullPolicy: Always
ubuntuInitImage: oomk8s/ubuntu-init:2.0.0
@@ -216,7 +216,8 @@
# Demo configuration
# Nexus demo artifact version. Maps to GLOBAL_INJECTED_ARTIFACTS_VERSION
-demoArtifactsVersion: "1.4.0"
+# 1.6.0 Frankfurt change or override for your release to match demo:vnfs/vFW/scripts/pom.xml version
+demoArtifactsVersion: "1.7.0"
# Nexus demo artifact URL.
demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases"
# Openstack medium sized flavour name. Maps GLOBAL_INJECTED_VM_FLAVOR
@@ -279,7 +280,8 @@
danosImage: "danos-ves-image"
danosFlavor: "danos"
# GLOBAL_INJECTED_SCRIPT_VERSION. Maps to GLOBAL_INJECTED_SCRIPT_VERSION
-scriptVersion: "1.4.0"
+# 1.6.0 Frankfurt change or override for your release to match demo:vnfs/vFW/scripts/pom.xml version
+scriptVersion: "1.7.0"
# Openstack network to which VNFs will bind their primary (first) interface. Maps to GLOBAL_INJECTED_NETWORK
openStackPrivateNetId: "e8f51956-00dd-4425-af36-045716781ffc"
# Openstack security group for instantiating VNFs