diff options
| -rwxr-xr-x | ete-k8s.sh | 3 | ||||
| -rw-r--r-- | resources/config/eteshare/config/robot_properties.py | 5 | ||||
| -rwxr-xr-x | scripts/etescript/vnfsdk-etescript.sh | 6 | ||||
| -rw-r--r-- | values.yaml | 9 |
4 files changed, 15 insertions, 8 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 974a996..73336d9 100644 --- a/resources/config/eteshare/config/robot_properties.py +++ b/resources/config/eteshare/config/robot_properties.py @@ -74,6 +74,7 @@ GLOBAL_INJECTED_OPENSTACK_TENANT_ID_REGION_THREE = '{{ .Values.openStackTenantId GLOBAL_INJECTED_OPENSTACK_PROJECT_DOMAIN_REGION_THREE = '{{ .Values.openStackProjectNameRegionThree }}' GLOBAL_INJECTED_OPENSTACK_USER_DOMAIN_REGION_THREE = '{{ .Values.openStackDomainIdRegionThree }}' GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_CIDR_PREFIX = '{{ .Values.openStackOamNetworkCidrPrefix }}' +GLOBAL_INJECTED_OPENSTACK_OAM_NETWORK_3RD_OCTET = '{{ .Values.openStackOamNetwork3rdOctet}}' GLOBAL_INJECTED_OPENSTACK_PUBLIC_NETWORK = '{{ .Values.openStackPublicNetworkName }}' GLOBAL_INJECTED_OPENSTACK_SECURITY_GROUP = '{{ .Values.openStackSecurityGroup }}' GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID = "{{ .Values.openStackPrivateSubnetId }}" @@ -110,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" .}}' @@ -152,7 +155,7 @@ GLOBAL_NBI_SERVER_PROTOCOL = "https" GLOBAL_NBI_SERVER_PORT = "8443" # cli info - everything is from the private oam network (also called onap private network) GLOBAL_CLI_SERVER_PROTOCOL = "https" -GLOBAL_CLI_SERVER_PORT = "8443" +GLOBAL_CLI_SERVER_PORT = "443" # dcae info - everything is from the private oam network (also called onap private network) GLOBAL_DCAE_SERVER_PROTOCOL = "http" GLOBAL_DCAE_HEALTH_SERVER_PORT = "80" diff --git a/scripts/etescript/vnfsdk-etescript.sh b/scripts/etescript/vnfsdk-etescript.sh index c9bc6be..f1d3969 100755 --- a/scripts/etescript/vnfsdk-etescript.sh +++ b/scripts/etescript/vnfsdk-etescript.sh @@ -1,8 +1,4 @@ -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. +# SPDX-License-Identifier: Apache-2.0 #!/bin/bash diff --git a/values.yaml b/values.yaml index d2380b5..6ee09fb 100644 --- a/values.yaml +++ b/values.yaml @@ -22,7 +22,7 @@ global: # global defaults # application image repository: nexus3.onap.org:10001 -image: onap/testsuite:1.5.4 +image: onap/testsuite:1.6.1 pullPolicy: Always ubuntuInitImage: oomk8s/ubuntu-init:2.0.0 @@ -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 @@ -118,6 +121,10 @@ openStackPrivateNetCidr: "10.0.0.0/8" # The first 2 octets of the private Openstack subnet where VNFs will be spawned. # Needed because sdnc preload templates hardcodes things like this 10.0.${ecompnet}.X openStackOamNetworkCidrPrefix: "10.0" +# If you network allowed a /16 for the ONAP OAM then leave blank and robot will assign +# a random variable to be able to instantiate multple vFWCL, vLB etc in your environemtn +# if you only provided a /24 then provide the 3rd octet you use for your /24 +openStackOamNetwork3rdOctet: "" # VID protocol/port until Selenium issue with SSL resolved # https/8443 vs http/8080 vidServerProtocol: "https" |