Fix vFW Closed Loop robot test case

Issued addressed by this change:

* Cherry picked from Amsterdam
* Send the invariantUUID of VPKTG to Policy instead of VFW
* Extraneous single quote characters in the policy yaml
* Policy update wouldn’t “stick” until I added in the delays
  in between the various Policy API calls
* Had to ignore the VID teardown errors; not sure if this is
  necessary to pass the closed loop test

Change-Id: Ie504736484df78c46f564ee21bbd0c22d494af1f
Issue-ID: INT-406
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
Signed-off-by: Brian Freeman <bf1936@att.com>
diff --git a/robot/resources/demo_preload.robot b/robot/resources/demo_preload.robot
index 406f8f0..1a0e034 100644
--- a/robot/resources/demo_preload.robot
+++ b/robot/resources/demo_preload.robot
@@ -98,6 +98,12 @@
     \     Return From Keyword If    '${status}' == 'PASS'   ${relationship_data}
 
 
+Get Generic VNF By ID
+    [Arguments]   ${vnf_id}
+    ${resp}=    Run A&AI Get Request      ${AAI_INDEX PATH}/network/generic-vnfs/generic-vnf?vnf-id=${vnf_id}
+    Should Be Equal As Strings 	${resp.status_code} 	200
+    [Return]   ${resp.json()}
+
 Get Service Instance
     [Arguments]   ${vnf_name}
     ${resp}=    Run A&AI Get Request      ${AAI_INDEX PATH}/network/generic-vnfs/generic-vnf?vnf-name=${vnf_name}