Merge "Change doc to new dcaegen2 policy type"

8 files changed, 21 insertions, 18 deletions

diff --git a/docs/PolicyAPI.postman_collection.json b/docs/PolicyAPI.postman_collection.json
index a5871745..21b4c97e 100644
--- a/docs/PolicyAPI.postman_collection.json
+++ b/docs/PolicyAPI.postman_collection.json
@@ -573,7 +573,7 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"groups\": [\n        {\n            \"name\": \"defaultGroup\",\n            \"description\": \"The default group that registers all supported policy types and pdps.\",\n            \"pdpGroupState\": \"ACTIVE\",\n            \"properties\": {},\n            \"pdpSubgroups\": [\n                {\n                    \"pdpType\": \"apex\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.operational.Apex\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"apex_35\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\",\n                            \"message\": \"Pdp Heartbeat\"\n                        }\n                    ]\n                },\n                {\n                    \"pdpType\": \"drools\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.Operational\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"dev-policy-drools-0\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\"\n                        }\n                    ]\n                },\n                {\n                    \"pdpType\": \"xacml\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.FrequencyLimiter\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.MinMax\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.Blacklist\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.coordination.FirstBlocksSecond\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.Monitoring\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.cdap.tca.hi.lo.app\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.docker.sonhandler.app\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.AffinityPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.DistancePolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.HpaPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.OptimizationPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.PciPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.QueryPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.SubscriberPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.Vim_fit\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.VnfPolicy\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"dev-policy-policy-xacml-pdp-558c478477-g85jl\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\"\n                        }\n                    ]\n                }\n            ]\n        }\n    ]\n}"
+					"raw": "{\n    \"groups\": [\n        {\n            \"name\": \"defaultGroup\",\n            \"description\": \"The default group that registers all supported policy types and pdps.\",\n            \"pdpGroupState\": \"ACTIVE\",\n            \"properties\": {},\n            \"pdpSubgroups\": [\n                {\n                    \"pdpType\": \"apex\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.operational.Apex\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"apex_35\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\",\n                            \"message\": \"Pdp Heartbeat\"\n                        }\n                    ]\n                },\n                {\n                    \"pdpType\": \"drools\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.Operational\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"dev-policy-drools-0\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\"\n                        }\n                    ]\n                },\n                {\n                    \"pdpType\": \"xacml\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.FrequencyLimiter\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.MinMax\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.Blacklist\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.coordination.FirstBlocksSecond\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.Monitoring\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.tcagen2\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.docker.sonhandler.app\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.AffinityPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.DistancePolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.HpaPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.OptimizationPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.PciPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.QueryPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.SubscriberPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.Vim_fit\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.VnfPolicy\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"dev-policy-policy-xacml-pdp-558c478477-g85jl\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\"\n                        }\n                    ]\n                }\n            ]\n        }\n    ]\n}"
 				},
 				"url": {
 					"raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps",
@@ -623,7 +623,7 @@
 				],
 				"body": {
 					"mode": "raw",
-					"raw": "{\n    \"groups\": [\n        {\n            \"name\": \"defaultGroup\",\n            \"description\": \"The default group that registers all supported policy types and pdps.\",\n            \"pdpGroupState\": \"ACTIVE\",\n            \"properties\": {},\n            \"pdpSubgroups\": [\n                {\n                    \"pdpType\": \"apex\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.operational.Apex\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [\n                    ],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"apex_35\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\",\n                            \"message\": \"Pdp Heartbeat\"\n                        }\n                    ]\n                },\n                {\n                    \"pdpType\": \"drools\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.Operational\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"dev-policy-drools-0\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\"\n                        }\n                    ]\n                },\n                {\n                    \"pdpType\": \"xacml\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.FrequencyLimiter\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.MinMax\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.Blacklist\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.coordination.FirstBlocksSecond\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.Monitoring\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.cdap.tca.hi.lo.app\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.docker.sonhandler.app\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.AffinityPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.DistancePolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.HpaPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.OptimizationPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.PciPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.QueryPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.SubscriberPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.Vim_fit\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.VnfPolicy\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"dev-policy-policy-xacml-pdp-558c478477-g85jl\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\"\n                        }\n                    ]\n                }\n            ]\n        }\n    ]\n}"
+					"raw": "{\n    \"groups\": [\n        {\n            \"name\": \"defaultGroup\",\n            \"description\": \"The default group that registers all supported policy types and pdps.\",\n            \"pdpGroupState\": \"ACTIVE\",\n            \"properties\": {},\n            \"pdpSubgroups\": [\n                {\n                    \"pdpType\": \"apex\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.operational.Apex\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [\n                    ],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"apex_35\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\",\n                            \"message\": \"Pdp Heartbeat\"\n                        }\n                    ]\n                },\n                {\n                    \"pdpType\": \"drools\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.Operational\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"dev-policy-drools-0\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\"\n                        }\n                    ]\n                },\n                {\n                    \"pdpType\": \"xacml\",\n                    \"supportedPolicyTypes\": [\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.FrequencyLimiter\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.MinMax\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.Blacklist\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.controlloop.guard.coordination.FirstBlocksSecond\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.Monitoring\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.tcagen2\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.monitoring.docker.sonhandler.app\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.AffinityPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.DistancePolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.HpaPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.OptimizationPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.PciPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.QueryPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.SubscriberPolicy\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.Vim_fit\",\n                            \"version\": \"1.0.0\"\n                        },\n                        {\n                            \"name\": \"onap.policies.optimization.VnfPolicy\",\n                            \"version\": \"1.0.0\"\n                        }\n                    ],\n                    \"policies\": [],\n                    \"currentInstanceCount\": 1,\n                    \"desiredInstanceCount\": 1,\n                    \"properties\": {},\n                    \"pdpInstances\": [\n                        {\n                            \"instanceId\": \"dev-policy-policy-xacml-pdp-558c478477-g85jl\",\n                            \"pdpState\": \"ACTIVE\",\n                            \"healthy\": \"HEALTHY\"\n                        }\n                    ]\n                }\n            ]\n        }\n    ]\n}"
 				},
 				"url": {
 					"raw": "{{POLICY-PAP-URL}}/policy/pap/v1/pdps",
@@ -1022,4 +1022,4 @@
 			"response": []
 		}
 	]
