From 40b120bcf746bb5874a978170f602bf733e456ab Mon Sep 17 00:00:00 2001 From: Ikram Ikramullah Date: Tue, 1 May 2018 11:35:40 -0400 Subject: OOF Integration Changes MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Thank you for the very detailed Review Boris. All changes you had asked have been incorported. Please take a look and let me know. Few important points. All components excep API and Music are services that do not expose any TCP or HTTP ports. All the NodePort and serices section areas in each of these component's values.yaml file have been cleaned. Actually, the service section do not make sense of these components at all. They use Music as a distributed Q to receive and push their tasks/changes. These include a). Controller b). Data c). Solver and 4). Reservation. This is why you didn't see any service.yaml files for these. ------------------------------- Made a single configuration based setup. All HAS components are now configured through a single configmap and a single set of configuration files. All oof-has components share configurations. Restructured the charts so that theere is one parent for oof-has from where properties can be inherited. Removed other issues like the make was failing. All PODs are coming up except data - which depends on AAI certs - team is looking for that side. Issue-ID: OPTFRA-22 Change-Id: I4bf36a68fc3636c822f33f55da70ace577c64ac0 Signed-off-by: Ikram Ikramullah Signed-off-by: Anaƫl Closson Removed Urls not needed Issue-ID: OPTFRA-22 Change-Id: I270de9cbed5f25dd971f40477fb95385a57fba5c Signed-off-by: Ikram Ikramullah Removed Music IPs MK: PS-14: fixing robot testcase by forking the testcase until it is fixed in robot adding target port to osdf service. required to map port 8698:8699 Issue-ID: INT-444 Change-Id: I150e3389aece7fae3b0685647af3a787cc9f267d Signed-off-by: Ikram Ikramullah Signed-off-by: ac2550 Signed-off-by: Ikram Ikramullah Signed-off-by: = <=> Signed-off-by: Ikram Ikramullah Signed-off-by: Ankitkumar Patel Signed-off-by: Thomas Nelson Signed-off-by: Ikram Ikramullah Signed-off-by: Ankitkumar Patel Signed-off-by: Thomas Nelson Signed-off-by: Ikram Ikramullah Signed-off-by: Mandeep Khinda --- .../config/integration_robot_properties.py | 4 +++ .../config/eteshare/config/vm_properties.py | 8 +++-- .../config/robot/resources/oof_interface.robot | 41 ++++++++++++++++++++++ 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 kubernetes/robot/resources/config/robot/resources/oof_interface.robot (limited to 'kubernetes/robot/resources/config') 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 f5df9fc32d..e2b627e253 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 585555312c..7c732c0c28 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 }}" @@ -78,7 +80,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 }}", diff --git a/kubernetes/robot/resources/config/robot/resources/oof_interface.robot b/kubernetes/robot/resources/config/robot/resources/oof_interface.robot new file mode 100644 index 0000000000..1c3137e431 --- /dev/null +++ b/kubernetes/robot/resources/config/robot/resources/oof_interface.robot @@ -0,0 +1,41 @@ +*** Settings *** +Documentation The main interface for interacting with OOF: SNIRO and Homing Service +Library RequestsLibrary + +Resource global_properties.robot + +*** Variables *** +${OOF_HOMING_HEALTH_CHECK_PATH} /v1/plans/healthcheck +${OOF_SNIRO_HEALTH_CHECK_PATH} /api/oof/v1/healthcheck + +${OOF_HOMING_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_HOMING_IP_ADDR}:${GLOBAL_OOF_HOMING_SERVER_PORT} +${OOF_SNIRO_ENDPOINT} ${GLOBAL_OOF_SERVER_PROTOCOL}://${GLOBAL_INJECTED_OOF_SNIRO_IP_ADDR}:${GLOBAL_OOF_SNIRO_SERVER_PORT} + +*** Keywords *** +Run OOF-Homing Health Check + [Documentation] Runs OOF-Homing Health check + ${resp}= Run OOF-Homing Get Request ${OOF_HOMING_HEALTH_CHECK_PATH} + Should Be Equal As Integers ${resp.status_code} 200 + +Run OOF-Homing Get Request + [Documentation] Runs OOF-Homing Get request + [Arguments] ${data_path} + ${session}= Create Session session ${OOF_HOMING_ENDPOINT} + ${resp}= Get Request session ${data_path} + Should Be Equal As Integers ${resp.status_code} 200 + Log Received response from OOF-Homing ${resp.text} + [Return] ${resp} + +Run OOF-SNIRO Health Check + [Documentation] Runs OOF-SNIRO Health check + ${resp}= Run OOF-SNIRO Get Request ${OOF_SNIRO_HEALTH_CHECK_PATH} + Should Be Equal As Integers ${resp.status_code} 200 + +Run OOF-SNIRO Get Request + [Documentation] Runs OOF-SNIRO Get request + [Arguments] ${data_path} + ${session}= Create Session session ${OOF_SNIRO_ENDPOINT} + ${resp}= Get Request session ${data_path} + Should Be Equal As Integers ${resp.status_code} 200 + Log Received response from OOF-SNIRO ${resp.text} + [Return] ${resp} -- cgit 1.2.3-korg