Code changes done for OOF SON use case

Added a new control loop for SON ANR changes
Introducing control loop response flow using DCAE_CL_RSP topic

Change-Id: I81d0e92ce2f5c489596ad70d7b523cab0d8436ce
Issue-ID: POLICY-1463
Signed-off-by: Saravanan A <saravanan.a75@wipro.com>
Signed-off-by: Pamela Dragosh <pdragosh@research.att.com>

2 files changed, 22 insertions, 0 deletions

diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-usecases b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-usecases
index 99843aa10..44fde3245 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-usecases
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/create-cl-usecases
@@ -60,6 +60,12 @@ VPCI_CONTROL_LOOP_NAME="ControlLoop-vPCI-fb41f388-a5f2-11e8-98d0-529269fb1459"
 VPCI_POLICY_NAME="vpci"
 VPCI_CONTROL_LOOP_YAML="controlLoop%3A%0D%0A++version%3A+3.0.0%0D%0A++controlLoopName%3A+ControlLoop-vPCI-fb41f388-a5f2-11e8-98d0-529269fb1459%0D%0A++trigger_policy%3A+unique-policy-id-123-modifyconfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-123-modifyconfig%0D%0A++++name%3A+modify+PCI+config%0D%0A++++description%3A%0D%0A++++actor%3A+SDNR%0D%0A++++recipe%3A+ModifyConfig%0D%0A++++target%3A%0D%0A++++++%23+These+fields+are+not+used%0D%0A++++++resourceID%3A+Eace933104d443b496b8.nodes.heat.vpg%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"
 
+# vSONH Policy Parameters
+VSONH_CONTROL_LOOP_NAME="ControlLoop-vSONH-7d4baf04-8875-4d1f-946d-06b874048b61"
+VSONH_POLICY_NAME="vsonh"
+VSONH_CONTROL_LOOP_YAML="controlLoop%3A%0D%0A++version%3A+4.0.0%0D%0A++controlLoopName%3A+ControlLoop-vSONH-7d4baf04-8875-4d1f-946d-06b874048b61%0D%0A++trigger_policy%3A+unique-policy-id-456-modifyconfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-456-modifyconfig%0D%0A++++name%3A+modify+ANR+config%0D%0A++++description%3A%0D%0A++++actor%3A+SDNR%0D%0A++++recipe%3A+ModifyConfigANR%0D%0A++++target%3A%0D%0A++++++%23+These+fields+are+not+used%0D%0A++++++resourceID%3A+Eace933104d443b496b8.nodes.heat.vpg%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"
+
+
 # CCVPN Policy Parameters
 CCVPN_CONTROL_LOOP_NAME="ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c66b"
 CCVPN_POLICY_NAME="ccvpn"
@@ -310,6 +316,9 @@ mvn archetype:generate \
     -DvpciClosedLoopControlName="${VPCI_CONTROL_LOOP_NAME}" \
     -DvpciPolicyName="${VPCI_POLICY_NAME}" \
     -DvpciControlLoopYaml="${VPCI_CONTROL_LOOP_YAML}" \
+    -DvsonhClosedLoopControlName="${VSONH_CONTROL_LOOP_NAME}" \
+    -DvsonhPolicyName="${VSONH_POLICY_NAME}" \
+    -DvsonhControlLoopYaml="${VSONH_CONTROL_LOOP_YAML}" \
     -DccvpnClosedLoopControlName="${CCVPN_CONTROL_LOOP_NAME}" \
     -DccvpnPolicyName="${CCVPN_POLICY_NAME}" \
     -DccvpnControlLoopYaml="${CCVPN_CONTROL_LOOP_YAML}" \
diff --git a/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-usecases b/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-usecases
index 307d7825a..69e221da9 100644
--- a/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-usecases
+++ b/controlloop/common/feature-controlloop-management/src/main/feature/bin/push-policies-usecases
@@ -127,6 +127,19 @@ curl -k --silent --user @1b3rt:31nst31n -X PUT --header 'Content-Type: text/plai
 sleep 2
 
 echo
+echo "Inserting vSONH Policy..."
+curl -k --silent --user @1b3rt:31nst31n -X PUT --header 'Content-Type: text/plain' -d '{
+        "closedLoopControlName": "ControlLoop-vSONH-7d4baf04-8875-4d1f-946d-06b874048b61",
+        "controlLoopYaml": "controlLoop%3A%0D%0A++version%3A+3.0.0%0D%0A++controlLoopName%3A+ControlLoop-vSONH-7d4baf04-8875-4d1f-946d-06b874048b61%0D%0A++trigger_policy%3A+unique-policy-id-456-modifyconfig%0D%0A++timeout%3A+1200%0D%0A++abatement%3A+false%0D%0A+%0D%0Apolicies%3A%0D%0A++-+id%3A+unique-policy-id-456-modifyconfig%0D%0A++++name%3A+modify+ANR+config%0D%0A++++description%3A%0D%0A++++actor%3A+SDNR%0D%0A++++recipe%3A+ModifyConfigANR%0D%0A++++target%3A%0D%0A++++++%23+These+fields+are+not+used%0D%0A++++++resourceID%3A+Eace933104d443b496b8.nodes.heat.vpg%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",
+        "policyName": "vsonh",
+        "policyScope": "DCAE",
+        "policyVersion": "1.2.0"
+}' "https://localhost:9696/policy/pdp/engine/topics/sources/ueb/${BRMSGW_TOPIC}/events" | python -m json.tool
+
+
+sleep 2
+
+echo
 echo "Inserting CCVPN Policy..."
 curl -k --silent --user @1b3rt:31nst31n -X PUT --header 'Content-Type: text/plain' -d '{
         "closedLoopControlName": "ControlLoop-CCVPN-2179b738-fd36-4843-a71a-a8c24c70c66b",