diff options
| author |   Brian Freeman <bf1936@att.com> | 2019-11-06 13:27:28 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-11-06 13:27:28 +0000 |
| commit | bbd910647e51273070944fbd8217433c169d16e5 (patch) | |
| tree | 004af6de5259b12cac7be0296aa96424f4414222 | |
| parent | 71d1a6e7ea4cdba97aed46c66921ab213b4588ff (diff) | |
| parent | 080b6e611bcbf5ddd1bebb290168a4e76a9215b0 (diff) | |
Merge "Revert VNFM https" into elalto
| -rwxr-xr-x | demo-k8s.sh | 8 | ||||
| -rw-r--r-- | resources/config/eteshare/config/robot_properties.py | 3 |
2 files changed, 10 insertions, 1 deletions
diff --git a/demo-k8s.sh b/demo-k8s.sh index 72a6b0a..eca3232 100755 --- a/demo-k8s.sh +++ b/demo-k8s.sh @@ -45,6 +45,9 @@ function usage echo " - Instantiate vFW module using direct SO interface using previously distributed model " echo " that is in /tmp/csar in robot container" echo " " + echo " demo-k8s.sh <namespace> instantiateVLB_CDS" + echo " - Instantiate vLB module using CDS with a preloaded CBA " + echo " " echo " demo-k8s.sh <namespace> deleteVNF <module_name from instantiateVFW>" echo " - Delete the module created by instantiateVFW" echo " " @@ -158,6 +161,11 @@ do VARIABLES="$VARIABLES -v CSAR_FILE:$1 -v GLOBAL_BUILD_NUMBER:$$" shift ;; + instantiateVLB_CDS) + TAG="instantiateVLB_CDS" + VARIABLES="$VARIABLES -v GLOBAL_BUILD_NUMBER:$$" + shift + ;; deleteVNF) TAG="deleteVNF" shift diff --git a/resources/config/eteshare/config/robot_properties.py b/resources/config/eteshare/config/robot_properties.py index bfe29c2..ef51f72 100644 --- a/resources/config/eteshare/config/robot_properties.py +++ b/resources/config/eteshare/config/robot_properties.py @@ -232,7 +232,8 @@ GLOBAL_SO_OPENSTACK_ENDPOINT = 'http://' + GLOBAL_INJECTED_SO_OPENSTACK_IP_ADDR 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 = '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 # music info - everything is from the private oam network (also called onap private network) GLOBAL_MUSIC_SERVER_PROTOCOL = "http" GLOBAL_MUSIC_SERVER_PORT = "8080" |