Guard policy clean up
Remove guard policy related code, so that it will not be shown or
created in the legacy policy UI.
Issue-ID: CLAMP-825
Change-Id: I6c654fef9fd9df810fd48600c91ffef96db371cd
Signed-off-by: xuegao <xg353y@intl.att.com>
diff --git a/ui-react/src/api/LoopCache.test.js b/ui-react/src/api/LoopCache.test.js
index 4642ff5..b0eef75 100644
--- a/ui-react/src/api/LoopCache.test.js
+++ b/ui-react/src/api/LoopCache.test.js
@@ -34,7 +34,6 @@
const opPolicy = [{
"name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
"configurationsJson": {
- "guard_policies": {},
"operational_policy": {
"controlLoop": {},
"policies": []
@@ -51,7 +50,6 @@
const opPolicy = [{
"name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
"configurationsJson": {
- "guard_policies": {},
"operational_policy": {
"controlLoop": {},
"policies": []
@@ -157,7 +155,7 @@
"id": 1,
"logType": "INFO",
"logComponent": "CLAMP",
- "message": "Operational and Guard policies UPDATED",
+ "message": "Operational policies UPDATED",
"logInstant": "2019-07-08T09:44:37Z"
}
];
@@ -196,7 +194,6 @@
it('updateOperationalPolicyProperties', () => {
const newOpPolicy = {
- "guard_policies": {},
"operational_policy": {
"controlLoop": {},
"policies": []
diff --git a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
index 23ea354..788306b 100644
--- a/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
+++ b/ui-react/src/api/LoopCache_mokeLoopJsonCache.json
@@ -88,7 +88,6 @@
{
"name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
"configurationsJson": {
- "guard_policies": {},
"operational_policy": {
"controlLoop": {},
"policies": []
@@ -113,7 +112,7 @@
"id": 1,
"logType": "INFO",
"logComponent": "CLAMP",
- "message": "Operational and Guard policies UPDATED",
+ "message": "Operational policies UPDATED",
"logInstant": "2019-07-08T09:44:37Z"
}
]
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
index c10c6ff..4c11ce5 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
+++ b/ui-react/src/components/dialogs/OperationalPolicy/OperationalPolicyModal.test.js
@@ -41,7 +41,6 @@
"operationalPolicies": [{
"name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
"configurationsJson": {
- "guard_policies": {},
"operational_policy": {
"controlLoop": {},
"policies": []
diff --git a/ui-react/src/components/dialogs/OperationalPolicy/template.json b/ui-react/src/components/dialogs/OperationalPolicy/template.json
index 6b4477f..7c9dc0c 100644
--- a/ui-react/src/components/dialogs/OperationalPolicy/template.json
+++ b/ui-react/src/components/dialogs/OperationalPolicy/template.json
@@ -3,21 +3,6 @@
{
"name": "OPERATIONAL_LOOP_NAME",
"configurationsJson": {
- "guard_policies": {
- "guard.minmax.new": {
- "recipe": "",
- "clname": "LOOP_NAME",
- "actor": "",
- "targets": "",
- "min": "",
- "max": "",
- "limit": "",
- "timeUnits": "",
- "timeWindow": "",
- "guardActiveStart": "00:00:00Z",
- "guardActiveEnd": "00:00:01Z"
- }
- },
"operational_policy": {
"controlLoop": {
"trigger_policy": "new",
diff --git a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
index bf0b910..d4021c9 100644
--- a/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
+++ b/ui-react/src/components/dialogs/Policy/PolicyModal.test.js
@@ -42,7 +42,6 @@
"operationalPolicies": [{
"name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
"configurationsJson": {
- "guard_policies": {},
"operational_policy": {
"controlLoop": {},
"policies": []
diff --git a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
index 5c478f6..3b7fd41 100644
--- a/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
+++ b/ui-react/src/components/loop_viewer/logs/LoopLogs.test.js
@@ -34,7 +34,7 @@
"id": 1,
"logType": "INFO",
"logComponent": "CLAMP",
- "message": "Operational and Guard policies UPDATED",
+ "message": "Operational policies UPDATED",
"logInstant": "2019-07-08T09:44:37Z"
}
]
@@ -51,14 +51,14 @@
"id": 1,
"logType": "INFO",
"logComponent": "CLAMP",
- "message": "Operational and Guard policies UPDATED",
+ "message": "Operational policies UPDATED",
"logInstant": "2019-07-08T09:44:37Z"
},
{
"id": 2,
"logType": "INFO",
"logComponent": "CLAMP",
- "message": "Operational and Guard policies UPDATED",
+ "message": "Operational policies UPDATED",
"logInstant": "2019-07-08T09:44:50Z"
}
]
diff --git a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap b/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
index 174a320..25736d2 100644
--- a/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
+++ b/ui-react/src/components/loop_viewer/logs/__snapshots__/LoopLogs.test.js.snap
@@ -51,7 +51,7 @@
"logComponent": "CLAMP",
"logInstant": "2019-07-08T09:44:37Z",
"logType": "INFO",
- "message": "Operational and Guard policies UPDATED",
+ "message": "Operational policies UPDATED",
}
}
/>
diff --git a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
index 17f4b35..e54b500 100644
--- a/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
+++ b/ui-react/src/components/loop_viewer/svg/LoopSvg.test.js
@@ -39,7 +39,6 @@
"operationalPolicies": [{
"name": "OPERATIONAL_h2NMX_v1_0_ResourceInstanceName1_tca",
"configurationsJson": {
- "guard_policies": {},
"operational_policy": {
"controlLoop": {},
"policies": []