Fix ControlLoop Name and Teardown

Issue-ID: INT-1272
Change-Id: Ib9d628b59d1b0367d05d7f4973cf66ad0a48f161
Signed-off-by: Brian Freeman <bf1936@att.com>

diff --git a/robot/assets/templates/policy/FirewallPolicy_update.jinja b/robot/assets/templates/policy/FirewallPolicy_update.jinja
index 28c3040..2a71c1d 100644 (file)
--- a/robot/assets/templates/policy/FirewallPolicy_update.jinja
+++ b/robot/assets/templates/policy/FirewallPolicy_update.jinja
@@ -9,8 +9,8 @@
                },
                "RULE": {
                        "templateName": "ClosedLoopControlName",
-                       "closedLoopControlName": "ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a",
-                       "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-d0a1dfc6-94f5-4fd4-a5b5-4630b438850a%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+{{RESOURCE_ID}}%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
+                       "closedLoopControlName": "ControlLoop-vFirewall-{{RESOURCE_ID}}",
+                       "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+2.0.0%0D%0A++controlLoopName%3A+ControlLoop-vFirewall-{{RESOURCE_ID}}%0D%0A++trigger_policy%3A+unique-policy-id-1-modifyConfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-1-modifyConfig%0D%0A++++name%3A+modify+packet+gen+config%0D%0A++++description%3A%0D%0A++++actor%3A+APPC%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+TBD+-+Cannot+be+known+until+instantiation+is+done%0D%0A++++++resourceID%3A+{{RESOURCE_ID}}%0D%0A++++++type%3A+VNF%0D%0A++++retry%3A+0%0D%0A++++timeout%3A+300%0D%0A++++success%3A+final_success%0D%0A++++failure%3A+final_failure%0D%0A++++failure_timeout%3A+final_failure_timeout%0D%0A++++failure_retries%3A+final_failure_retries%0D%0A++++failure_exception%3A+final_failure_exception%0D%0A++++failure_guard%3A+final_failure_guard"
                }
        }
-}
\ No newline at end of file
+}

diff --git a/robot/testsuites/closed-loop.robot b/robot/testsuites/closed-loop.robot
index 7c6ebcc..bd26a62 100644 (file)
--- a/robot/testsuites/closed-loop.robot
+++ b/robot/testsuites/closed-loop.robot
@@ -20,5 +20,5 @@ VFWCL Closed Loop Test
     Log     ${EMPTY}
     VFWCL High Test   ${PACKET_GENERATOR_HOST}
     VFWCL Low Test   ${PACKET_GENERATOR_HOST}
-    [Teardown]  Run Keywords  VFWCL Set To Medium    ${PACKET_GENERATOR_HOST}
-    ...         AND           Teardown Closed Loop   ${None}    ${None}    ${None}      
\ No newline at end of file
+    [Teardown]  VFWCL Set To Medium    ${PACKET_GENERATOR_HOST}
+