diff options
| -rw-r--r-- | robot/assets/templates/so/cds_service_template.jinja | 9 | ||||
| -rw-r--r-- | robot/resources/global_properties.robot | 4 | ||||
| -rw-r--r-- | robot/resources/sdc_interface.robot | 2 | ||||
| -rwxr-xr-x | robot/resources/so/direct_instantiate.robot | 2 |
4 files changed, 15 insertions, 2 deletions
diff --git a/robot/assets/templates/so/cds_service_template.jinja b/robot/assets/templates/so/cds_service_template.jinja index 9b6e1cc2..f63a717a 100644 --- a/robot/assets/templates/so/cds_service_template.jinja +++ b/robot/assets/templates/so/cds_service_template.jinja @@ -50,6 +50,15 @@ "instanceName":"{{resp['serviceVnfs'][0]['modelInfo']['modelInstanceName']}}", "instanceParams":[ { + "dcae_collector_ip":"{{dcae_collector_ip}}", + "dcae_collector_port":"{{dcae_collector_port}}", + "vlb_0_int_pktgen_private_port_0_mac":"{{vlb_0_int_pktgen_private_port_0_mac}}", + "vpg_0_int_pktgen_private_port_0_mac":"{{vpg_0_int_pktgen_private_port_0_mac}}", + "key_name":"olc-key", + "nb_api_version":"1.2.0", + "nexus_artifact_repo":"https://nexus.onap.org", + "repo_url_artifacts":"https://nexus.onap.org/content/groups/staging", + "repo_url_blob":"https://nexus.onap.org/content/repositories/raw", "onap_private_net_id":"{{GLOBAL_INJECTED_NETWORK}}", "onap_private_subnet_id":"{{GLOBAL_INJECTED_OPENSTACK_PRIVATE_SUBNET_ID}}", "pub_key":"{{GLOBAL_INJECTED_PUBLIC_KEY}}", diff --git a/robot/resources/global_properties.robot b/robot/resources/global_properties.robot index 993d9a66..fd40eb05 100644 --- a/robot/resources/global_properties.robot +++ b/robot/resources/global_properties.robot @@ -42,3 +42,7 @@ ${GLOBAL_SO_CLOUD_CONFIG_PATH} /cloudSite ${GLOBAL_SO_CLOUD_CONFIG_TEMPLATE} so/create_cloud_config.jinja ${GLOBAL_SDC_DCAE_BE_ENDPOINT} ${GLOBAL_SDC_SERVER_PROTOCOL}://${GLOBAL_INJECTED_SDC_DCAE_BE_IP_ADDR}:${GLOBAL_SDC_DCAE_BE_PORT} ${GLOBAL_SO_ORCHESTRATION_REQUESTS_PATH} /onap/so/infra/orchestrationRequests/v7 +${GLOBAL_DCAE_COLLECTOR_IP} 10.12.5.250 +${GLOBAL_DCAE_COLLECTOR_PORT} 30417 +${GLOBAL_VLB_0_INT_PKTGEN_PRIVATE_PORT_0_MAC} fa:16:3e:00:00:10 +${GLOBAL_VPG_0_INT_PKTGEN_PRIVATE_PORT_0_MAC} fa:16:3e:00:00:20 diff --git a/robot/resources/sdc_interface.robot b/robot/resources/sdc_interface.robot index 3382f648..a760e7aa 100644 --- a/robot/resources/sdc_interface.robot +++ b/robot/resources/sdc_interface.robot @@ -948,7 +948,7 @@ Add CDS Parameters ... ELSE IF '${input['name']}' == "sdnc_model_name" Set Input Parameter ${service_uuid} ${component_uuid} ${input} string vLB_CDS ... ELSE IF '${input['name']}' == "sdnc_model_version" Set Input Parameter ${service_uuid} ${component_uuid} ${input} string 1.0.0 ... ELSE IF '${input['name']}' == "skip_post_instantiation_configuration" Set Input Parameter ${service_uuid} ${component_uuid} ${input} boolean ${skip_post_instatiation} - + ... ELSE IF '${input['name']}' == "controller_actor" Set Input Parameter ${service_uuid} ${component_uuid} ${input} string CDS Set Input Parameter [Arguments] ${service_uuid} ${component_uuid} ${input} ${input_type} ${input_value} diff --git a/robot/resources/so/direct_instantiate.robot b/robot/resources/so/direct_instantiate.robot index 1ecaaef7..556c5a9e 100755 --- a/robot/resources/so/direct_instantiate.robot +++ b/robot/resources/so/direct_instantiate.robot @@ -71,7 +71,7 @@ CDS Service Instantiate ${cds_instance_name}= Set Variable cds_vlb_svc_${customized_time_stamp} ${global_parameters}= Get Globally Injected Parameters ${owning_entity_id}= Get OwningEntity Id OE-Demonstration - ${dict}= Set To Dictionary ${global_parameters} service_instance_name=${cds_instance_name} owning_entity=OE-Demonstration homing_solution=none owning_entity_id=${owning_entity_id} subscriber_id=Demonstration cloud_owner=${GLOBAL_AAI_CLOUD_OWNER} subscription_service_type=vLB service_model_name=${cds_service_model} service_model_uuid=${service_uuid} service_model_invariantuuid=${service_invariantUUID} resp=${resp.json()} + ${dict}= Set To Dictionary ${global_parameters} dcae_collector_ip=${GLOBAL_DCAE_COLLECTOR_IP} dcae_collector_port=${GLOBAL_DCAE_COLLECTOR_PORT} vlb_0_int_pktgen_private_port_0_mac=${GLOBAL_VLB_0_INT_PKTGEN_PRIVATE_PORT_0_MAC} vpg_0_int_pktgen_private_port_0_mac=${GLOBAL_VPG_0_INT_PKTGEN_PRIVATE_PORT_0_MAC} service_instance_name=${cds_instance_name} owning_entity=OE-Demonstration homing_solution=none owning_entity_id=${owning_entity_id} subscriber_id=Demonstration cloud_owner=${GLOBAL_AAI_CLOUD_OWNER} subscription_service_type=vLB service_model_name=${cds_service_model} service_model_uuid=${service_uuid} service_model_invariantuuid=${service_invariantUUID} resp=${resp.json()} Templating.Create Environment cds ${GLOBAL_TEMPLATE_FOLDER} ${data}= Templating.Apply Template cds ${SO_TEMPLATE_PATH}/cds_service_template.jinja ${dict} Log ${data} |