summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYang Xu <yang.xu3@huawei.com>2019-05-17 01:01:26 -0400
committerGary Wu <gary.i.wu@huawei.com>2019-05-17 06:15:26 +0000
commitfac7a63ac96b226fa6d3a2013feb982ee14790d9 (patch)
tree832d8ff4587ead19b212dfe033a1b0522b302ac5
parent32327a40c69d8ae0a3b318742900f540fd5c8426 (diff)
Set resource type as VL for Generic NeutronNet
Change-Id: I01734240673293596b1695309807f98f6652f16c Issue-ID: INT-1080 Signed-off-by: Yang Xu <yang.xu3@huawei.com> (cherry picked from commit 7464de975c50a3efe1c6a1cbe7159e5ebc705fff)
-rw-r--r--robot/assets/templates/asdc/resource_instance.template2
-rw-r--r--robot/resources/asdc_interface.robot10
2 files changed, 6 insertions, 6 deletions
diff --git a/robot/assets/templates/asdc/resource_instance.template b/robot/assets/templates/asdc/resource_instance.template
index d42f20ca..18cf34c7 100644
--- a/robot/assets/templates/asdc/resource_instance.template
+++ b/robot/assets/templates/asdc/resource_instance.template
@@ -4,7 +4,7 @@
"posY": ${posY},
"name": "${catalog_resource_name}",
"componentVersion": "1.0",
- "originType": "VF",
+ "originType": "${originType}",
"icon": "defaulticon",
"componentUid": "${catalog_resource_id}"
}
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 35eab129..7ba53828 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -116,7 +116,7 @@ Distribute Model From ASDC
\ ${loop_catalog_resource_id}= Set Variable ${generic_neutron_net_uuid}
\ Append To List ${catalog_resource_ids} ${loop_catalog_resource_id}
\ ${loop_catalog_resource_resp}= Get ASDC Catalog Resource ${loop_catalog_resource_id}
- \ ${loop_catalog_resource_id}= Add ASDC Resource Instance ${catalog_service_id} ${loop_catalog_resource_id} ${network} ${xoffset} ${0}
+ \ ${loop_catalog_resource_id}= Add ASDC Resource Instance ${catalog_service_id} ${loop_catalog_resource_id} ${network} ${xoffset} ${0} VL
\ ${nf_role}= Convert To Lowercase ${network}
\ Setup SDC Catalog Resource GenericNeutronNet Properties ${catalog_service_id} ${nf_role} ${loop_catalog_resource_id}
\ ${xoffset}= Set Variable ${xoffset+100}
@@ -824,11 +824,11 @@ Distribute ASDC Catalog Service
Add ASDC Resource Instance
[Documentation] Creates an asdc Resource Instance and returns its id
- [Arguments] ${catalog_service_id} ${catalog_resource_id} ${catalog_resource_name} ${xoffset}=${0} ${yoffset}=${0}
+ [Arguments] ${catalog_service_id} ${catalog_resource_id} ${catalog_resource_name} ${xoffset}=${0} ${yoffset}=${0} ${resourceType}=VF
${milli_timestamp}= Generate MilliTimestamp UUID
${xoffset}= Set Variable ${xoffset+306}
${yoffset}= Set Variable ${yoffset+248}
- ${map}= Create Dictionary catalog_resource_id=${catalog_resource_id} catalog_resource_name=${catalog_resource_name} milli_timestamp=${milli_timestamp} posX=${xoffset} posY=${yoffset}
+ ${map}= Create Dictionary catalog_resource_id=${catalog_resource_id} catalog_resource_name=${catalog_resource_name} milli_timestamp=${milli_timestamp} posX=${xoffset} posY=${yoffset} originType=${resourceType}
${data}= Fill JSON Template File ${ASDC_RESOURCE_INSTANCE_TEMPLATE} ${map}
${resp}= Run ASDC Post Request ${ASDC_CATALOG_SERVICES_PATH}/${catalog_service_id}${ASDC_CATALOG_SERVICE_RESOURCE_INSTANCE_PATH} ${data} ${ASDC_DESIGNER_USER_ID}
Should Be Equal As Strings ${resp.status_code} 201
@@ -836,11 +836,11 @@ Add ASDC Resource Instance
Add ASDC Resource Instance To Resource
[Documentation] Creates an asdc Resource Instance in a Resource (VF) and returns its id
- [Arguments] ${parent_catalog_resource_id} ${catalog_resource_id} ${catalog_resource_name} ${xoffset}=${0} ${yoffset}=${0}
+ [Arguments] ${parent_catalog_resource_id} ${catalog_resource_id} ${catalog_resource_name} ${xoffset}=${0} ${yoffset}=${0} ${resourceType}=VF
${milli_timestamp}= Generate MilliTimestamp UUID
${xoffset}= Set Variable ${xoffset+306}
${yoffset}= Set Variable ${yoffset+248}
- ${map}= Create Dictionary catalog_resource_id=${catalog_resource_id} catalog_resource_name=${catalog_resource_name} milli_timestamp=${milli_timestamp} posX=${xoffset} posY=${yoffset}
+ ${map}= Create Dictionary catalog_resource_id=${catalog_resource_id} catalog_resource_name=${catalog_resource_name} milli_timestamp=${milli_timestamp} posX=${xoffset} posY=${yoffset} originType=${resourceType}
${data}= Fill JSON Template File ${ASDC_RESOURCE_INSTANCE_TEMPLATE} ${map}
${resp}= Run ASDC Post Request ${ASDC_CATALOG_RESOURCES_PATH}/${parent_catalog_resource_id}${ASDC_CATALOG_SERVICE_RESOURCE_INSTANCE_PATH} ${data} ${ASDC_DESIGNER_USER_ID}
Should Be Equal As Strings ${resp.status_code} 201