Fix vLBCL AAI API call parameters

Change-Id: I19ade9e02a9088f509620e43e1f241a1900cfb71
Issue-ID: INT-407
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

diff --git a/robot/assets/templates/aai/vlb_closed_loop_hack.template b/robot/assets/templates/aai/vlb_closed_loop_hack.template
index 8bee786..9103e3c 100644 (file)
--- a/robot/assets/templates/aai/vlb_closed_loop_hack.template
+++ b/robot/assets/templates/aai/vlb_closed_loop_hack.template
@@ -1,7 +1,7 @@
 {
        "is-base-vf-module": false,
-       "model-invariant-id": "${model-invariant-id}",
-       "model-version-id": "${model-version-id}",
+       "model-invariant-id": "${model_invariant_id}",
+       "model-version-id": "${model_version_id}",
        "vf-module-id": "${vf_module_id}",
        "vf-module-name": "${vf_module_id}"
 }

diff --git a/robot/resources/aai/service_instance.robot b/robot/resources/aai/service_instance.robot
index 875067c..1b8b0eb 100644 (file)
--- a/robot/resources/aai/service_instance.robot
+++ b/robot/resources/aai/service_instance.robot
@@ -62,10 +62,10 @@ VLB Closed Loop Hack
     ${vf_modules}=    Get From Dictionary    ${generic_vnf}    vf-modules
     ${list}=    Get From Dictionary    ${vf_modules}   vf-module
     ${vfmodule}=    Get From List    ${list}    0
-    ${model-invariant-id}=    Get From Dictionary    ${closedloop_vf_module}    invariantUUID
-    ${model-version-id}=   Get From Dictionary    ${closedloop_vf_module}    groupUUID
+    ${model_invariant_id}=    Get From Dictionary    ${closedloop_vf_module}    invariantUUID
+    ${model_version_id}=   Get From Dictionary    ${closedloop_vf_module}    groupUUID
     ${dummy}=    Catenate   dummy_${vnf_id}
-    ${dict}=    Create Dictionary   vnf_id=${vnf_id}   vf_module_id=${dummy}   model-invariant-id=${model-invariant-id}   model-version-id=${model-version-id}
+    ${dict}=    Create Dictionary   vnf_id=${vnf_id}   vf_module_id=${dummy}   model_invariant_id=${model_invariant_id}   model_version_id=${model_version_id}
     ${datapath}=    Template String    ${GENERIC_VNF_PATH_TEMPLATE}    ${dict}
     ${data}=   Fill JSON Template File    ${VLB_CLOSED_LOOP_HACK_BODY}    ${dict}
        ${put_resp}=    Run A&AI Put Request     ${INDEX PATH}${datapath}   ${data}