diff options
| author |   Brian Freeman <bf1936@att.com> | 2018-08-01 12:46:01 -0500 |
|---|---|---|
| committer | Brian Freeman <bf1936@att.com> | 2018-08-01 12:47:28 -0500 |
| commit | db1e741e8d9ebb4b8e0d2e780800bb28972a4368 (patch) | |
| tree | d8d5250b8e7a22ee0e887bb18ec4ea03e062118b | |
| parent | 8c002d56e1f5e93ee9ba95057700383c6adc9346 (diff) | |
Fixes for Casablanca SDC
Issue-ID: INT-609
Change-Id: I6efc6e1ffd2667547320d5d3c37273b367da59df
Signed-off-by: Brian Freeman <bf1936@att.com>
| -rw-r--r-- | robot/assets/templates/asdc/catalog_service.template | 18 | ||||
| -rw-r--r-- | robot/resources/asdc_interface.robot | 10 |
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']} |