A1 Policy Management, Removal of deprecated API

The V1 of the policy management API is removed from the code.

Issue-ID: CCSDK-3559
Signed-off-by: PatrikBuhr <patrik.buhr@est.tech>
Change-Id: I0b5cde71770fca3826ad18025094d1c8423f4cf3

2 files changed, 32 insertions, 1183 deletions

diff --git a/a1-policy-management/api/pms-api.json b/a1-policy-management/api/pms-api.json
index f3d64af2..b5936e5c 100644
--- a/a1-policy-management/api/pms-api.json
+++ b/a1-policy-management/api/pms-api.json
@@ -28,50 +28,6 @@
                 "type": "string"
             }}
         },
-        "policy_info_v1": {
-            "type": "object",
-            "properties": {
-                "service": {
-                    "description": "the name of the service owning the policy",
-                    "type": "string"
-                },
-                "json": {
-                    "description": "the configuration of the policy",
-                    "type": "object"
-                },
-                "id": {
-                    "description": "identity of the policy",
-                    "type": "string"
-                },
-                "lastModified": {
-                    "description": "timestamp, last modification time",
-                    "type": "string"
-                },
-                "type": {
-                    "description": "name of the policy type",
-                    "type": "string"
-                },
-                "ric": {
-                    "description": "identity of the target Near-RT RIC",
-                    "type": "string"
-                }
-            }
-        },
-        "service_registration_info_v1": {
-            "type": "object",
-            "properties": {
-                "keepAliveIntervalSeconds": {
-                    "format": "int64",
-                    "description": "keep alive interval for the service. This is a heartbeat supervision of the service, which in regular intevals must invoke a 'keepAlive' REST call. When a service does not invoke this call within the given time, it is considered unavailble. An unavailable service will be automatically deregistered and its policies will be deleted. Value 0 means no timeout supervision.",
-                    "type": "integer"
-                },
-                "callbackUrl": {
-                    "description": "callback for notifying of RIC synchronization",
-                    "type": "string"
-                },
-                "serviceName": {"type": "string"}
-            }
-        },
         "ric_info_v2": {
             "description": "Information for a Near-RT RIC",
             "type": "object",
@@ -137,58 +93,6 @@
                 "items": {"$ref": "#/components/schemas/policy_info_v2"}
             }}
         },
