From: Marco Platania Date: Wed, 1 Aug 2018 16:45:28 +0000 (-0400) Subject: Make ipv4-oam-address optional X-Git-Tag: v1.3.0~5 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F57%2F58457%2F1;p=testsuite.git Make ipv4-oam-address optional - ipv4-oam-address is an optional parameter. If specified, Heatbridge will write the OAM IP address to AAI. Change-Id: Ie4f72a4e531859d493696257143964e4e3175db1 Issue-ID: INT-602 Signed-off-by: Marco Platania --- diff --git a/robot/resources/heatbridge.robot b/robot/resources/heatbridge.robot index 69f55e16..8e8d6a0e 100644 --- a/robot/resources/heatbridge.robot +++ b/robot/resources/heatbridge.robot @@ -38,7 +38,8 @@ Execute Heatbridge ${stack_id}= Get From Dictionary ${stack_info} id ${tenant_id}= Get From Dictionary ${stack_info} OS::project_id ${vnf_id}= Get From Dictionary ${stack_info} vnf_id - ${ipv4_vnf_address}= Get From Dictionary ${stack_info} ${ipv4_oam_address} + ${KeyIsPresent}= Run Keyword And Return Status Dictionary Should Contain Key ${stack_info} ${ipv4_oam_address} + ${ipv4_vnf_address}= Run Keyword If ${KeyIsPresent} Get From Dictionary ${stack_info} ${ipv4_oam_address} Run Set VNF Params ${vnf_id} ${ipv4_vnf_address} PROV Active ${url} ${path}= Get Keystone Url And Path ${openstack_identity_url}= Catenate ${url}${path}