summaryrefslogtreecommitdiffstats
path: root/cps-ncmp-service/src/main
diff options
context:
space:
mode:
authoremaclee <lee.anjella.macabuhay@est.tech>2023-02-09 15:17:13 +0000
committeremaclee <lee.anjella.macabuhay@est.tech>2023-03-03 14:43:52 +0000
commit02bffef6d216ed03206526d49a4fb20124bfafe9 (patch)
treedbdd98ee9fa75aa0a24bd154c26d51d4c8da8110 /cps-ncmp-service/src/main
parente28b62148676d189bdd11b78d8d78419d548e358 (diff)
JAVA onboarding of YANG model
- removed docker compose init container - removed init container script files - created new model loader class to onboard YANG model which runs after the application has set up - new model loader class is created in new package in cps-service (org.onap.cps.ncmp.init) Issue-ID: CPS-1467 Signed-off-by: emaclee <lee.anjella.macabuhay@est.tech> Change-Id: I35fe82817aff7783520acf8db66ad504271026bd
Diffstat (limited to 'cps-ncmp-service/src/main')
-rw-r--r--cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/exception/NcmpStartUpException.java37
-rw-r--r--cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/ModelLoader.java52
-rw-r--r--cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java124
-rw-r--r--cps-ncmp-service/src/main/resources/model/subscription.yang5
4 files changed, 218 insertions, 0 deletions
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/exception/NcmpStartUpException.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/exception/NcmpStartUpException.java
new file mode 100644
index 0000000000..7ac26f54fd
--- /dev/null
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/exception/NcmpStartUpException.java
@@ -0,0 +1,37 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2023 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.cps.ncmp.api.impl.exception;
+
+/**
+ * NCMP start up exception.
+ */
+public class NcmpStartUpException extends NcmpException {
+
+ /**
+ * Constructor.
+ *
+ * @param message the error message
+ * @param details the error details
+ */
+ public NcmpStartUpException(final String message, final String details) {
+ super(message, details);
+ }
+} \ No newline at end of file
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/ModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/ModelLoader.java
new file mode 100644
index 0000000000..6f834b7022
--- /dev/null
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/ModelLoader.java
@@ -0,0 +1,52 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2023 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.cps.ncmp.init;
+
+import java.util.Map;
+import lombok.NonNull;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.ApplicationListener;
+
+public interface ModelLoader extends ApplicationListener<ApplicationReadyEvent> {
+
+ @Override
+ void onApplicationEvent(@NonNull ApplicationReadyEvent applicationReadyEvent);
+
+ /**
+ * Create schema set.
+ *
+ * @param dataspaceName dataspace name
+ * @param schemaSetName schemaset name
+ * @param yangResourceContentMap yang resource content map
+ * @return true if schema set is created
+ */
+ boolean createSchemaSet(String dataspaceName, String schemaSetName, Map<String, String> yangResourceContentMap);
+
+ /**
+ * Create anchor.
+ *
+ * @param dataspaceName dataspace name
+ * @param schemaSetName schemaset name
+ * @param anchorName anchor name
+ * @return true if anchor is created
+ */
+ boolean createAnchor(String dataspaceName, String schemaSetName, String anchorName);
+}
diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java
new file mode 100644
index 0000000000..6713491e6e
--- /dev/null
+++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/init/SubscriptionModelLoader.java
@@ -0,0 +1,124 @@
+/*
+ * ============LICENSE_START=======================================================
+ * Copyright (C) 2023 Nordix Foundation
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ * ============LICENSE_END=========================================================
+ */
+
+package org.onap.cps.ncmp.init;
+
+import java.io.InputStream;
+import java.nio.charset.StandardCharsets;
+import java.util.Map;
+import lombok.NonNull;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.onap.cps.api.CpsAdminService;
+import org.onap.cps.api.CpsModuleService;
+import org.onap.cps.ncmp.api.impl.exception.NcmpStartUpException;
+import org.onap.cps.spi.exceptions.AlreadyDefinedException;
+import org.springframework.boot.SpringApplication;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.stereotype.Component;
+
+@Slf4j
+@Component
+@RequiredArgsConstructor
+public class SubscriptionModelLoader implements ModelLoader {
+
+ private final CpsAdminService cpsAdminService;
+ private final CpsModuleService cpsModuleService;
+ private static final String SUBSCRIPTION_DATASPACE_NAME = "NCMP-Admin";
+ private static final String SUBSCRIPTION_ANCHOR_NAME = "AVC-Subscriptions";
+ private static final String SUBSCRIPTION_SCHEMASET_NAME = "subscriptions";
+
+ /**
+ * Method calls boarding subscription model when Application is ready.
+ *
+ * @param applicationReadyEvent the event to respond to
+ */
+ @Override
+ public void onApplicationEvent(@NonNull final ApplicationReadyEvent applicationReadyEvent) {
+ try {
+ onboardSubscriptionModel();
+ } catch (final NcmpStartUpException ncmpStartUpException) {
+ log.debug("Onboarding model for NCMP failed: {} ", ncmpStartUpException.getMessage());
+ SpringApplication.exit(applicationReadyEvent.getApplicationContext(), () -> 1);
+ }
+ }
+
+ /**
+ * Method to onboard subscription model for NCMP.
+ */
+ private void onboardSubscriptionModel() {
+ final Map<String, String> yangResourceContentMap = createYangResourceToContentMap();
+ if (!yangResourceContentMap.get("subscription.yang").isEmpty()) {
+ createSchemaSet(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_SCHEMASET_NAME, yangResourceContentMap);
+ createAnchor(SUBSCRIPTION_DATASPACE_NAME, SUBSCRIPTION_SCHEMASET_NAME, SUBSCRIPTION_ANCHOR_NAME);
+ }
+ }
+
+
+ @Override
+ public boolean createSchemaSet(final String dataspaceName,
+ final String schemaSetName,
+ final Map<String, String> yangResourceContentMap) {
+ try {
+ cpsModuleService.createSchemaSet(dataspaceName, schemaSetName, yangResourceContentMap);
+ } catch (final AlreadyDefinedException exception) {
+ log.info("Creating new schema set failed as schema set already exists");
+ } catch (final Exception exception) {
+ log.debug("Creating schema set for subscription model failed: {} ", exception.getMessage());
+ throw new NcmpStartUpException("Creating schema set failed", exception.getMessage());
+ }
+ return true;
+ }
+
+ /**
+ * Create Anchor.
+ *
+ * @param dataspaceName dataspace name
+ * @param schemaSetName schema set name
+ * @param anchorName anchor name
+ */
+ @Override
+ public boolean createAnchor(final String dataspaceName, final String schemaSetName,
+ final String anchorName) {
+ try {
+ cpsAdminService.createAnchor(dataspaceName, schemaSetName, anchorName);
+ } catch (final AlreadyDefinedException exception) {
+ log.info("Creating new anchor failed as anchor already exists");
+ } catch (final Exception exception) {
+ log.debug("Creating anchor for subscription model failed: {} ", exception.getMessage());
+ throw new NcmpStartUpException("Creating anchor failed", exception.getMessage());
+ }
+ return true;
+ }
+
+ private String getFileContentAsString() {
+ try (InputStream inputStream = ClassLoader.getSystemClassLoader()
+ .getResourceAsStream("model/subscription.yang")) {
+ return new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
+ } catch (final Exception exception) {
+ log.debug("Onboarding failed as unable to read file: {}", exception.getCause().toString());
+ throw new NcmpStartUpException("Onboarding failed as unable to read file: {}", exception.getMessage());
+ }
+ }
+
+ private Map<String, String> createYangResourceToContentMap() {
+ return Map.of("subscription.yang", getFileContentAsString());
+ }
+}
diff --git a/cps-ncmp-service/src/main/resources/model/subscription.yang b/cps-ncmp-service/src/main/resources/model/subscription.yang
index c5dee43802..ad358445b2 100644
--- a/cps-ncmp-service/src/main/resources/model/subscription.yang
+++ b/cps-ncmp-service/src/main/resources/model/subscription.yang
@@ -28,6 +28,11 @@ module subscription {
leaf isTagged {
type boolean;
}
+
+ leaf-list dmi-service-names {
+ type string;
+ }
+
}
}
} \ No newline at end of file