-        "ric_info_v1": {
-            "type": "object",
-            "properties": {
-                "managedElementIds": {
-                    "description": "O1 identities for managed entities",
-                    "type": "array",
-                    "items": {
-                        "description": "O1 identities for managed entities",
-                        "type": "string"
-                    }
-                },
-                "policyTypes": {
-                    "description": "supported policy types",
-                    "type": "array",
-                    "items": {
-                        "description": "supported policy types",
-                        "type": "string"
-                    }
-                },
-                "state": {
-                    "description": "state info",
-                    "type": "string"
-                },
-                "ricName": {
-                    "description": "identity of the Near-RT RIC",
-                    "type": "string"
-                }
-            }
-        },
-        "service_status_v1": {
-            "type": "object",
-            "properties": {
-                "keepAliveIntervalSeconds": {
-                    "format": "int64",
-                    "description": "policy keep alive timeout",
-                    "type": "integer"
-                },
-                "timeSinceLastActivitySeconds": {
-                    "format": "int64",
-                    "description": "time since last invocation by the service",
-                    "type": "integer"
-                },
-                "callbackUrl": {
-                    "description": "callback for notifying of RIC synchronization",
-                    "type": "string"
-                },
-                "serviceName": {
-                    "description": "identity of the service",
-                    "type": "string"
-                }
-            }
-        },
         "policy_status_info_v2": {
             "description": "Status for one A1-P Policy",
             "type": "object",
@@ -347,31 +251,6 @@
     }},
     "openapi": "3.0.1",
     "paths": {
-        "/policy_types": {"get": {
-            "summary": "Query policy type identities",
-            "operationId": "getPolicyTypes",
-            "responses": {
-                "200": {
-                    "description": "Policy type identities",
-                    "content": {"*/*": {"schema": {
-                        "type": "array",
-                        "items": {"type": "string"}
-                    }}}
-                },
-                "404": {
-                    "description": "Near-RT RIC is not found",
-                    "content": {"*/*": {"schema": {"$ref": "#/components/schemas/error_information"}}}
-                }
-            },
-            "parameters": [{
-                "schema": {"type": "string"},
-                "in": "query",
-                "name": "ric",
-                "description": "The name of the Near-RT RIC to get types for.",
-                "required": false
-            }],
-            "tags": ["A1 Policy Management V1.0"]
-        }},
         "/a1-policy/v2/policy-instances": {"get": {
             "summary": "Query for A1 policy instances",
             "description": "Returns a list of A1 policies matching given search criteria. <br>If several query parameters are defined, the policies matching all conditions are returned.",
@@ -420,7 +299,7 @@
         }},
         "/a1-policy/v2/status": {"get": {
             "summary": "Returns status and statistics of this service",
-            "operationId": "getStatus_1",
+            "operationId": "getStatus",
             "responses": {"200": {
                 "description": "Service is living",
                 "content": {"application/json": {"schema": {"$ref": "#/components/schemas/status_info_v2"}}}
@@ -436,59 +315,10 @@
             }},
             "tags": ["Actuator"]
         }},
-        "/services": {
-            "get": {
-                "summary": "Returns service information",
-                "operationId": "getServices",
-                "responses": {
-                    "200": {
-                        "description": "OK",
-                        "content": {"*/*": {"schema": {
-                            "type": "array",
-                            "items": {"$ref": "#/components/schemas/service_status_v1"}
-                        }}}
-                    },
-                    "404": {
-                        "description": "Service is not found",
-                        "content": {"*/*": {"schema": {"type": "string"}}}
-                    }
-                },
-                "parameters": [{
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "name",
-                    "description": "The name of the service",
-                    "required": false
-                }],
-                "tags": ["A1 Policy Management V1.0"]
-            },
-            "delete": {
-                "summary": "Unregister a service",
-                "operationId": "deleteService",
-                "responses": {
-                    "204": {
-                        "description": "Service unregistered",
-                        "content": {"*/*": {"schema": {"$ref": "#/components/schemas/void"}}}
-                    },
-                    "404": {
-                        "description": "Service not found",
-                        "content": {"*/*": {"schema": {"type": "string"}}}
-                    }
-                },
-                "parameters": [{
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "name",
-                    "description": "The name of the service",
-                    "required": true
-                }],
-                "tags": ["A1 Policy Management V1.0"]
-            }
-        },
         "/a1-policy/v2/rics/ric": {"get": {
             "summary": "Returns info for one Near-RT RIC",
             "description": "Either a Near-RT RIC identity or a Mananged Element identity can be specified.<br>The intention with Mananged Element identity is the ID used in O1 for accessing the traffical element (such as the ID of CU).",
-            "operationId": "getRic_1",
+            "operationId": "getRic",
             "responses": {
                 "200": {
                     "description": "Near-RT RIC is found",
@@ -537,7 +367,7 @@
         }},
         "/a1-policy/v2/policy-types": {"get": {
             "summary": "Query policy type identities",
-            "operationId": "getPolicyTypes_1",
+            "operationId": "getPolicyTypes",
             "responses": {
                 "200": {
                     "description": "Policy type IDs",
@@ -576,7 +406,7 @@
         "/a1-policy/v2/policies/{policy_id}": {
             "get": {
                 "summary": "Returns a policy",
-                "operationId": "getPolicy_1",
+                "operationId": "getPolicy",
                 "responses": {
                     "200": {
                         "description": "Policy found",
@@ -597,7 +427,7 @@
             },
             "delete": {
                 "summary": "Delete a policy",
-                "operationId": "deletePolicy_1",
+                "operationId": "deletePolicy",
                 "responses": {
                     "200": {
                         "description": "Not used",
@@ -682,130 +512,6 @@
                 "tags": ["Management of configuration"]
             }
         },
-        "/policy": {
-            "get": {
-                "summary": "Returns a policy configuration",
-                "operationId": "getPolicy",
-                "responses": {
-                    "200": {
-                        "description": "Policy found",
-                        "content": {"*/*": {"schema": {"type": "object"}}}
-                    },
-                    "404": {
-                        "description": "Policy is not found",
-                        "content": {"*/*": {"schema": {"$ref": "#/components/schemas/error_information"}}}
-                    }
-                },
-                "parameters": [{
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "id",
-                    "description": "The identity of the policy instance.",
-                    "required": true
-                }],
-                "tags": ["A1 Policy Management V1.0"]
-            },
-            "delete": {
-                "summary": "Delete a policy",
-                "operationId": "deletePolicy",
-                "responses": {
-                    "200": {
-                        "description": "Not used",
-                        "content": {"*/*": {"schema": {"$ref": "#/components/schemas/void"}}}
-                    },
-                    "423": {
-                        "description": "Near-RT RIC is not operational",
-                        "content": {"*/*": {"schema": {"type": "string"}}}
-                    },
-                    "204": {
-                        "description": "Policy deleted",
-                        "content": {"*/*": {"schema": {"$ref": "#/components/schemas/void"}}}
-                    },
-                    "404": {
-                        "description": "Policy is not found",
-                        "content": {"*/*": {"schema": {"type": "string"}}}
-                    }
-                },
-                "parameters": [{
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "id",
-                    "description": "The identity of the policy instance.",
-                    "required": true
-                }],
-                "tags": ["A1 Policy Management V1.0"]
-            },
-            "put": {
-                "summary": "Put a policy",
-                "requestBody": {
-                    "content": {"application/json": {"schema": {"type": "object"}}},
-                    "required": true
-                },
-                "operationId": "putPolicy",
-                "responses": {
-                    "200": {
-                        "description": "Policy updated",
-                        "content": {"*/*": {"schema": {"$ref": "#/components/schemas/void"}}}
-                    },
-                    "201": {
-                        "description": "Policy created",
-                        "content": {"*/*": {"schema": {"$ref": "#/components/schemas/void"}}}
-                    },
-                    "423": {
-                        "description": "Near-RT RIC is not operational",
-                        "content": {"*/*": {"schema": {"type": "string"}}}
-                    },
-                    "404": {
-                        "description": "Near-RT RIC or policy type is not found",
-                        "content": {"*/*": {"schema": {"type": "string"}}}
-                    }
-                },
-                "parameters": [
-                    {
-                        "schema": {
-                            "default": "",
-                            "type": "string"
-                        },
-                        "in": "query",
-                        "name": "type",
-                        "description": "The name of the policy type.",
-                        "required": false
-                    },
-                    {
-                        "schema": {"type": "string"},
-                        "in": "query",
-                        "name": "id",
-                        "description": "The identity of the policy instance.",
-                        "required": true
-                    },
-                    {
-                        "schema": {"type": "string"},
-                        "in": "query",
-                        "name": "ric",
-                        "description": "The name of the Near-RT RIC where the policy will be created.",
-                        "required": true
-                    },
-                    {
-                        "schema": {"type": "string"},
-                        "in": "query",
-                        "name": "service",
-                        "description": "The name of the service creating the policy.",
-                        "required": true
-                    },
-                    {
-                        "schema": {
-                            "default": false,
-                            "type": "boolean"
-                        },
-                        "in": "query",
-                        "name": "transient",
-                        "description": "If the policy is transient or not (boolean defaulted to false). A policy is transient if it will be forgotten when the service needs to reconnect to the Near-RT RIC.",
-                        "required": false
-                    }
-                ],
-                "tags": ["A1 Policy Management V1.0"]
-            }
-        },
         "/actuator": {"get": {
             "summary": "Actuator root web endpoint",
             "operationId": "links_1",
@@ -821,47 +527,6 @@
             }},
             "tags": ["Actuator"]
         }},
-        "/policies": {"get": {
-            "summary": "Query policies",
-            "operationId": "getPolicies",
-            "responses": {
-                "200": {
-                    "description": "Policies",
-                    "content": {"*/*": {"schema": {
-                        "type": "array",
-                        "items": {"$ref": "#/components/schemas/policy_info_v1"}
-                    }}}
-                },
-                "404": {
-                    "description": "Near-RT RIC or type not found",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                }
-            },
-            "parameters": [
-                {
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "type",
-                    "description": "The name of the policy type to get policies for.",
-                    "required": false
-                },
-                {
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "ric",
-                    "description": "The name of the Near-RT RIC to get policies for.",
-                    "required": false
-                },
-                {
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "service",
-                    "description": "The name of the service to get policies for.",
-                    "required": false
-                }
-            ],
-            "tags": ["A1 Policy Management V1.0"]
-        }},
         "/actuator/loggers/{name}": {
             "post": {
                 "summary": "Actuator web endpoint 'loggers-name'",
@@ -897,7 +562,7 @@
         "/a1-policy/v2/services/{service_id}/keepalive": {"put": {
             "summary": "Heartbeat indicates that the service is running",
             "description": "A registerred service must call this in regular intervals to indicate that it is in operation. Absence of this call will lead to that teh service will be deregisterred and all its policies are removed.",
-            "operationId": "keepAliveService_1",
+            "operationId": "keepAliveService",
             "responses": {
                 "200": {
                     "description": "Service supervision timer refreshed, OK",
@@ -916,53 +581,6 @@
             }],
             "tags": ["Service Registry and Supervision"]
         }},
-        "/rics": {"get": {
-            "summary": "Query Near-RT RIC information",
-            "operationId": "getRics",
-            "responses": {
-                "200": {
-                    "description": "OK",
-                    "content": {"*/*": {"schema": {
-                        "type": "array",
-                        "items": {"$ref": "#/components/schemas/ric_info_v1"}
-                    }}}
-                },
-                "404": {
-                    "description": "Policy type is not found",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                }
-            },
-            "parameters": [{
-                "schema": {"type": "string"},
-                "in": "query",
-                "name": "policyType",
-                "description": "The name of the policy type",
-                "required": false
-            }],
-            "tags": ["A1 Policy Management V1.0"]
-        }},
-        "/policy_schema": {"get": {
-            "summary": "Returns one policy type schema definition",
-            "operationId": "getPolicySchema",
-            "responses": {
-                "200": {
-                    "description": "Policy schema",
-                    "content": {"*/*": {"schema": {"type": "object"}}}
-                },
-                "404": {
-                    "description": "The policy type is not found",
-                    "content": {"*/*": {"schema": {"$ref": "#/components/schemas/error_information"}}}
-                }
-            },
-            "parameters": [{
-                "schema": {"type": "string"},
-                "in": "query",
-                "name": "id",
-                "description": "The identity of the policy type to get the definition for.",
-                "required": true
-            }],
-            "tags": ["A1 Policy Management V1.0"]
-        }},
         "/actuator/metrics": {"get": {
             "summary": "Actuator web endpoint 'metrics'",
             "operationId": "metrics_2",
@@ -972,32 +590,10 @@
             }},
             "tags": ["Actuator"]
         }},
-        "/policy_status": {"get": {
-            "summary": "Returns a policy status",
-            "operationId": "getPolicyStatus",
-            "responses": {
-                "200": {
-                    "description": "Policy status",
-                    "content": {"*/*": {"schema": {"type": "object"}}}
-                },
-                "404": {
-                    "description": "Policy is not found",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                }
-            },
-            "parameters": [{
-                "schema": {"type": "string"},
-                "in": "query",
-                "name": "id",
-                "description": "The identity of the policy.",
-                "required": true
-            }],
-            "tags": ["A1 Policy Management V1.0"]
-        }},
         "/a1-policy/v2/rics": {"get": {
             "summary": "Query Near-RT RIC information",
             "description": "The call returns all Near-RT RICs that supports a given policy type identity",
-            "operationId": "getRics_1",
+            "operationId": "getRics",
             "responses": {
                 "200": {
                     "description": "OK",
@@ -1017,77 +613,11 @@
             }],
             "tags": ["NearRT-RIC Repository"]
         }},
-        "/policy_schemas": {"get": {
-            "summary": "Returns policy type schema definitions",
-            "operationId": "getPolicySchemas",
-            "responses": {
-                "200": {
-                    "description": "Policy schemas",
-                    "content": {"*/*": {"schema": {
-                        "type": "array",
-                        "items": {"type": "object"}
-                    }}}
-                },
-                "404": {
-                    "description": "Near-RT RIC is not found",
-                    "content": {"*/*": {"schema": {"$ref": "#/components/schemas/error_information"}}}
-                }
-            },
-            "parameters": [{
-                "schema": {"type": "string"},
-                "in": "query",
-                "name": "ric",
-                "description": "The name of the Near-RT RIC to get the definitions for.",
-                "required": false
-            }],
-            "tags": ["A1 Policy Management V1.0"]
-        }},
-        "/policy_ids": {"get": {
-            "summary": "Query policies, only policy identities returned",
-            "operationId": "getPolicyIds",
-            "responses": {
-                "200": {
-                    "description": "Policy identitiess",
-                    "content": {"*/*": {"schema": {
-                        "type": "array",
-                        "items": {"type": "string"}
-                    }}}
-                },
-                "404": {
-                    "description": "Near-RT RIC or type not found",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                }
-            },
-            "parameters": [
-                {
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "type",
-                    "description": "The name of the policy type to get policies for.",
-                    "required": false
-                },
-                {
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "ric",
-                    "description": "The name of the Near-RT RIC to get policies for.",
-                    "required": false
-                },
-                {
-                    "schema": {"type": "string"},
-                    "in": "query",
-                    "name": "service",
-                    "description": "The name of the service to get policies for.",
-                    "required": false
-                }
-            ],
-            "tags": ["A1 Policy Management V1.0"]
-        }},
         "/a1-policy/v2/services": {
             "get": {
                 "summary": "Returns service information",
                 "description": "Either information about a registered service with given identity or all registered services are returned.",
-                "operationId": "getServices_1",
+                "operationId": "getServices",
                 "responses": {
                     "200": {
                         "description": "OK",
@@ -1114,7 +644,7 @@
                     "required": true
                 },
                 "description": "Registering a service is needed to:<ul><li>Get callbacks.<\/li><li>Activate supervision of the service. If a service is inactive, its policies will be deleted.<\/li><\/ul>",
-                "operationId": "putService_1",
+                "operationId": "putService",
                 "responses": {
                     "200": {
                         "description": "Service updated",
@@ -1141,58 +671,14 @@
             }},
             "tags": ["Actuator"]
         }},
-        "/ric": {"get": {
-            "summary": "Returns the name of a RIC managing one Mananged Element",
-            "operationId": "getRic",
-            "responses": {
-                "200": {
-                    "description": "Near-RT RIC is found",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                },
-                "404": {
-                    "description": "Near-RT RIC is not found",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                }
-            },
-            "parameters": [{
-                "schema": {"type": "string"},
-                "in": "query",
-                "name": "managedElementId",
-                "description": "The identity of the Managed Element",
-                "required": true
-            }],
-            "tags": ["A1 Policy Management V1.0"]
-        }},
-        "/services/keepalive": {"put": {
-            "summary": "Heartbeat from a service",
-            "operationId": "keepAliveService",
-            "responses": {
-                "200": {
-                    "description": "Service supervision timer refreshed, OK",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                },
-                "404": {
-                    "description": "The service is not found, needs re-registration",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                }
-            },
-            "parameters": [{
-                "schema": {"type": "string"},
-                "in": "query",
-                "name": "name",
-                "description": "The name of the service",
-                "required": true
-            }],
-            "tags": ["A1 Policy Management V1.0"]
-        }},
         "/status": {"get": {
             "summary": "Returns status and statistics of this service",
-            "operationId": "getStatus",
+            "operationId": "getStatusV1",
             "responses": {"200": {
                 "description": "Service is living",
                 "content": {"*/*": {"schema": {"type": "string"}}}
             }},
-            "tags": ["A1 Policy Management V1.0"]
+            "tags": ["Health Check"]
         }},
         "/a1-policy/v2/policy-types/{policytype_id}": {"get": {
             "summary": "Returns a policy type definition",
@@ -1237,7 +723,7 @@
             "get": {
                 "summary": "Query policy identities",
                 "description": "Returns a list of A1 policies matching given search criteria. <br>If several query parameters are defined, the policies matching all conditions are returned.",
-                "operationId": "getPolicyIds_1",
+                "operationId": "getPolicyIds",
                 "responses": {
                     "200": {
                         "description": "Policy identities",
@@ -1286,7 +772,7 @@
                     "content": {"application/json": {"schema": {"$ref": "#/components/schemas/policy_info_v2"}}},
                     "required": true
                 },
-                "operationId": "putPolicy_1",
+                "operationId": "putPolicy",
                 "responses": {
                     "200": {
                         "description": "Policy updated",
@@ -1322,32 +808,9 @@
             }},
             "tags": ["Callbacks"]
         }},
-        "/service": {"put": {
-            "summary": "Register a service",
-            "requestBody": {
-                "content": {"application/json": {"schema": {"$ref": "#/components/schemas/service_registration_info_v1"}}},
-                "required": true
-            },
-            "operationId": "putService",
-            "responses": {
-                "200": {
-                    "description": "Service updated",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                },
-                "201": {
-                    "description": "Service created",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                },
-                "400": {
-                    "description": "The ServiceRegistrationInfo is not accepted",
-                    "content": {"*/*": {"schema": {"type": "string"}}}
-                }
-            },
-            "tags": ["A1 Policy Management V1.0"]
-        }},
         "/a1-policy/v2/services/{service_id}": {"delete": {
             "summary": "Unregister a service",
-            "operationId": "deleteService_1",
+            "operationId": "deleteService",
             "responses": {
                 "200": {
                     "description": "Not used",
@@ -1372,7 +835,7 @@
         }},
         "/a1-policy/v2/policies/{policy_id}/status": {"get": {
             "summary": "Returns a policy status",
-            "operationId": "getPolicyStatus_1",
+            "operationId": "getPolicyStatus",
             "responses": {
                 "200": {
                     "description": "Policy status",
@@ -1403,7 +866,7 @@
     },
     "info": {
         "license": {
-            "name": "Copyright (C) 2020 Nordix Foundation. Licensed under the Apache License.",
+            "name": "Copyright (C) 2020-2022 Nordix Foundation. Licensed under the Apache License.",
             "url": "http://www.apache.org/licenses/LICENSE-2.0"
         },
         "description": "<h2>General<\/h2><p>The O-RAN Non-RT RIC Policy Management Service provides a REST API for management of A1 policices. <br/>The main tasks of the service are:<\/p><ul><li>A1 Policy creation, modification and deletion.<\/li><li>Monitoring and maintaining consistency of the SMO view of A1 policies and the Near-RT RICs<\/li><li>Maintaining a view of supported Near-RT RIC policy types<\/li><li>Supervision of using services (R-APPs). When a service is unavailble, its policies are removed.<\/li><\/ul><h2>APIs provided by the service<\/h2><h3>A1 Policy Management<\/h3><p>This is an API for management of A1 Policies.<\/p><ul><li>A1 Policy retrieval, creation, modification and deletion.<\/li><li>Retrieval of supported A1 Policy types for a Near-RT RIC<\/li><li>Retrieval of status for existing A1 policies<\/li><\/ul><h3>Management of configuration<\/h3><p>API for updating and retrieval of the component configuration. Note that there other ways to maintain the configuration.<\/p><h3>Callbacks<\/h3><p>These are endpoints that are invoked by this service. The callbacks are registerred in this service at service registration.<\/p><h3>NearRT-RIC Repository<\/h3><p>This is an API that provides support for looking up a NearRT-RIC. Each A1 policy is targeted for one Near-RT RIC.<\/p><h3>Health Check<\/h3><p>API used for supervision of the PMS component.<\/p><h3>Service Registry and Supervision<\/h3><p>API used for registerring services that uses PMS. Each A1 policy is owned by a service. PMS can supervise each registerred service and will automatically remove policies for unavailable services.<\/p>",
@@ -1413,14 +876,9 @@
     "tags": [
         {"name": "Service Registry and Supervision"},
         {"name": "A1 Policy Management"},
-        {"name": "A1 Policy Management V1.0"},
         {"name": "NearRT-RIC Repository"},
         {"name": "Callbacks"},
         {"name": "Health Check"},
-        {
-            "name": "A1 Policy Management V1.0",
-            "description": "(deprecated primitves)"
-        },
         {"name": "Management of configuration"},
         {
             "name": "Actuator",
diff --git a/a1-policy-management/api/pms-api.yaml b/a1-policy-management/api/pms-api.yaml
index 453c4b1d..8aab618d 100644
--- a/a1-policy-management/api/pms-api.yaml
+++ b/a1-policy-management/api/pms-api.yaml
@@ -21,7 +21,7 @@ info:
     Each A1 policy is owned by a service. PMS can supervise each registerred service
     and will automatically remove policies for unavailable services.</p>
   license:
-    name: Copyright (C) 2020 Nordix Foundation. Licensed under the Apache License.
+    name: Copyright (C) 2020-2022 Nordix Foundation. Licensed under the Apache License.
     url: http://www.apache.org/licenses/LICENSE-2.0
   version: 1.1.0
 servers:
@@ -29,12 +29,9 @@ servers:
 tags:
 - name: Service Registry and Supervision
 - name: A1 Policy Management
-- name: A1 Policy Management V1.0
 - name: NearRT-RIC Repository
 - name: Callbacks
 - name: Health Check
-- name: A1 Policy Management V1.0
-  description: (deprecated primitves)
 - name: Management of configuration
 - name: Actuator
   description: Monitor and interact
@@ -42,36 +39,6 @@ tags:
     description: Spring Boot Actuator Web API Documentation
     url: https://docs.spring.io/spring-boot/docs/current/actuator-api/html/
 paths:
-  /policy_types:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Query policy type identities
-      operationId: getPolicyTypes
-      parameters:
-      - name: ric
-        in: query
-        description: The name of the Near-RT RIC to get types for.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Policy type identities
-          content:
-            '*/*':
-              schema:
-                type: array
-                items:
-                  type: string
-        404:
-          description: Near-RT RIC is not found
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/error_information'
   /a1-policy/v2/policy-instances:
     get:
       tags:
@@ -133,7 +100,7 @@ paths:
       tags:
       - Health Check
       summary: Returns status and statistics of this service
-      operationId: getStatus_1
+      operationId: getStatus
       responses:
         200:
           description: Service is living
@@ -154,63 +121,6 @@ paths:
             '*/*':
               schema:
                 type: object
-  /services:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Returns service information
-      operationId: getServices
-      parameters:
-      - name: name
-        in: query
-        description: The name of the service
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: OK
-          content:
-            '*/*':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/service_status_v1'
-        404:
-          description: Service is not found
-          content:
-            '*/*':
-              schema:
-                type: string
-    delete:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Unregister a service
-      operationId: deleteService
-      parameters:
-      - name: name
-        in: query
-        description: The name of the service
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        204:
-          description: Service unregistered
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/void'
-        404:
-          description: Service not found
-          content:
-            '*/*':
-              schema:
-                type: string
   /a1-policy/v2/rics/ric:
     get:
       tags:
@@ -219,7 +129,7 @@ paths:
       description: Either a Near-RT RIC identity or a Mananged Element identity can
         be specified.<br>The intention with Mananged Element identity is the ID used
         in O1 for accessing the traffical element (such as the ID of CU).
-      operationId: getRic_1
+      operationId: getRic
       parameters:
       - name: managed_element_id
         in: query
@@ -282,7 +192,7 @@ paths:
       tags:
       - A1 Policy Management
       summary: Query policy type identities
-      operationId: getPolicyTypes_1
+      operationId: getPolicyTypes
       parameters:
       - name: ric_id
         in: query
@@ -330,7 +240,7 @@ paths:
       tags:
       - A1 Policy Management
       summary: Returns a policy
-      operationId: getPolicy_1
+      operationId: getPolicy
       parameters:
       - name: policy_id
         in: path
@@ -356,7 +266,7 @@ paths:
       tags:
       - A1 Policy Management
       summary: Delete a policy
-      operationId: deletePolicy_1
+      operationId: deletePolicy
       parameters:
       - name: policy_id
         in: path
@@ -463,154 +373,6 @@ paths:
             '*/*':
               schema:
                 $ref: '#/components/schemas/error_information'
-  /policy:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Returns a policy configuration
-      operationId: getPolicy
-      parameters:
-      - name: id
-        in: query
-        description: The identity of the policy instance.
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Policy found
-          content:
-            '*/*':
-              schema:
-                type: object
-        404:
-          description: Policy is not found
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/error_information'
-    put:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Put a policy
-      operationId: putPolicy
-      parameters:
-      - name: type
-        in: query
-        description: The name of the policy type.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-          default: ""
-      - name: id
-        in: query
-        description: The identity of the policy instance.
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      - name: ric
-        in: query
-        description: The name of the Near-RT RIC where the policy will be created.
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      - name: service
-        in: query
-        description: The name of the service creating the policy.
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      - name: transient
-        in: query
-        description: If the policy is transient or not (boolean defaulted to false).
-          A policy is transient if it will be forgotten when the service needs to
-          reconnect to the Near-RT RIC.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: boolean
-          default: false
-      requestBody:
-        content:
-          application/json:
-            schema:
-              type: object
-        required: true
-      responses:
-        200:
-          description: Policy updated
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/void'
-        201:
-          description: Policy created
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/void'
-        423:
-          description: Near-RT RIC is not operational
-          content:
-            '*/*':
-              schema:
-                type: string
-        404:
-          description: Near-RT RIC or policy type is not found
-          content:
-            '*/*':
-              schema:
-                type: string
-    delete:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Delete a policy
-      operationId: deletePolicy
-      parameters:
-      - name: id
-        in: query
-        description: The identity of the policy instance.
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Not used
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/void'
-        423:
-          description: Near-RT RIC is not operational
-          content:
-            '*/*':
-              schema:
-                type: string
-        204:
-          description: Policy deleted
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/void'
-        404:
-          description: Policy is not found
-          content:
-            '*/*':
-              schema:
-                type: string
   /actuator:
     get:
       tags:
@@ -628,52 +390,6 @@ paths:
                   type: object
                   additionalProperties:
                     $ref: '#/components/schemas/Link'
-  /policies:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Query policies
-      operationId: getPolicies
-      parameters:
-      - name: type
-        in: query
-        description: The name of the policy type to get policies for.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      - name: ric
-        in: query
-        description: The name of the Near-RT RIC to get policies for.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      - name: service
-        in: query
-        description: The name of the service to get policies for.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Policies
-          content:
-            '*/*':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/policy_info_v1'
-        404:
-          description: Near-RT RIC or type not found
-          content:
-            '*/*':
-              schema:
-                type: string
   /actuator/loggers/{name}:
     get:
       tags:
@@ -723,7 +439,7 @@ paths:
       description: A registerred service must call this in regular intervals to indicate
         that it is in operation. Absence of this call will lead to that teh service
         will be deregisterred and all its policies are removed.
-      operationId: keepAliveService_1
+      operationId: keepAliveService
       parameters:
       - name: service_id
         in: path
@@ -745,64 +461,6 @@ paths:
             '*/*':
               schema:
                 $ref: '#/components/schemas/error_information'
-  /rics:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Query Near-RT RIC information
-      operationId: getRics
-      parameters:
-      - name: policyType
-        in: query
-        description: The name of the policy type
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: OK
-          content:
-            '*/*':
-              schema:
-                type: array
-                items:
-                  $ref: '#/components/schemas/ric_info_v1'
-        404:
-          description: Policy type is not found
-          content:
-            '*/*':
-              schema:
-                type: string
-  /policy_schema:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Returns one policy type schema definition
-      operationId: getPolicySchema
-      parameters:
-      - name: id
-        in: query
-        description: The identity of the policy type to get the definition for.
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Policy schema
-          content:
-            '*/*':
-              schema:
-                type: object
-        404:
-          description: The policy type is not found
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/error_information'
   /actuator/metrics:
     get:
       tags:
@@ -816,34 +474,6 @@ paths:
             '*/*':
               schema:
                 type: object
-  /policy_status:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Returns a policy status
-      operationId: getPolicyStatus
-      parameters:
-      - name: id
-        in: query
-        description: The identity of the policy.
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Policy status
-          content:
-            '*/*':
-              schema:
-                type: object
-        404:
-          description: Policy is not found
-          content:
-            '*/*':
-              schema:
-                type: string
   /a1-policy/v2/rics:
     get:
       tags:
@@ -851,7 +481,7 @@ paths:
       summary: Query Near-RT RIC information
       description: The call returns all Near-RT RICs that supports a given policy
         type identity
-      operationId: getRics_1
+      operationId: getRics
       parameters:
       - name: policytype_id
         in: query
@@ -875,82 +505,6 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/error_information'
-  /policy_schemas:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Returns policy type schema definitions
-      operationId: getPolicySchemas
-      parameters:
-      - name: ric
-        in: query
-        description: The name of the Near-RT RIC to get the definitions for.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Policy schemas
-          content:
-            '*/*':
-              schema:
-                type: array
-                items:
-                  type: object
-        404:
-          description: Near-RT RIC is not found
-          content:
-            '*/*':
-              schema:
-                $ref: '#/components/schemas/error_information'
-  /policy_ids:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Query policies, only policy identities returned
-      operationId: getPolicyIds
-      parameters:
-      - name: type
-        in: query
-        description: The name of the policy type to get policies for.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      - name: ric
-        in: query
-        description: The name of the Near-RT RIC to get policies for.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      - name: service
-        in: query
-        description: The name of the service to get policies for.
-        required: false
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Policy identitiess
-          content:
-            '*/*':
-              schema:
-                type: array
-                items:
-                  type: string
-        404:
-          description: Near-RT RIC or type not found
-          content:
-            '*/*':
-              schema:
-                type: string
   /a1-policy/v2/services:
     get:
       tags:
@@ -958,7 +512,7 @@ paths:
       summary: Returns service information
       description: Either information about a registered service with given identity
         or all registered services are returned.
-      operationId: getServices_1
+      operationId: getServices
       parameters:
       - name: service_id
         in: query
@@ -988,7 +542,7 @@ paths:
       description: Registering a service is needed to:<ul><li>Get callbacks.</li><li>Activate
         supervision of the service. If a service is inactive, its policies will be
         deleted.</li></ul>
-      operationId: putService_1
+      operationId: putService
       requestBody:
         content:
           application/json:
@@ -1027,68 +581,12 @@ paths:
             '*/*':
               schema:
                 type: object
-  /ric:
-    get:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Returns the name of a RIC managing one Mananged Element
-      operationId: getRic
-      parameters:
-      - name: managedElementId
-        in: query
-        description: The identity of the Managed Element
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Near-RT RIC is found
-          content:
-            '*/*':
-              schema:
-                type: string
-        404:
-          description: Near-RT RIC is not found
-          content:
-            '*/*':
-              schema:
-                type: string
-  /services/keepalive:
-    put:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Heartbeat from a service
-      operationId: keepAliveService
-      parameters:
-      - name: name
-        in: query
-        description: The name of the service
-        required: true
-        style: form
-        explode: true
-        schema:
-          type: string
-      responses:
-        200:
-          description: Service supervision timer refreshed, OK
-          content:
-            '*/*':
-              schema:
-                type: string
-        404:
-          description: The service is not found, needs re-registration
-          content:
-            '*/*':
-              schema:
-                type: string
   /status:
     get:
       tags:
-      - A1 Policy Management V1.0
+      - Health Check
       summary: Returns status and statistics of this service
-      operationId: getStatus
+      operationId: getStatusV1
       responses:
         200:
           description: Service is living
@@ -1157,7 +655,7 @@ paths:
       description: Returns a list of A1 policies matching given search criteria. <br>If
         several query parameters are defined, the policies matching all conditions
         are returned.
-      operationId: getPolicyIds_1
+      operationId: getPolicyIds
       parameters:
       - name: policytype_id
         in: query
@@ -1209,7 +707,7 @@ paths:
       tags:
       - A1 Policy Management
       summary: Create or update a policy
-      operationId: putPolicy_1
+      operationId: putPolicy
       requestBody:
         content:
           application/json:
@@ -1261,43 +759,12 @@ paths:
             application/json:
               schema:
                 $ref: '#/components/schemas/void'
-  /service:
-    put:
-      tags:
-      - A1 Policy Management V1.0
-      summary: Register a service
-      operationId: putService
-      requestBody:
-        content:
-          application/json:
-            schema:
-              $ref: '#/components/schemas/service_registration_info_v1'
-        required: true
-      responses:
-        200:
-          description: Service updated
-          content:
-            '*/*':
-              schema:
-                type: string
-        201:
-          description: Service created
-          content:
-            '*/*':
-              schema:
-                type: string
-        400:
-          description: The ServiceRegistrationInfo is not accepted
-          content:
-            '*/*':
-              schema:
-                type: string
   /a1-policy/v2/services/{service_id}:
     delete:
       tags:
       - Service Registry and Supervision
       summary: Unregister a service
-      operationId: deleteService_1
+      operationId: deleteService
       parameters:
       - name: service_id
         in: path
@@ -1330,7 +797,7 @@ paths:
       tags:
       - A1 Policy Management
       summary: Returns a policy status
-      operationId: getPolicyStatus_1
+      operationId: getPolicyStatus
       parameters:
       - name: policy_id
         in: path
@@ -1391,44 +858,6 @@ components:
         status:
           type: string
           description: status text
-    policy_info_v1:
-      type: object
-      properties:
-        service:
-          type: string
-          description: the name of the service owning the policy
-        json:
-          type: object
-          description: the configuration of the policy
-        id:
-          type: string
-          description: identity of the policy
-        lastModified:
-          type: string
-          description: timestamp, last modification time
-        type:
-          type: string
-          description: name of the policy type
-        ric:
-          type: string
-          description: identity of the target Near-RT RIC
-    service_registration_info_v1:
-      type: object
-      properties:
-        keepAliveIntervalSeconds:
-          type: integer
-          description: keep alive interval for the service. This is a heartbeat supervision
-            of the service, which in regular intevals must invoke a 'keepAlive' REST
-            call. When a service does not invoke this call within the given time,
-            it is considered unavailble. An unavailable service will be automatically
-            deregistered and its policies will be deleted. Value 0 means no timeout
-            supervision.
-          format: int64
-        callbackUrl:
-          type: string
-          description: callback for notifying of RIC synchronization
-        serviceName:
-          type: string
     ric_info_v2:
       type: object
       properties:
@@ -1486,44 +915,6 @@ components:
           items:
             $ref: '#/components/schemas/policy_info_v2'
       description: List of policy information
-    ric_info_v1:
-      type: object
-      properties:
-        managedElementIds:
-          type: array
-          description: O1 identities for managed entities
-          items:
-            type: string
-            description: O1 identities for managed entities
-        policyTypes:
-          type: array
-          description: supported policy types
-          items:
-            type: string
-            description: supported policy types
-        state:
-          type: string
-          description: state info
-        ricName:
-          type: string
-          description: identity of the Near-RT RIC
-    service_status_v1:
-      type: object
-      properties:
-        keepAliveIntervalSeconds:
-          type: integer
-          description: policy keep alive timeout
-          format: int64
-        timeSinceLastActivitySeconds:
-          type: integer
-          description: time since last invocation by the service
-          format: int64
-        callbackUrl:
-          type: string
-          description: callback for notifying of RIC synchronization
-        serviceName:
-          type: string
-          description: identity of the service
     policy_status_info_v2:
       type: object
       properties: