diff options
| author |   Brian Freeman <bf1936@att.com> | 2020-04-27 18:26:07 -0500 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2020-05-01 08:30:45 -0500 |
| commit | b548819a2c9f68f68312ef11c15aad966227606a (patch) | |
| tree | 17bd56307da592858fcaf7742dd5d911468cc26d | |
| parent | b73d77ca2e9df3d7300ca85b5593d89a9271d13a (diff) | |
Add instantiateVFWCLDN for DANOS
Issue-ID: INT-1566
Change-Id: I48525947492061a98092f3b102ba240146a18e61
Signed-off-by: Brian Freeman <bf1936@att.com>
| -rwxr-xr-x | ete-k8s.sh | 3 | ||||
| -rw-r--r-- | resources/config/eteshare/config/robot_properties.py | 2 | ||||
| -rw-r--r-- | values.yaml | 3 |
3 files changed, 7 insertions, 1 deletions
@@ -28,7 +28,8 @@ if [ "$1" == "" ] || [ "$2" == "" ]; then echo " clamp.robot: clamp" echo "" echo " demo.robot: InitDemo, InitCustomer, APPCCDTPreloadDemo, APPCMountPointDemo, DistributeDemoVFWDT, DistributeVFWNG," - echo " InitDistribution, PreloadDemo, deleteVNF, heatbridge, instantiateDemoVFWCL, instantiateVFW, instantiateVFWCL, instantiateVFWDT" + echo " InitDistribution, PreloadDemo, deleteVNF, heatbridge, instantiateDemoVFWCL, instantiateVFW, " + echo " instantiateVFWCL, instantiateVFWDT, instantiateVFWCLDN" echo "" echo " health-check.robot: health, core, small, medium, 3rdparty, api, datarouter, externalapi, health-aaf, health-aai, health-appc," echo " health-clamp, health-cli, health-dcae, health-dmaap, health-log, health-modeling, health-msb," diff --git a/resources/config/eteshare/config/robot_properties.py b/resources/config/eteshare/config/robot_properties.py index 951c0a1..73336d9 100644 --- a/resources/config/eteshare/config/robot_properties.py +++ b/resources/config/eteshare/config/robot_properties.py @@ -111,6 +111,8 @@ GLOBAL_INJECTED_SO_VNFM_IP_ADDR = 'so-vnfm-adapter.{{include "common.namespace" GLOBAL_INJECTED_UBUNTU_1404_IMAGE = '{{ .Values.ubuntu14Image }}' GLOBAL_INJECTED_UBUNTU_1604_IMAGE = '{{ .Values.ubuntu16Image }}' GLOBAL_INJECTED_VM_IMAGE_NAME = '{{ .Values.ubuntu14Image }}' +GLOBAL_INJECTED_DANOS_IMAGE_NAME = '{{ .Values.danosImage }}' +GLOBAL_INJECTED_DANOS_FLAVOR = '{{ .Values.danosFlavor }}' GLOBAL_INJECTED_VID_IP_ADDR = 'vid.{{include "common.namespace" .}}' GLOBAL_INJECTED_VM_FLAVOR = '{{ .Values.openStackFlavourMedium }}' GLOBAL_INJECTED_VNFSDK_IP_ADDR = 'refrepo.{{include "common.namespace" .}}' diff --git a/values.yaml b/values.yaml index 339edae..e3e8ea1 100644 --- a/values.yaml +++ b/values.yaml @@ -104,6 +104,9 @@ openStackDomainIdRegionThree: "Default" ubuntu14Image: "Ubuntu_14_trusty" # Openstack glance image name for Ubuntu 16. Maps to GLOBAL_INJECTED_UBUNTU_1604_IMAGE ubuntu16Image: "Ubuntu_16_xenial" +# DANOS image and flavor references +danosImage: "danos-ves-image" +danosFlavor: "danos" # GLOBAL_INJECTED_SCRIPT_VERSION. Maps to GLOBAL_INJECTED_SCRIPT_VERSION scriptVersion: "1.4.0" # Openstack network to which VNFs will bind their primary (first) interface. Maps to GLOBAL_INJECTED_NETWORK |