summaryrefslogtreecommitdiffstats
path: root/mod/bpgenerator/onap/src/main
diff options
context:
space:
mode:
authorRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2020-12-17 18:20:12 +0100
committerRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2021-01-04 21:52:41 +0000
commit88286a3487c3ec955cc6207be2e70318634ebbd9 (patch)
tree2bd02b0322f4b14c0820b7ec086e9229fd75364c /mod/bpgenerator/onap/src/main
parenta3c8fc0395e9518c5f0f064a033f4ab4d7040c61 (diff)
Blueprint Generator - split executable part to separate submodule
Issue-ID: DCAEGEN2-2529 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com> Change-Id: I0d6a4ac0f6bc8332b79ebcf5ac3bb4aee1c951c6
Diffstat (limited to 'mod/bpgenerator/onap/src/main')
-rw-r--r--mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorConfiguration.java35
-rw-r--r--mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorMainApplication.java113
-rw-r--r--mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ImportsService.java10
-rw-r--r--mod/bpgenerator/onap/src/main/resources/bpgen.properties (renamed from mod/bpgenerator/onap/src/main/resources/application.properties)4
4 files changed, 42 insertions, 120 deletions
diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorConfiguration.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorConfiguration.java
new file mode 100644
index 0000000..fbe97e9
--- /dev/null
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorConfiguration.java
@@ -0,0 +1,35 @@
+/*
+ *
+ * * ============LICENSE_START=======================================================
+ * * org.onap.dcae
+ * * ================================================================================
+ * * Copyright (c) 2020 Nokia. All rights reserved.
+ * * ================================================================================
+ * * 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.
+ * * ============LICENSE_END=========================================================
+ *
+ *
+ */
+
+package org.onap.blueprintgenerator;
+
+import org.springframework.context.annotation.ComponentScan;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
+
+@Configuration
+@PropertySource("classpath:bpgen.properties")
+@ComponentScan(basePackages = {"org.onap.blueprintgenerator", "org.onap.policycreate"})
+public class BlueprintGeneratorConfiguration {
+
+}
diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorMainApplication.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorMainApplication.java
deleted file mode 100644
index 796424f..0000000
--- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorMainApplication.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- *
- * * ============LICENSE_START=======================================================
- * * org.onap.dcae
- * * ================================================================================
- * * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
- * * Copyright (c) 2020 Nokia. All rights reserved.
- * * ================================================================================
- * * 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.
- * * ============LICENSE_END=========================================================
- *
- *
- */
-
-package org.onap.blueprintgenerator;
-
-
-import static java.lang.System.exit;
-
-import org.onap.blueprintgenerator.model.base.Blueprint;
-import org.onap.blueprintgenerator.model.common.Input;
-import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec;
-import org.onap.blueprintgenerator.model.componentspec.base.ComponentSpec;
-import org.onap.blueprintgenerator.service.BlueprintCreatorService;
-import org.onap.blueprintgenerator.service.base.BlueprintService;
-import org.onap.blueprintgenerator.service.common.CommonUtils;
-import org.onap.blueprintgenerator.service.common.ComponentSpecService;
-import org.onap.policycreate.service.PolicyModelService;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.boot.CommandLineRunner;
-import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.context.annotation.ComponentScan;
-
-/**
- * @author : Ravi Mantena
- * @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP - Blueprint Generator Main
- * Application to create Policy Models or Blueprints
- */
-@ComponentScan({"org.onap.blueprintgenerator", "org.onap.policycreate"})
-@SpringBootApplication
-public class BlueprintGeneratorMainApplication implements CommandLineRunner {
-
- @Autowired
- private ComponentSpecService componentSpecService;
-
- @Autowired
- private PolicyModelService policyModelService;
-
- @Autowired
- private CommonUtils commonUtils;
-
- @Autowired
- private PolicyModelService onapPolicyModelNodeService;
-
- @Autowired
- private ComponentSpecService onapComponentSpecService;
-
- @Autowired
- private CommonUtils onapCommonUtils;
-
- @Autowired
- private BlueprintCreatorService blueprintCreatorService;
-
- @Autowired
- private BlueprintService blueprintService;
-
- /**
- * Main Application to run BPGen to generate Policies/Blueprint based on Input Arguments values
- *
- * @param args Input Arguments
- */
- public static void main(String[] args) {
- SpringApplication.run(BlueprintGeneratorMainApplication.class, args);
- }
-
- /**
- * Creates Policies/Blueprint based on Input Arguments values
- *
- * @param args Input Arguments
- */
- @Override
- public void run(String... args) {
- if (args.length >= 2 && args[0].equals("app") && args[1].equals("ONAP")) {
- onapCommonUtils.printInstructions();
- if (args.length >= 4 && args[2].equals("-type") && args[3].equals("policycreate")) {
- Input input = onapCommonUtils.parseInputs(args);
- ComponentSpec componentSpec =
- componentSpecService.createComponentSpecFromFile(input.getComponentSpecPath());
- onapPolicyModelNodeService.createPolicyModels(
- componentSpec.getParameters(), input.getOutputPath());
- } else {
- Input input = onapCommonUtils.parseInputs(args);
- OnapComponentSpec onapComponentSpec = onapComponentSpecService.createComponentSpecFromFile(input.getComponentSpecPath());
- Blueprint blueprint = blueprintCreatorService.createBlueprint(onapComponentSpec, input);
- blueprintService.blueprintToYaml(onapComponentSpec, blueprint, input);
- System.out.println(blueprintService.blueprintToString(onapComponentSpec, blueprint, input));
- }
- }
-
- exit(0);
- }
-}
diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ImportsService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ImportsService.java
index 6fa43da..44bca11 100644
--- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ImportsService.java
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/common/ImportsService.java
@@ -4,6 +4,7 @@
* * org.onap.dcae
* * ================================================================================
* * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+ * * Copyright (c) 2020 Nokia. All rights reserved.
* * ================================================================================
* * Licensed under the Apache License, Version 2.0 (the "License");
* * you may not use this file except in compliance with the License.
@@ -24,17 +25,16 @@
package org.onap.blueprintgenerator.service.common;
import com.fasterxml.jackson.databind.ObjectMapper;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
import org.onap.blueprintgenerator.model.common.Imports;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Service;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
/**
* @author : Ravi Mantena
* @date 10/16/2020 Application: DCAE/ONAP - Blueprint Generator Common Module: Used by ONAP
diff --git a/mod/bpgenerator/onap/src/main/resources/application.properties b/mod/bpgenerator/onap/src/main/resources/bpgen.properties
index f7155a5..69a3ad6 100644
--- a/mod/bpgenerator/onap/src/main/resources/application.properties
+++ b/mod/bpgenerator/onap/src/main/resources/bpgen.properties
@@ -4,6 +4,7 @@
# * org.onap.dcae
# * ================================================================================
# * Copyright (c) 2020 AT&T Intellectual Property. All rights reserved.
+# * Copyright (c) 2020 Nokia. All rights reserved.
# * ================================================================================
# * Licensed under the Apache License, Version 2.0 (the "License");
# * you may not use this file except in compliance with the License.
@@ -20,8 +21,7 @@
# */
#
#
-spring.main.banner-mode=off
-spring.output.ansi.enabled=ALWAYS
+
imports.onap.types=https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
imports.onap.K8s.plugintypes=plugin:k8splugin?version=3.4.2
imports.onap.K8s.dcaepolicyplugin=plugin:dcaepolicyplugin?version=2.4.0