diff options
| author |   Mike Elliott <mike.elliott@amdocs.com> | 2018-05-07 23:39:24 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-05-07 23:39:24 +0000 |
| commit | 25bfd399919f9599a2ba4f94cac72875473e6297 (patch) | |
| tree | 7d3183b3f5acd7ffc2dcd90457266632d93194fd /kubernetes/robot/resources/config/eteshare | |
| parent | edd7598346bcc35a0dcda9c0184a4e694e82e07e (diff) | |
| parent | 40b120bcf746bb5874a978170f602bf733e456ab (diff) | |
Merge "OOF Integration Changes"
Diffstat (limited to 'kubernetes/robot/resources/config/eteshare')
| -rwxr-xr-x | kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py | 4 | ||||
| -rwxr-xr-x | kubernetes/robot/resources/config/eteshare/config/vm_properties.py | 8 |
2 files changed, 10 insertions, 2 deletions
diff --git a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py index 2235a31f71..a450af3dd9 100755 --- a/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/integration_robot_properties.py @@ -48,6 +48,10 @@ GLOBAL_MSO_PASSWORD = "password1$" # music info - everything is from the private oam network (also called onap private network) GLOBAL_MUSIC_SERVER_PROTOCOL = "http" GLOBAL_MUSIC_SERVER_PORT = "8080" +# oof +GLOBAL_OOF_SERVER_PROTOCOL = "http" +GLOBAL_OOF_HOMING_SERVER_PORT = "8091" +GLOBAL_OOF_SNIRO_SERVER_PORT = "8698" # openstack info - info to select right info in environment # packet generate vnf info - everything is from the private oam network (also called onap private network) GLOBAL_PACKET_GENERATOR_PORT = "8183" diff --git a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py index 7ce15db7ea..6a07a75f72 100755 --- a/kubernetes/robot/resources/config/eteshare/config/vm_properties.py +++ b/kubernetes/robot/resources/config/eteshare/config/vm_properties.py @@ -26,7 +26,9 @@ GLOBAL_INJECTED_NEXUS_DOCKER_REPO = "nexus3.onap.org:10001" GLOBAL_INJECTED_NEXUS_PASSWORD = "docker" GLOBAL_INJECTED_NEXUS_REPO = "https://nexus.onap.org/content/sites/raw" GLOBAL_INJECTED_NEXUS_USERNAME = "docker" -GLOBAL_INJECTED_OOF_IP_ADDR = "oof.{{include "common.namespace" .}}" +GLOBAL_INJECTED_OOF_IP_ADDR = "N/A" +GLOBAL_INJECTED_OOF_HOMING_IP_ADDR = "oof-has-api.{{include "common.namespace" .}}" +GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR = "oof-osdf.{{include "common.namespace" .}}" GLOBAL_INJECTED_OPENO_IP_ADDR = "msb-iag.{{include "common.namespace" .}}" GLOBAL_INJECTED_OPENSTACK_PASSWORD = "{{ .Values.openStackPassword }}" GLOBAL_INJECTED_OPENSTACK_TENANT_ID = "{{ .Values.openStackTenantId }}" @@ -77,7 +79,9 @@ GLOBAL_INJECTED_PROPERTIES = { "GLOBAL_INJECTED_NEXUS_PASSWORD" : "docker", "GLOBAL_INJECTED_NEXUS_REPO" : "https://nexus.onap.org/content/sites/raw", "GLOBAL_INJECTED_NEXUS_USERNAME" : "docker", - "GLOBAL_INJECTED_OOF_IP_ADDR" : "oof.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_OOF_IP_ADDR" : "N/A", + "GLOBAL_INJECTED_OOF_HOMING_IP_ADDR" : "oof-has-api.{{include "common.namespace" .}}", + "GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR" : "oof-osdf.{{include "common.namespace" .}}", "GLOBAL_INJECTED_OPENO_IP_ADDR" : "msb-iag.{{include "common.namespace" .}}", "GLOBAL_INJECTED_OPENSTACK_PASSWORD" : "{{ .Values.openStackEncryptedPassword }}", "GLOBAL_INJECTED_OPENSTACK_TENANT_ID" : "{{ .Values.openStackTenantId }}", |