-}
\ No newline at end of file
+}
diff --git a/docs/api/api.rst b/docs/api/api.rst
index ba6cb30a..c2c20ffc 100644
--- a/docs/api/api.rst
+++ b/docs/api/api.rst
@@ -114,7 +114,7 @@ To ease policy creation, we preload several widely used policy types in policy d
    :header: "Policy Type Name", "Payload"
    :widths: 15,10
 
-   "Monitoring.TCA", `onap.policies.monitoring.cdap.tca.hi.lo.app.yaml <https://github.com/onap/policy-models/blob/master/models-examples/src/main/resources/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app.yaml>`_
+   "Monitoring.TCA", `onap.policies.monitoring.tcagen2.yaml <https://github.com/onap/policy-models/blob/master/models-examples/src/main/resources/policytypes/onap.policies.monitoring.tcagen2.yaml>`_
    "Monitoring.Collectors", `onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml <https://github.com/onap/policy-models/blob/master/models-examples/src/main/resources/policytypes/onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server.yaml>`_
    "Optimization", `onap.policies.Optimization.yaml <https://github.com/onap/policy-models/blob/master/models-examples/src/main/resources/policytypes/onap.policies.Optimization.yaml>`_
    "Optimization.Resource", `onap.policies.optimization.Resource.yaml <https://github.com/onap/policy-models/blob/master/models-examples/src/main/resources/policytypes/onap.policies.optimization.Resource.yaml>`_
