diff options
| author |   Brian Freeman <bf1936@att.com> | 2020-04-15 12:52:41 -0500 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2020-04-15 12:54:02 -0500 |
| commit | 431689c7879a92be54477f13f8e39908db5f07f2 (patch) | |
| tree | 4826a6badbe723b27c2dc964e71f0165d7df950c | |
| parent | a995fce78ae63d33a0c48d825001ed7faea3b18f (diff) | |
Handle less than /16 oam network
Matching changes in testsuite and demo
Issue-ID: INT-1527
Change-Id: Iac7cdb735c4544e0d6bc79c444ba9de32b79fc32
Signed-off-by: Brian Freeman <bf1936@att.com>
| -rw-r--r-- | resources/config/eteshare/config/robot_properties.py | 1 | ||||
| -rw-r--r-- | values.yaml | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/resources/config/eteshare/config/robot_properties.py b/resources/config/eteshare/config/robot_properties.py index afbd2d2..951c0a1 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 }}" diff --git a/values.yaml b/values.yaml index d2380b5..9c9ce5f 100644 --- a/values.yaml +++ b/values.yaml @@ -118,6 +118,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" |