summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2020-12-17 14:27:01 +0100
committerRemigiusz Janeczek <remigiusz.janeczek@nokia.com>2021-01-04 22:25:10 +0100
commita3c8fc0395e9518c5f0f064a033f4ab4d7040c61 (patch)
tree47e230a0c6ba06a58965d461ba4153dcfaf68f71
parent7e2f7f78aa649ded0d3b9018da7a9d4b6bcb5ecc (diff)
Blueprint Generator - Refactor blueprint generation.
Issue-ID: DCAEGEN2-2529 Signed-off-by: Remigiusz Janeczek <remigiusz.janeczek@nokia.com> Change-Id: I72959f3e6c27d301e46ede24c015ce638d8de324
-rw-r--r--mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/service/base/BlueprintService.java2
-rw-r--r--mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorMainApplication.java36
-rw-r--r--mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/BlueprintCreatorService.java70
-rw-r--r--mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintCreatorService.java (renamed from mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintService.java)3
-rw-r--r--mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/onap/OnapBlueprintCreatorService.java (renamed from mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/OnapBlueprintService.java)5
-rw-r--r--mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/BlueprintCreatorServiceTest.java114
-rw-r--r--mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTestSuite.java2
-rw-r--r--mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.java23
-rw-r--r--mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintCreatorServiceTest.java (renamed from mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintServiceTest.java)61
-rw-r--r--mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java3
10 files changed, 244 insertions, 75 deletions
diff --git a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/service/base/BlueprintService.java b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/service/base/BlueprintService.java
index 7dd05f2..c32e5b1 100644
--- a/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/service/base/BlueprintService.java
+++ b/mod/bpgenerator/common/src/main/java/org/onap/blueprintgenerator/service/base/BlueprintService.java
@@ -54,7 +54,7 @@ import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
* Yaml/String
*/
@Service
-public abstract class BlueprintService {
+public class BlueprintService {
@Autowired
protected FixesService fixesService;
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
index d680919..796424f 100644
--- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorMainApplication.java
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/BlueprintGeneratorMainApplication.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.
@@ -23,14 +24,17 @@
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.OnapBlueprintService;
+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.blueprintgenerator.service.dmaap.DmaapBlueprintService;
import org.onap.policycreate.service.PolicyModelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.CommandLineRunner;
@@ -38,8 +42,6 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.context.annotation.ComponentScan;
-import static java.lang.System.exit;
-
/**
* @author : Ravi Mantena
* @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP - Blueprint Generator Main
@@ -68,10 +70,10 @@ public class BlueprintGeneratorMainApplication implements CommandLineRunner {
private CommonUtils onapCommonUtils;
@Autowired
- private OnapBlueprintService onapBlueprintService;
+ private BlueprintCreatorService blueprintCreatorService;
@Autowired
- private DmaapBlueprintService dmaapBlueprintService;
+ private BlueprintService blueprintService;
/**
* Main Application to run BPGen to generate Policies/Blueprint based on Input Arguments values
@@ -99,24 +101,10 @@ public class BlueprintGeneratorMainApplication implements CommandLineRunner {
componentSpec.getParameters(), input.getOutputPath());
} else {
Input input = onapCommonUtils.parseInputs(args);
- OnapComponentSpec onapComponentSpec =
- onapComponentSpecService
- .createComponentSpecFromFile(input.getComponentSpecPath());
- if (input.getBpType().equals("o")) {
- Blueprint blueprint = onapBlueprintService
- .createBlueprint(onapComponentSpec, input);
- onapBlueprintService.blueprintToYaml(onapComponentSpec, blueprint, input);
- System.out.println(
- onapBlueprintService
- .blueprintToString(onapComponentSpec, blueprint, input));
- } else if (input.getBpType().equals("d")) {
- Blueprint blueprint = dmaapBlueprintService
- .createBlueprint(onapComponentSpec, input);
- dmaapBlueprintService.blueprintToYaml(onapComponentSpec, blueprint, input);
- System.out.println(
- dmaapBlueprintService
- .blueprintToString(onapComponentSpec, blueprint, input));
- }
+ 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));
}
}
diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/BlueprintCreatorService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/BlueprintCreatorService.java
new file mode 100644
index 0000000..48c196e
--- /dev/null
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/BlueprintCreatorService.java
@@ -0,0 +1,70 @@
+/*
+ * ============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.service;
+
+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.service.dmaap.DmaapBlueprintCreatorService;
+import org.onap.blueprintgenerator.service.onap.OnapBlueprintCreatorService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author : Remigiusz Janeczek
+ * @date 12/17/2020 Application: ONAP - Blueprint Generator Service to create ONAP and DMAAP Blueprints
+ */
+@Service
+public class BlueprintCreatorService {
+
+ private final OnapBlueprintCreatorService onapBlueprintCreatorService;
+
+ private final DmaapBlueprintCreatorService dmaapBlueprintCreatorService;
+
+ @Autowired
+ public BlueprintCreatorService(OnapBlueprintCreatorService onapBlueprintCreatorService,
+ DmaapBlueprintCreatorService dmaapBlueprintCreatorService) {
+ this.onapBlueprintCreatorService = onapBlueprintCreatorService;
+ this.dmaapBlueprintCreatorService = dmaapBlueprintCreatorService;
+ }
+
+ /**
+ * Creates Blueprint from given OnapComponentSpec and Input objects if the input is json file or not
+ *
+ * @param componentSpec OnapComponentSpec object
+ * @param input Input object, needs to have bpType defined (either as "o" (ONAP Blueprint) or "d" (DMAAP
+ * Blueprint)
+ * @return blueprint generated from componentSpec and input
+ */
+ public Blueprint createBlueprint(OnapComponentSpec componentSpec, Input input) {
+ if (input.getBpType() == null) {
+ return null;
+ }
+ Blueprint blueprint = null;
+ if (input.getBpType().equals("o")) {
+ blueprint = onapBlueprintCreatorService.createBlueprint(componentSpec, input);
+ } else if (input.getBpType().equals("d")) {
+ blueprint = dmaapBlueprintCreatorService.createBlueprint(componentSpec, input);
+ }
+ return blueprint;
+ }
+
+}
diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintCreatorService.java
index 9da2074..bf68f81 100644
--- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintService.java
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/dmaap/DmaapBlueprintCreatorService.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.
@@ -51,7 +52,7 @@ import java.util.TreeMap;
* @date 10/16/2020 Application: ONAP - Blueprint Generator Service to create DMAAP Blueprint
*/
@Service
-public class DmaapBlueprintService extends BlueprintService {
+public class DmaapBlueprintCreatorService {
@Autowired
protected ImportsService importsService;
diff --git a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/OnapBlueprintService.java b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/onap/OnapBlueprintCreatorService.java
index 748facf..afc02f3 100644
--- a/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/OnapBlueprintService.java
+++ b/mod/bpgenerator/onap/src/main/java/org/onap/blueprintgenerator/service/onap/OnapBlueprintCreatorService.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.
@@ -21,7 +22,7 @@
*
*/
-package org.onap.blueprintgenerator.service;
+package org.onap.blueprintgenerator.service.onap;
import org.onap.blueprintgenerator.constants.Constants;
import org.onap.blueprintgenerator.exception.BlueprintException;
@@ -48,7 +49,7 @@ import java.util.TreeMap;
* @date 10/16/2020 Application: ONAP - Blueprint Generator Service to create ONAP Blueprint
*/
@Service
-public class OnapBlueprintService extends BlueprintService {
+public class OnapBlueprintCreatorService {
@Autowired
private NodeService nodeService;
diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/BlueprintCreatorServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/BlueprintCreatorServiceTest.java
new file mode 100644
index 0000000..c1e46f2
--- /dev/null
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/service/BlueprintCreatorServiceTest.java
@@ -0,0 +1,114 @@
+/*
+ * ============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.service;
+
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.verifyNoInteractions;
+import static org.mockito.Mockito.when;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.onap.blueprintgenerator.model.base.Blueprint;
+import org.onap.blueprintgenerator.model.common.Input;
+import org.onap.blueprintgenerator.model.common.OnapBlueprint;
+import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec;
+import org.onap.blueprintgenerator.service.dmaap.DmaapBlueprintCreatorService;
+import org.onap.blueprintgenerator.service.onap.OnapBlueprintCreatorService;
+
+public class BlueprintCreatorServiceTest {
+
+ private static final String ONAP_BP_TYPE = "o";
+ private static final String DMAAP_BP_TYPE = "d";
+ private static final String INCORRECT_BP_TYPE = "z";
+
+ private OnapBlueprintCreatorService onapBlueprintCreatorService;
+ private DmaapBlueprintCreatorService dmaapBlueprintCreatorService;
+ private BlueprintCreatorService blueprintCreatorService;
+
+ @Before
+ public void setup() {
+ onapBlueprintCreatorService = mock(OnapBlueprintCreatorService.class);
+ dmaapBlueprintCreatorService = mock(DmaapBlueprintCreatorService.class);
+ blueprintCreatorService = new BlueprintCreatorService(onapBlueprintCreatorService,
+ dmaapBlueprintCreatorService);
+ }
+
+ @Test
+ public void shouldCreateOnapBlueprint() {
+ OnapComponentSpec cs = new OnapComponentSpec();
+ Input input = new Input();
+ input.setBpType(ONAP_BP_TYPE);
+ when(onapBlueprintCreatorService.createBlueprint(any(), any())).thenReturn(new OnapBlueprint());
+
+ Blueprint blueprint = blueprintCreatorService.createBlueprint(cs, input);
+
+ verify(onapBlueprintCreatorService, times(1)).createBlueprint(cs, input);
+ verify(onapBlueprintCreatorService, times(1)).createBlueprint(cs, input);
+ verifyNoInteractions(dmaapBlueprintCreatorService);
+ assertNotNull(blueprint);
+ }
+
+ @Test
+ public void shouldCreateDmaapBlueprint() {
+ OnapComponentSpec cs = new OnapComponentSpec();
+ Input input = new Input();
+ input.setBpType(DMAAP_BP_TYPE);
+ when(dmaapBlueprintCreatorService.createBlueprint(any(), any())).thenReturn(new OnapBlueprint());
+
+ Blueprint blueprint = blueprintCreatorService.createBlueprint(cs, input);
+
+ verify(dmaapBlueprintCreatorService, times(1)).createBlueprint(cs, input);
+ verify(dmaapBlueprintCreatorService, times(1)).createBlueprint(cs, input);
+ verifyNoInteractions(onapBlueprintCreatorService);
+ assertNotNull(blueprint);
+ }
+
+ @Test
+ public void shouldReturnNullWhenBpTypeNotDefined(){
+ OnapComponentSpec cs = new OnapComponentSpec();
+ Input input = new Input();
+
+ Blueprint blueprint = blueprintCreatorService.createBlueprint(cs, input);
+
+ verifyNoInteractions(onapBlueprintCreatorService);
+ verifyNoInteractions(dmaapBlueprintCreatorService);
+ assertNull(blueprint);
+ }
+
+ @Test
+ public void shouldReturnNullWhenBpTypeIncorrect(){
+ OnapComponentSpec cs = new OnapComponentSpec();
+ Input input = new Input();
+ input.setBpType(INCORRECT_BP_TYPE);
+
+ Blueprint blueprint = blueprintCreatorService.createBlueprint(cs, input);
+
+ verifyNoInteractions(onapBlueprintCreatorService);
+ verifyNoInteractions(dmaapBlueprintCreatorService);
+ assertNull(blueprint);
+ }
+
+}
diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTestSuite.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTestSuite.java
index d15be4d..5c90acd 100644
--- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTestSuite.java
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTestSuite.java
@@ -33,7 +33,7 @@ import org.junit.runners.Suite;
@RunWith(Suite.class)
@Suite.SuiteClasses({
OnapComponentSpecTest.class,
- OnapBlueprintServiceTest.class,
+ OnapBlueprintCreatorServiceTest.class,
ExternalCertificateParametersFactoryServiceTest.class /*, BlueprintJarComparatorTest.class*/
})
public class BlueprintGeneratorTestSuite {
diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.java
index 81aaa60..86d257a 100644
--- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.java
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/BlueprintGeneratorTests.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.
@@ -23,14 +24,16 @@
package org.onap.blueprintgenerator.test;
-import org.onap.blueprintgenerator.BlueprintGeneratorMainApplication;
-import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec;
-import org.onap.blueprintgenerator.service.OnapBlueprintService;
-import org.onap.blueprintgenerator.service.common.ComponentSpecService;
-import org.onap.blueprintgenerator.service.dmaap.DmaapBlueprintService;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.junit.Ignore;
import org.junit.runner.RunWith;
+import org.onap.blueprintgenerator.BlueprintGeneratorMainApplication;
+import org.onap.blueprintgenerator.model.componentspec.OnapComponentSpec;
+import org.onap.blueprintgenerator.service.BlueprintCreatorService;
+import org.onap.blueprintgenerator.service.base.BlueprintService;
+import org.onap.blueprintgenerator.service.common.ComponentSpecService;
+import org.onap.blueprintgenerator.service.dmaap.DmaapBlueprintCreatorService;
+import org.onap.blueprintgenerator.service.onap.OnapBlueprintCreatorService;
import org.onap.policycreate.service.PolicyModelService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.beans.factory.annotation.Qualifier;
@@ -90,10 +93,16 @@ public class BlueprintGeneratorTests {
protected ComponentSpecService onapComponentSpecService;
@Autowired
- protected DmaapBlueprintService dmaapBlueprintService;
+ protected DmaapBlueprintCreatorService dmaapBlueprintCreatorService;
+
+ @Autowired
+ protected OnapBlueprintCreatorService onapBlueprintCreatorService;
+
+ @Autowired
+ protected BlueprintCreatorService blueprintCreatorService;
@Autowired
- protected OnapBlueprintService onapBlueprintService;
+ protected BlueprintService blueprintService;
@Autowired
protected PolicyModelService policyModelService;
diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintServiceTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintCreatorServiceTest.java
index 8f4a1f6..866a324 100644
--- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintServiceTest.java
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/OnapBlueprintCreatorServiceTest.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.
@@ -23,38 +24,31 @@
package org.onap.blueprintgenerator.test;
-import org.mockito.ArgumentCaptor;
-import org.mockito.Mockito;
-import org.onap.blueprintgenerator.constants.Constants;
-import org.onap.blueprintgenerator.model.common.Input;
-import org.onap.blueprintgenerator.model.common.Node;
-import org.onap.blueprintgenerator.model.common.OnapBlueprint;
-import org.onap.blueprintgenerator.model.common.Properties;
-import org.junit.Test;
-import org.junit.jupiter.api.DisplayName;
-import picocli.CommandLine;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
import java.io.IOException;
-import java.io.PrintStream;
import java.nio.file.Paths;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.assertArrayEquals;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.times;
-import static org.mockito.Mockito.verify;
+import org.junit.Test;
+import org.junit.jupiter.api.DisplayName;
+import org.onap.blueprintgenerator.constants.Constants;
+import org.onap.blueprintgenerator.model.common.Input;
+import org.onap.blueprintgenerator.model.common.Node;
+import org.onap.blueprintgenerator.model.common.OnapBlueprint;
+import org.onap.blueprintgenerator.model.common.Properties;
/**
* @author : Ravi Mantena
* @date 10/16/2020 Application: ONAP - Blueprint Generator ONAP Blueprint Test Cases for ONAP and
* DMAAP
*/
-public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
+
+
+public class OnapBlueprintCreatorServiceTest extends BlueprintGeneratorTests {
private String outputfilesPath =
Paths.get("src", "test", "resources", "outputfiles").toAbsolutePath().toString();
@@ -80,11 +74,9 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
assertNotNull(
"K8s Blueprint for Service Name Override Component Spec is NULL", onapComponentSpec);
- OnapBlueprint onapBlueprint = onapBlueprintService
- .createBlueprint(onapComponentSpec, input);
- onapBlueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
- System.out.println(
- onapBlueprintService.blueprintToString(onapComponentSpec, onapBlueprint, input));
+ OnapBlueprint onapBlueprint = onapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
+ blueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
+ System.out.println(blueprintService.blueprintToString(onapComponentSpec, onapBlueprint, input));
onapTestUtils.verifyToscaDefVersion(
"Service Name Override K8s", onapBlueprint, Constants.TOSCA_DEF_VERSION);
@@ -173,8 +165,7 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
"K8s Blueprint for Service Name Override with Import File Component Spec is NULL",
onapComponentSpec);
- OnapBlueprint onapBlueprint = onapBlueprintService
- .createBlueprint(onapComponentSpec, input);
+ OnapBlueprint onapBlueprint = onapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
onapTestUtils.verifyToscaDefVersion(
"Service Name Override with Import File K8s", onapBlueprint,
@@ -276,9 +267,8 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
onapComponentSpecService.createComponentSpecFromFile(input.getComponentSpecPath());
assertNotNull("K8s Blueprint for DMAAP Component Spec is NULL", onapComponentSpec);
- OnapBlueprint onapBlueprint = dmaapBlueprintService
- .createBlueprint(onapComponentSpec, input);
- onapBlueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
+ OnapBlueprint onapBlueprint = dmaapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
+ blueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
}
/**
@@ -301,11 +291,9 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
onapComponentSpecService.createComponentSpecFromFile(input.getComponentSpecPath());
assertNotNull("K8s Blueprint for DMAAP Component Spec is NULL", onapComponentSpec);
- OnapBlueprint onapBlueprint = dmaapBlueprintService
- .createBlueprint(onapComponentSpec, input);
- onapBlueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
- System.out.println(
- onapBlueprintService.blueprintToString(onapComponentSpec, onapBlueprint, input));
+ OnapBlueprint onapBlueprint = dmaapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
+ blueprintService.blueprintToYaml(onapComponentSpec, onapBlueprint, input);
+ System.out.println(blueprintService.blueprintToString(onapComponentSpec, onapBlueprint, input));
policyModelService.createPolicyModels(onapComponentSpec.getParameters(), "models");
@@ -390,8 +378,7 @@ public class OnapBlueprintServiceTest extends BlueprintGeneratorTests {
assertNotNull(
"K8s Blueprint for DMAAP Component Spec with Import File is NULL", onapComponentSpec);
- OnapBlueprint onapBlueprint = dmaapBlueprintService
- .createBlueprint(onapComponentSpec, input);
+ OnapBlueprint onapBlueprint = dmaapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
onapTestUtils.verifyToscaDefVersion(
"DMAAP with Import File K8s", onapBlueprint, Constants.TOSCA_DEF_VERSION);
diff --git a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java
index 984c262..433240f 100644
--- a/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java
+++ b/mod/bpgenerator/onap/src/test/java/org/onap/blueprintgenerator/test/TlsInfoTest.java
@@ -209,8 +209,7 @@ public class TlsInfoTest extends BlueprintGeneratorTests {
private OnapBlueprint createBlueprintFromFile(String path) {
onapComponentSpec = onapComponentSpecService.createComponentSpecFromFile(path);
Input input = onapTestUtils.getInput(path, "", "", "", "o", "");
- OnapBlueprint onapBlueprint = onapBlueprintService
- .createBlueprint(onapComponentSpec, input);
+ OnapBlueprint onapBlueprint = onapBlueprintCreatorService.createBlueprint(onapComponentSpec, input);
return onapBlueprint;
}
}