From 6c0f24cafc8aa0be475484b2d950d48b6741ca7c Mon Sep 17 00:00:00 2001
From: emaclee <lee.anjella.macabuhay@est.tech>
Date: Thu, 18 Jan 2024 17:27:54 +0000
Subject: [PATCH 1/1] Remove onboarding of old solution subscription model

	-Remove onboarding of old subscription model
	-Remove initial solution subscription model

Change-Id: Id930dcfd078d71e7c275d0a3ef1117f8fed2e9d3
Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech>
---
 .../ncmp/init/CmDataSubscriptionModelLoader.java   | 11 -----
 .../src/main/resources/models/subscription.yang    | 57 ----------------------
 2 files changed, 68 deletions(-)
 delete mode 100644 cps-ncmp-service/src/main/resources/models/subscription.yang

diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java
index 81055db84..88ba5e91b 100644
--- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/CmDataSubscriptionModelLoader.java
@@ -45,13 +45,6 @@ public class CmDataSubscriptionModelLoader extends AbstractModelLoader {
     private static final String DATASTORE_PASSTHROUGH_OPERATIONAL = "ncmp-datastores:passthrough-operational";
     private static final String DATASTORE_PASSTHROUGH_RUNNING = "ncmp-datastores:passthrough-running";
 
-    private static final String DEPRECATED_MODEL_FILENAME = "subscription.yang";
-    private static final String DEPRECATED_ANCHOR_NAME = "AVC-Subscriptions";
-    private static final String DEPRECATED_SCHEMASET_NAME = "subscriptions";
-    private static final String DEPRECATED_REGISTRY_DATANODE_NAME = "subscription-registry";
-
-
-
     public CmDataSubscriptionModelLoader(final CpsDataspaceService cpsDataspaceService,
                                          final CpsModuleService cpsModuleService,
                                          final CpsAnchorService cpsAnchorService,
@@ -74,10 +67,6 @@ public class CmDataSubscriptionModelLoader extends AbstractModelLoader {
     }
 
     private void onboardSubscriptionModels() {
-        createSchemaSet(NCMP_DATASPACE_NAME, DEPRECATED_SCHEMASET_NAME, DEPRECATED_MODEL_FILENAME);
-        createAnchor(NCMP_DATASPACE_NAME, DEPRECATED_SCHEMASET_NAME, DEPRECATED_ANCHOR_NAME);
-        createTopLevelDataNode(NCMP_DATASPACE_NAME, DEPRECATED_ANCHOR_NAME, DEPRECATED_REGISTRY_DATANODE_NAME);
-
         createSchemaSet(NCMP_DATASPACE_NAME, SCHEMASET_NAME, MODEL_FILENAME);
         createAnchor(NCMP_DATASPACE_NAME, SCHEMASET_NAME, ANCHOR_NAME);
         createTopLevelDataNode(NCMP_DATASPACE_NAME, ANCHOR_NAME, REGISTRY_DATANODE_NAME);
diff --git a/cps-ncmp-service/src/main/resources/models/subscription.yang b/cps-ncmp-service/src/main/resources/models/subscription.yang
deleted file mode 100644
index 7096c18ab..000000000
--- a/cps-ncmp-service/src/main/resources/models/subscription.yang
+++ /dev/null
@@ -1,57 +0,0 @@
-module subscription {
-    yang-version 1.1;
-    namespace "org:onap:ncmp:subscription";
-
-    prefix subs;
-
-    revision "2023-03-21" {
-        description
-            "NCMP subscription model";
-    }
-
-    container subscription-registry {
-        list subscription {
-            key "clientID subscriptionName";
-
-            leaf clientID {
-                type string;
-            }
-
-            leaf subscriptionName {
-                type string;
-            }
-
-            leaf topic {
-                type string;
-            }
-
-            leaf isTagged {
-                type boolean;
-            }
-
-            container predicates {
-
-                list targetCmHandles {
-                    key "cmHandleId";
-
-                    leaf cmHandleId {
-                      type string;
-                    }
-
-                    leaf status {
-                      type string;
-                    }
-
-                    leaf details {
-                        type string;
-                    }
-                }
-
-                leaf datastore {
-                    type string;
-                }
-            }
-
-        }
-    }
-}
\ No newline at end of file
-- 
2.16.6