@@ -268,13 +268,13 @@ JSON payload for POST calls can be downloaded from policy table above.
 If you are accessing the api from the container, the default *ip* and *port* would be **https:/policy-api:6969/policy/api/v1/**.
 
 Create vFirewall Monitoring Policy::
-  curl --user 'healthcheck:zb!XztG34' -X POST "http://{ip}:{port}/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies" -H "Accept: application/json" -H "Content-Type: application/json" -d @vFirewall.policy.monitoring.input.tosca.json
+  curl --user 'healthcheck:zb!XztG34' -X POST "http://{ip}:{port}/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies" -H "Accept: application/json" -H "Content-Type: application/json" -d @vFirewall.policy.monitoring.input.tosca.json
 
 Get vFirewall Monitoring Policy::
-  curl --user 'healthcheck:zb!XztG34' -X GET "http://{ip}:{port}/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.vfirewall.tca/versions/1.0.0" -H "Accept: application/json" -H "Content-Type: application/json"
+  curl --user 'healthcheck:zb!XztG34' -X GET "http://{ip}:{port}/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies/onap.vfirewall.tca/versions/1.0.0" -H "Accept: application/json" -H "Content-Type: application/json"
 
 Delete vFirewall Monitoring Policy::
-  curl --user 'healthcheck:zb!XztG34' -X DELETE "http://{ip}:{port}/policy/api/v1/policytypes/onap.policies.monitoring.cdap.tca.hi.lo.app/versions/1.0.0/policies/onap.vfirewall.tca/versions/1.0.0" -H "Accept: application/json" -H "Content-Type: application/json"
+  curl --user 'healthcheck:zb!XztG34' -X DELETE "http://{ip}:{port}/policy/api/v1/policytypes/onap.policies.monitoring.tcagen2/versions/1.0.0/policies/onap.vfirewall.tca/versions/1.0.0" -H "Accept: application/json" -H "Content-Type: application/json"
 
 Create vFirewall Operational Policy::
   curl --user 'healthcheck:zb!XztG34' -X POST "http://{ip}:{port}/policy/api/v1/policytypes/onap.policies.controlloop.operational.common.Drools/versions/1.0.0/policies" -H "Accept: application/json" -H "Content-Type: application/json" -d @vFirewall.policy.operational.input.tosca.json
diff --git a/docs/pap/InternalPapPdp.rst b/docs/pap/InternalPapPdp.rst
index 998514af..5c4c3f61 100644
--- a/docs/pap/InternalPapPdp.rst
+++ b/docs/pap/InternalPapPdp.rst
@@ -250,10 +250,10 @@ sent to the PAP in a *PDP_STATUS* message is unknown to the PAP, the PAP locks t
     pdp_group: onap.pdpgroup.Monitoring
     pdp_subgroup: xacml
     supported_policy_types:
-      - onap.monitoring.cdap.tca.hi.lo.app
+      - onap.monitoring.tcagen2
      policies:
       - onap.scaleout.tca:message
-          policy_type: onap.policies.monitoring.cdap.tca.hi.lo.app
+          policy_type: onap.policies.monitoring.tcagen2
           policy_type_version: 1.0.0
           properties:
             # Omitted for brevity
diff --git a/docs/pap/notification/dmaap-pap-notif.json b/docs/pap/notification/dmaap-pap-notif.json
index bfe9162b..07d1ac20 100644
--- a/docs/pap/notification/dmaap-pap-notif.json
+++ b/docs/pap/notification/dmaap-pap-notif.json
@@ -1,7 +1,7 @@
 {
     "deployed-policies": [
         {
-            "policy-type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+            "policy-type": "onap.policies.monitoring.tcagen2",
             "policy-type-version": "1.0.0",
             "policy-id": "onap.scaleout.tca",
             "policy-version": "2.0.0",
@@ -11,7 +11,7 @@
     ],
     "undeployed-policies": [
         {
-            "policy-type": "onap.policies.firewall",
+            "policy-type": "onap.policies.monitoring.tcagen2",
             "policy-type-version": "1.0.0",
             "policy-id": "onap.firewall.tca",
             "policy-version": "6.0.0",
diff --git a/docs/pap/request/groups-batch-pap-req.json b/docs/pap/request/groups-batch-pap-req.json
index 7b8ffb68..ee978ed8 100644
--- a/docs/pap/request/groups-batch-pap-req.json
+++ b/docs/pap/request/groups-batch-pap-req.json
@@ -23,7 +23,7 @@
                     "properties": {},
                     "supportedPolicyTypes": [
                         {
-                            "name": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+                            "name": "onap.policies.monitoring.tcagen2",
                             "version": "1.0.0"
                         }
                     ],
@@ -32,4 +32,4 @@
             ]
         }
     ]
-}
\ No newline at end of file
+}
diff --git a/docs/pap/response/deployed-policy-pap-resp.json b/docs/pap/response/deployed-policy-pap-resp.json
index 4119ebf6..8065c791 100644
--- a/docs/pap/response/deployed-policy-pap-resp.json
+++ b/docs/pap/response/deployed-policy-pap-resp.json
@@ -1,6 +1,6 @@
 [
   {
-    "policy-type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+    "policy-type": "onap.policies.monitoring.tcagen2",
     "policy-type-version": "1.0.0",
     "policy-id": "MICROSERVICE_vFW_CDS_Service_v2_0_app_1_0_0_I95",
     "policy-version": "1.0.0",
@@ -9,7 +9,7 @@
     "incomplete-count": 0
   },
   {
-    "policy-type": "onap.policies.monitoring.cdap.tca.hi.lo.app",
+    "policy-type": "onap.policies.monitoring.tcagen2",
     "policy-type-version": "1.0.0",
     "policy-id": "MICROSERVICE_vFW_CDS_Service_v2_0_app_1_0_0_WNX",
     "policy-version": "1.0.0",
@@ -26,4 +26,4 @@
     "failure-count": 0,
     "incomplete-count": 0
   }
-]
\ No newline at end of file
+]
diff --git a/docs/xacml/decision.monitoring.json b/docs/xacml/decision.monitoring.json
index 4442f6f0..da253f13 100644
--- a/docs/xacml/decision.monitoring.json
+++ b/docs/xacml/decision.monitoring.json
@@ -4,6 +4,6 @@
   "ONAPInstance": "622431a4-9dea-4eae-b443-3b2164639c64",
   "action": "configure",
   "resource": {
-      "policy-type": "onap.policies.monitoring.cdap.tca.hi.lo.app"
+      "policy-type": "onap.policies.monitoring.tcagen2"
   }
 }
diff --git a/docs/xacml/xacml.rst b/docs/xacml/xacml.rst
index 4100e800..f5e2977a 100644
--- a/docs/xacml/xacml.rst
+++ b/docs/xacml/xacml.rst
@@ -79,10 +79,13 @@ The following policy types derive from onap.policies.Monitoring:
 .. csv-table::
    :header: "Derived Policy Type", "Action", "Description"
 
-   "onap.policies.monitoring.cdap.tca.hi.lo.app", "configure", "TCA DCAE microservice component"
+   "onap.policies.monitoring.tcagen2", "configure", "TCA DCAE microservice gen2 component"
    "onap.policies.monitoring.dcaegen2.collectors.datafile.datafile-app-server", "configure", "REST Collector"
    "onap.policies.monitoring.docker.sonhandler.app", "configure", "SON Handler microservice component"
 
+.. note::
+   DCAE project deprecated TCA DCAE microservice in lieu for their gen2 microservice. Thus, the policy type onap.policies.monitoring.cdap.tca.hi.lo.app was removed from Policy Framework.
+
 This is an example Decision API payload made to retrieve a decision for a Monitoring Policy by id. Not recommended - as users may change id's of a policy. Available for backward compatibility.
 
 .. literalinclude:: decision.monitoring.json