summaryrefslogtreecommitdiffstats
path: root/robot
diff options
context:
space:
mode:
authorGary Wu <gary.i.wu@huawei.com>2018-08-01 18:28:28 +0000
committerGerrit Code Review <gerrit@onap.org>2018-08-01 18:28:28 +0000
commit2b9299adbd10e47b482ea7bd662d5ca96475756d (patch)
treeb6e0445af3d46cefa1b8ffb7169aa9e39459e529 /robot
parente007927f762b0d336e42480f86fcdf2cbd014e6d (diff)
parentdb1e741e8d9ebb4b8e0d2e780800bb28972a4368 (diff)
Merge "Fixes for Casablanca SDC"
Diffstat (limited to 'robot')
-rw-r--r--robot/assets/templates/asdc/catalog_service.template18
-rw-r--r--robot/resources/asdc_interface.robot10
2 files changed, 16 insertions, 12 deletions
diff --git a/robot/assets/templates/asdc/catalog_service.template b/robot/assets/templates/asdc/catalog_service.template
index e7ffdea6..e35768f4 100644
--- a/robot/assets/templates/asdc/catalog_service.template
+++ b/robot/assets/templates/asdc/catalog_service.template
@@ -9,8 +9,13 @@
"uniqueId": "serviceNewCategory.network l1-3",
"icons": [
"network_l_1-3"
- ]
- }
+ ],
+ "subcategories": null,
+ "version": null,
+ "ownerId": null,
+ "empty": false,
+ "type": null
+ }
],
"description": "catalog service description",
"icon": "network_l_1-3",
@@ -29,6 +34,9 @@
"componentInstances": [],
"properties": [],
"attributes": [],
- "groups": [],
- "serviceApiArtifacts": {}
-} \ No newline at end of file
+ "forwardingPaths": {},
+ "ecompGeneratedNaming": true,
+ "serviceApiArtifacts": {},
+ "instantiationType": "A-la-carte",
+ "environmentContext": "General_Revenue-Bearing"
+}
diff --git a/robot/resources/asdc_interface.robot b/robot/resources/asdc_interface.robot
index 65cf6372..0297802f 100644
--- a/robot/resources/asdc_interface.robot
+++ b/robot/resources/asdc_interface.robot
@@ -103,12 +103,8 @@ Setup ASDC Catalog Resource
Package ASDC Software Product ${software_product_id} ${software_product_version_id}
${software_product_resp}= Get ASDC Software Product ${software_product_id} ${software_product_version_id}
${catalog_resource_id}= Add ASDC Catalog Resource ${license_agreement_id} ${software_product_resp['name']} ${license_model_resp['vendorName']} ${software_product_id}
- Checkin ASDC Catalog Resource ${catalog_resource_id}
- Request Certify ASDC Catalog Resource ${catalog_resource_id}
- Start Certify ASDC Catalog Resource ${catalog_resource_id}
- # on certify it gets a new id
+ ${catalog_resource_id}= Certify ASDC Catalog Resource ${catalog_resource_id} ${ASDC_DESIGNER_USER_ID}
[Return] ${catalog_resource_id}
- ${catalog_resource_id}= Certify ASDC Catalog Resource ${catalog_resource_id}
Add ASDC License Model
[Documentation] Creates an asdc license model and returns its id
${uuid}= Generate UUID
@@ -298,10 +294,10 @@ Start Certify ASDC Catalog Resource
[Return] ${resp.json()}
Certify ASDC Catalog Resource
[Documentation] start certify an asdc Catalog Resource by its id and returns the new id
- [Arguments] ${catalog_resource_id}
+ [Arguments] ${catalog_resource_id} ${user_id}=${ASDC_TESTER_USER_ID}
${map}= Create Dictionary user_remarks=Robot remarks
${data}= Fill JSON Template File ${ASDC_USER_REMARKS_TEMPLATE} ${map}
- ${resp}= Run ASDC Post Request ${ASDC_CATALOG_RESOURCES_PATH}/${catalog_resource_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certify ${data} ${ASDC_TESTER_USER_ID}
+ ${resp}= Run ASDC Post Request ${ASDC_CATALOG_RESOURCES_PATH}/${catalog_resource_id}${ASDC_CATALOG_LIFECYCLE_PATH}/certify ${data} ${user_id}
Should Be Equal As Strings ${resp.status_code} 200
[Return] ${resp.json()['uniqueId']}