Merge "Initial unit test coverage"

diff --git a/adapter/acumos/aoconversion/spec_gen.py b/adapter/acumos/aoconversion/spec_gen.py
index 1662872..4230f6d 100644 (file)
--- a/adapter/acumos/aoconversion/spec_gen.py
+++ b/adapter/acumos/aoconversion/spec_gen.py
@@ -29,7 +29,7 @@ from aoconversion import utils
 
 def _get_dcae_cs_schema():
     res = requests.get(
-        "https://gerrit.onap.org/r/gitweb?p=dcaegen2/platform/cli.git;a=blob_plain;f=component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json;hb=HEAD"
+        "https://git.onap.org/dcaegen2/platform/plain/mod/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json"
     )
     return res.json()
 

diff --git a/adapter/acumos/pom.xml b/adapter/acumos/pom.xml
index 8495ee6..8a9211c 100644 (file)
--- a/adapter/acumos/pom.xml
+++ b/adapter/acumos/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <sonar.sources>.</sonar.sources>
                <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
-               <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
+               <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths>
                <sonar.language>py</sonar.language>
                <sonar.pluginname>python</sonar.pluginname>
                <sonar.inclusions>**/*.py</sonar.inclusions>

diff --git a/adapter/acumos/tests/fixtures/dcae-cli-v2_component-spec-schema.json b/adapter/acumos/tests/fixtures/dcae-cli-v2_component-spec-schema.json
index 1f1f75e..0fd68ec 100644 (file)
--- a/adapter/acumos/tests/fixtures/dcae-cli-v2_component-spec-schema.json
+++ b/adapter/acumos/tests/fixtures/dcae-cli-v2_component-spec-schema.json
@@ -102,6 +102,36 @@
       "items": {
         "$ref": "#/definitions/artifact"
       }
+    },
+    "policy_info": {
+      "type": "object",
+      "properties": {
+        "policy": 
+        {
+          "type": "array",
+          "items": 
+          {
+            "type": "object",
+            "properties": 
+            {
+              "node_label": 
+              {
+                "type": "string"
+              },
+              "policy_id": 
+              {
+              "type": "string"
+              },
+              "policy_model_id": 
+              {
+              "type": "string"
+              }
+            },
+            "required": ["node_label", "policy_model_id"]
+          }
+        }
+      },
+      "additionalProperties": false
     }
   },
   "required": [
@@ -740,7 +770,7 @@
             "type": "string"
           }
         },
-        "logging": {
+        "log_info": {
           "description": "Component specific details for logging",
           "type": "object",
           "properties": {
@@ -755,6 +785,34 @@
           },
           "additionalProperties": false
         },
+        "tls_info": {
+          "description": "Component information to use tls certificates",
+          "type": "object",
+          "properties": {
+            "cert_directory": {
+              "description": "The path in the container where the component certificates will be placed by the init container",
+              "type": "string"
+            },
+            "use_tls": {
+              "description": "Boolean flag to determine if the application is using tls certificates",
+              "type": "boolean"
+            }
+          },
+          "required": [
+              "cert_directory","use_tls"
+             ],
+          "additionalProperties": false
+        },
+        "databases": {
+          "description": "The databases the application is connecting to using the pgaas",
+          "type": "object",
+          "additionalProperties": {
+            "type": "string",
+            "enum": [
+              "postgres"
+            ]
+          }
+        },
         "policy": {
            "properties": {
              "trigger_type": {

diff --git a/mod/bpgenerator/pom.xml b/mod/bpgenerator/pom.xml
index e1a50b4..6255329 100644 (file)
--- a/mod/bpgenerator/pom.xml
+++ b/mod/bpgenerator/pom.xml
@@ -29,7 +29,7 @@
        </parent>
        <groupId>org.onap.dcaegen2.platform.mod</groupId>
        <artifactId>blueprint-generator</artifactId>
-       <version>1.3.0-SNAPSHOT</version>
+       <version>1.3.1-SNAPSHOT</version>
        <properties>
                <maven.compiler.source>1.6</maven.compiler.source>
                <maven.compiler.target>1.6</maven.compiler.target>
@@ -39,7 +39,7 @@
                <sonar.java.coveragePlugin>cobertura</sonar.java.coveragePlugin>
                <sonar.junit.reportsPath>${project.basedir}/target/surefire-reports</sonar.junit.reportsPath>
                <sonar.surefire.reportsPath>${project.basedir}/target/surefire-reports</sonar.surefire.reportsPath>
-               <sonar.cobertura.reportPath>${project.basedir}/target/site/cobertura/coverage.xml</sonar.cobertura.reportPath>
+               <sonar.cobertura.reportPaths>${project.basedir}/target/site/cobertura/coverage.xml</sonar.cobertura.reportPaths>
                <shade.main>org.onap.blueprintgenerator.core.App</shade.main>
                <shade.transformer>org.apache.maven.plugins.shade.resource.ManifestResourceTransformer</shade.transformer>
        </properties>

diff --git a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Blueprint.java b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Blueprint.java
index 75c79ba..c043a9e 100644 (file)
--- a/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Blueprint.java
+++ b/mod/bpgenerator/src/main/java/org/onap/blueprintgenerator/models/blueprint/Blueprint.java
@@ -80,17 +80,21 @@ public class Blueprint {
                }
                return bp;
        }
+
        public Blueprint setQuotations(Blueprint bp) {
                for(String s: bp.getInputs().keySet()) {
                        LinkedHashMap<String, Object> temp = bp.getInputs().get(s);
                        if(temp.get("type") == "string") {
                                String def = (String) temp.get("default");
+                               if(def != null){
+                                       def = def.replaceAll("\"$", "").replaceAll("^\"", "");
+                               }
                                def = '"' + def + '"';
                                temp.replace("default", def);
                                bp.getInputs().replace(s, temp);
                        }
                }
-               
+
                return bp;
        }
 
@@ -200,7 +204,6 @@ public class Blueprint {
                        throw new RuntimeException(e);
                }
 
-
                return Fixes.applyFixes(ret);
        }
 }

diff --git a/mod/bpgenerator/version.properties b/mod/bpgenerator/version.properties
index 7d6815b..fee4928 100644 (file)
--- a/mod/bpgenerator/version.properties
+++ b/mod/bpgenerator/version.properties
@@ -1,6 +1,6 @@
 major=1
 minor=3
-patch=0
+patch=1
 base_version=${major}.${minor}.${patch}
 release_version=${base_version}
 snapshot_version=${base_version}-SNAPSHOT

diff --git a/mod/distributorapi/pom.xml b/mod/distributorapi/pom.xml
index 6f080f6..3cfd949 100644 (file)
--- a/mod/distributorapi/pom.xml
+++ b/mod/distributorapi/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
                <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
                <sonar.sources>.</sonar.sources>
                <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
-               <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
+               <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths>
                <sonar.language>py</sonar.language>
                <sonar.pluginname>python</sonar.pluginname>
                <sonar.inclusions>**/*.py</sonar.inclusions>

diff --git a/mod/distributorapi/setup.py b/mod/distributorapi/setup.py
index 3d0acfd..4a09471 100644 (file)
--- a/mod/distributorapi/setup.py
+++ b/mod/distributorapi/setup.py
@@ -34,6 +34,7 @@ setup(
         start-distributor-api=distributor.http:start_http_server
         """,
         install_requires=[
+            "Werkzeug==0.16.1",
             "flask-restplus"
             , "Flask-Cors"
             , "requests"

diff --git a/mod/onboardingapi/ChangeLog.md b/mod/onboardingapi/ChangeLog.md
index 675184d..21d0f0c 100644 (file)
--- a/mod/onboardingapi/ChangeLog.md
+++ b/mod/onboardingapi/ChangeLog.md
@@ -15,6 +15,9 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 * Enhance Docker image creation to generate the dcae-cli configuration at runtime rather than at build time
 * Fix format_description to handle no description case
 * Add filtering by name, version for GET /components
+* Modify server url in start.sh to point to new spec file
+* Change dcae cli version in start.sh to 2.12.0
+* Change werkzeug dependency version in setup.py
 
 ## [2.11.3]
 

diff --git a/mod/onboardingapi/pom.xml b/mod/onboardingapi/pom.xml
index 9b1c4f0..588a9b2 100644 (file)
--- a/mod/onboardingapi/pom.xml
+++ b/mod/onboardingapi/pom.xml
@@ -28,7 +28,7 @@ limitations under the License.
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     <sonar.sources>.</sonar.sources>
     <sonar.junit.reportsPath>xunit-results.xml</sonar.junit.reportsPath>
-    <sonar.python.coverage.reportPath>coverage.xml</sonar.python.coverage.reportPath>
+    <sonar.python.coverage.reportPaths>coverage.xml</sonar.python.coverage.reportPaths>
     <sonar.language>py</sonar.language>
     <sonar.pluginName>Python</sonar.pluginName>
     <sonar.inclusions>**/*.py</sonar.inclusions>

diff --git a/mod/onboardingapi/setup.py b/mod/onboardingapi/setup.py
index 438732c..6ad35a7 100644 (file)
--- a/mod/onboardingapi/setup.py
+++ b/mod/onboardingapi/setup.py
@@ -42,7 +42,9 @@ setup(
     dcae_cli=dcae_cli.cli:cli
     """,
     setup_requires=['pytest-runner'],
-    install_requires=['python-consul<1.0.0',
+    install_requires=[
+                      'Werkzeug==0.16.1',
+                     'python-consul<1.0.0',
                       'six',
                       'sqlalchemy',
                       'SQLAlchemy-Utils',

diff --git a/mod/onboardingapi/start.sh b/mod/onboardingapi/start.sh
index 8b3978d..6d7d9e5 100755 (executable)
--- a/mod/onboardingapi/start.sh
+++ b/mod/onboardingapi/start.sh
@@ -9,7 +9,7 @@ fi
 if [ ! -f ~/.config/dcae-cli/config.json ]; then
     echo "Creating dcae-cli config"
     # TODO: Make this into a variable that gets fed in via docker run
-    echo "{\"server_url\": \"https://git.onap.org/dcaegen2/platform/cli/plain\", \"user\": \"api\", \"db_url\": \"$PG_CONN\", \"cli_version\": \"2.11.1\", \"path_component_spec\": \"/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json\", \"path_data_format\": \"/component-json-schemas/data-format/dcae-cli-v1/data-format-schema.json\"}" > ~/.config/dcae-cli/config.json
+    echo "{\"server_url\": \"https://git.onap.org/dcaegen2/platform/plain/mod\", \"user\": \"api\", \"db_url\": \"$PG_CONN\", \"cli_version\": \"2.12.0\", \"path_component_spec\": \"/component-json-schemas/component-specification/dcae-cli-v2/component-spec-schema.json\", \"path_data_format\": \"/component-json-schemas/data-format/dcae-cli-v1/data-format-schema.json\"}" > ~/.config/dcae-cli/config.json
 fi
 
 dcae_cli http --live

diff --git a/mod/runtimeapi/pom.xml b/mod/runtimeapi/pom.xml
index e951d94..d935f35 100644 (file)
--- a/mod/runtimeapi/pom.xml
+++ b/mod/runtimeapi/pom.xml
@@ -16,7 +16,8 @@ See the License for the specific language governing permissions and
 limitations under the License.
 ============LICENSE_END=========================================================
 -->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
        xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <packaging>pom</packaging>
@@ -39,28 +40,51 @@ limitations under the License.
                <java.version>1.8</java.version>
                <maven.build.timestamp.format>yyyyMMdd'T'HHmmss</maven.build.timestamp.format>
                <sonar.coverage.jacoco.xmlReportPaths>${project.reporting.outputDirectory}/jacoco-ut/jacoco.xml
-               </sonar.coverage.jacoco.xmlReportPaths>
+               </sonar.coverage.jacoco.xmlReportPaths>
        </properties>
 
        <build>
-       <plugins>
-               <!-- support sonar in multi-module project -->
-               <plugin>
-                       <groupId>org.sonarsource.scanner.maven</groupId>
-                       <artifactId>sonar-maven-plugin</artifactId>
-                       <version>3.6.0.1398</version>
-               </plugin>
-       </plugins>
+               <plugins>
+                       <!-- support sonar in multi-module project -->
+                       <plugin>
+                               <groupId>org.sonarsource.scanner.maven</groupId>
+                               <artifactId>sonar-maven-plugin</artifactId>
+                               <version>3.6.0.1398</version>
+                       </plugin>
+
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-enforcer-plugin</artifactId>
+                               <version>1.4.1</version>
+                               <executions>
+                                       <execution>
+                                               <id>enforce-no-snapshots</id>
+                                               <goals>
+                                                       <goal>enforce</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <rules>
+                                                               <requireReleaseDeps>
+                                                                       <message>No Snapshots Allowed!</message>
+                                                               </requireReleaseDeps>
+                                                       </rules>
+                                                       <fail>false</fail>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+
+               </plugins>
        </build>
        <dependencyManagement>
-       <dependencies>
-               <dependency>
-                       <groupId>org.springframework.boot</groupId>
-                       <artifactId>spring-boot-starter-parent</artifactId>
-                       <version>2.1.7.RELEASE</version>
-                       <type>pom</type>
-                       <scope>import</scope>
-               </dependency>
-       </dependencies>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.springframework.boot</groupId>
+                               <artifactId>spring-boot-starter-parent</artifactId>
+                               <version>2.1.7.RELEASE</version>
+                               <type>pom</type>
+                               <scope>import</scope>
+                       </dependency>
+               </dependencies>
        </dependencyManagement>
 </project>

diff --git a/mod/runtimeapi/runtime-core/pom.xml b/mod/runtimeapi/runtime-core/pom.xml
index dd5d10b..53c8536 100644 (file)
--- a/mod/runtimeapi/runtime-core/pom.xml
+++ b/mod/runtimeapi/runtime-core/pom.xml
@@ -41,9 +41,9 @@ limitations under the License.
             <version>28.0-jre</version>
         </dependency>
         <dependency>
-            <groupId>org.onap.dcaegen2.platform.cli</groupId>
+            <groupId>org.onap.dcaegen2.platform.mod</groupId>
             <artifactId>blueprint-generator</artifactId>
-            <version>1.0.0</version> 
+            <version>1.3.1-SNAPSHOT</version> 
         </dependency>
        <dependency>
                <groupId>org.json</groupId>

diff --git a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java
similarity index 96%
rename from mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java
rename to mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java
index 2225971..c12b970 100644 (file)
--- a/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnapDublin.java
+++ b/mod/runtimeapi/runtime-core/src/main/java/org/onap/dcae/runtime/core/blueprint_creator/BlueprintCreatorOnap.java
@@ -25,7 +25,7 @@ import org.yaml.snakeyaml.Yaml;
 
 import java.util.Map;
 
-public class BlueprintCreatorOnapDublin implements BlueprintCreator{
+public class BlueprintCreatorOnap implements BlueprintCreator{
 
     private String topicUrl;
     private String importFilePath;
@@ -42,7 +42,7 @@ public class BlueprintCreatorOnapDublin implements BlueprintCreator{
     public String createBlueprint(String componentSpecString) {
         ComponentSpec componentSpec = new ComponentSpec();
         componentSpec.createComponentSpecFromString(componentSpecString);
-        Blueprint blueprint = new Blueprint().createBlueprint(componentSpec,"",'o',importFilePath);
+        Blueprint blueprint = new Blueprint().createBlueprint(componentSpec,"",'o',importFilePath,"");
         return blueprint.blueprintToString();
     }
 

diff --git a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java
index 8412133..25e3e54 100644 (file)
--- a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java
+++ b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestFlowGraphParser.java
@@ -26,7 +26,7 @@ import org.junit.Rule;
 import org.junit.rules.TemporaryFolder;
 import org.junit.Test;
 import static org.junit.Assert.assertEquals;
-import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnapDublin;
+import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnap;
 
 public class TestFlowGraphParser {
 
@@ -47,7 +47,7 @@ public class TestFlowGraphParser {
         }
         FlowGraph<Node, Edge> mainFlowGraph = new FlowGraph<>("1234", "nifi-main", true, "mock graph");
         mainFlowGraph.addNode(new Node("dummy_id", "dummy_name", "dummy_compspec"));
-        BlueprintCreatorOnapDublin bcod = new BlueprintCreatorOnapDublin();
+        BlueprintCreatorOnap bcod = new BlueprintCreatorOnap();
         bcod.setTopicUrl("u.r.l");
         bcod.setImportFilePath(importsfile.getAbsolutePath());
         FlowGraphParser flowGraphParser = new FlowGraphParser(bcod);

diff --git a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java
index 612f9f0..615993a 100644 (file)
--- a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java
+++ b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestIntegeration.java
@@ -21,7 +21,7 @@ import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreator;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
-import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnapDublin;
+import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnap;
 
 public class TestIntegeration {
 
@@ -33,7 +33,7 @@ public class TestIntegeration {
         FlowGraph<Node, Edge> flowGraph = Helper.prepareFlowGraph();
 
         //2. Inject graph in FlowGraphParser
-        BlueprintCreator blueprintCreator = new BlueprintCreatorOnapDublin();
+        BlueprintCreator blueprintCreator = new BlueprintCreatorOnap();
         flowGraphParser = new FlowGraphParser(blueprintCreator);
         flowGraphParser.parse(flowGraph);
     }

diff --git a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java
index f717022..60ba323 100644 (file)
--- a/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java
+++ b/mod/runtimeapi/runtime-core/src/test/java/org/onap/dcae/runtime/core/TestOnapBpGen.java
@@ -29,7 +29,7 @@ public class TestOnapBpGen {
         componentSpec.createComponentSpecFromString(Helper.loadFileContent(
                 "src/test/data/compspecs/componentSpec_hello_world_only_MR.json"));
 
-        Blueprint bp = new Blueprint().createBlueprint(componentSpec,"",'d',"");
+        Blueprint bp = new Blueprint().createBlueprint(componentSpec,"",'d',"","");
         System.out.println(bp.getInputs());
     }
 }

diff --git a/mod/runtimeapi/runtime-web/data/imports/onapDublinImports.yaml b/mod/runtimeapi/runtime-web/data/imports/onapDublinImports.yaml
deleted file mode 100644 (file)
index 9b9a203..0000000
--- a/mod/runtimeapi/runtime-web/data/imports/onapDublinImports.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-imports: ['http://www.getcloudify.org/spec/cloudify/3.4/types.yaml', 'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.5/k8splugin_types.yaml',
-  'https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml']

diff --git a/mod/runtimeapi/runtime-web/data/imports/onapImports.yaml b/mod/runtimeapi/runtime-web/data/imports/onapImports.yaml
new file mode 100644 (file)
index 0000000..1e642ff
--- /dev/null
+++ b/mod/runtimeapi/runtime-web/data/imports/onapImports.yaml
@@ -0,0 +1 @@
+imports: ['https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml','https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml','https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml','https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml','https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml','https://nexus.onap.org/content/repositories/raw/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml']
\ No newline at end of file

diff --git a/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java b/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java
index 8c535c7..11622e6 100644 (file)
--- a/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java
+++ b/mod/runtimeapi/runtime-web/src/main/java/org/onap/dcae/runtime/web/configuration/BlueprintCreatorConfig.java
@@ -18,7 +18,7 @@
 package org.onap.dcae.runtime.web.configuration;
 
 import org.onap.dcae.runtime.core.FlowGraphParser;
-import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnapDublin;
+import org.onap.dcae.runtime.core.blueprint_creator.BlueprintCreatorOnap;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
@@ -43,28 +43,36 @@ public class BlueprintCreatorConfig {
 
     @Autowired
     Environment env;
-
-    @Value("${onapDublin.topicUrl}")
+    
+    @Value("${onap.topicUrl}")
     String onapDublinTopicUrl;
 
-    @Value("${onapDublin.import.cloudifyPlugin}")
+    @Value("${onap.import.cloudifyPlugin}")
     String onapDublinImportCloudifyPlugin;
 
-    @Value("${onapDublin.import.k8sPlugin}")
+    @Value("${onap.import.k8sPlugin}")
     String onapDublinImportK8sPlugin;
 
-    @Value("${onapDublin.import.policyPlugin}")
+    @Value("${onap.import.policyPlugin}")
     String onapDublinImportPolicyPlugin;
 
-    
-    @Profile("onap_dublin")
+    @Value("${onap.import.postgresPlugin}")
+    String onapDublinImportPostgresPlugin;
+
+    @Value("${onap.import.clampPlugin}")
+    String onapDublinImportClampPlugin;
+
+    @Value("${onap.import.dmaapPlugin}")
+    String onapDublinImportDmaapPlugin;
+
+
+    @Profile("onap")
     @Primary
     @Bean
     public FlowGraphParser getFlowGraphParserForOnapDublin(){
-        BlueprintCreatorOnapDublin blueprintCreatorOnapDublin = new BlueprintCreatorOnapDublin();
-        blueprintCreatorOnapDublin.setTopicUrl(onapDublinTopicUrl);
-        blueprintCreatorOnapDublin.setImportFilePath(writeImportsTofile());
-        FlowGraphParser flowGraphParser = new FlowGraphParser(blueprintCreatorOnapDublin);
+        BlueprintCreatorOnap blueprintCreatorOnap = new BlueprintCreatorOnap();
+        blueprintCreatorOnap.setImportFilePath(writeImportsTofile());
+        FlowGraphParser flowGraphParser = new FlowGraphParser(blueprintCreatorOnap);
         return flowGraphParser;
     }
 
@@ -84,17 +92,17 @@ public class BlueprintCreatorConfig {
 
     private Path createDataImportDirAndImportFile() {
         Path importDirPath = Paths.get("./data/imports").toAbsolutePath().normalize();
-        Path onapDublinImportFilePath = Paths.get("./data/imports/onapDublinImports.yaml").toAbsolutePath().normalize();
+        Path onapImportFilePath = Paths.get("./data/imports/onapImports.yaml").toAbsolutePath().normalize();
         try {
             Files.createDirectories(importDirPath);
-            Files.createFile(onapDublinImportFilePath);
+            Files.createFile(onapImportFilePath);
         }
         catch (FileAlreadyExistsException ignored){
         }
         catch (IOException e) {
             e.printStackTrace();
         }
-        return onapDublinImportFilePath;
+        return onapImportFilePath;
     }
 
     private String getContentToWrite() {
@@ -103,6 +111,13 @@ public class BlueprintCreatorConfig {
         importList.add(onapDublinImportCloudifyPlugin);
         importList.add(onapDublinImportK8sPlugin);
         importList.add(onapDublinImportPolicyPlugin);
+
+        importList.add(onapDublinImportPostgresPlugin);
+        importList.add(onapDublinImportClampPlugin);
+        importList.add(onapDublinImportDmaapPlugin);
+                
+    
+   
         result.put("imports",importList);
         return new Yaml().dump(result);
     }

diff --git a/mod/runtimeapi/runtime-web/src/main/resources/application.properties b/mod/runtimeapi/runtime-web/src/main/resources/application.properties
index 0cd7e03..dccce98 100644 (file)
--- a/mod/runtimeapi/runtime-web/src/main/resources/application.properties
+++ b/mod/runtimeapi/runtime-web/src/main/resources/application.properties
@@ -1,17 +1,24 @@
 server.port=9090
 
 #BlueprintGenerator profile
-spring.profiles.active=onap_dublin
+spring.profiles.active=onap
 
 #Dashboard/Inventory configs
-dashboard.url=https://oom-dashboard/ccsdk-app/api-if
+dashboard.url=https://dashboard/ccsdk-app/nb-api
 dashboard.username=
 dashboard.password=
 
 #Onap Dublin BlueprintGenerator configs
-onapDublin.topicUrl=https://url:9999
+onap.topicUrl=https://url:9999
 
-onapDublin.import.cloudifyPlugin=http://www.getcloudify.org/spec/cloudify/3.4/types.yaml
-onapDublin.import.k8sPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/k8splugin/1.4.5/k8splugin_types.yaml
-onapDublin.import.policyPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R4/dcaepolicyplugin/2.3.0/dcaepolicyplugin_types.yaml
+onap.import.cloudifyPlugin=https://www.getcloudify.org/spec/cloudify/4.5.5/types.yaml
 
+onap.import.k8sPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/k8splugin/1.7.2/k8splugin_types.yaml
+
+onap.import.policyPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/dcaepolicyplugin/2.4.0/dcaepolicyplugin_types.yaml
+
+onap.import.postgresPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.ccsdk.platform.plugins/type_files/pgaas/1.1.0/pgaas_types.yaml
+
+onap.import.clampPlugin=https://nexus.onap.org/service/local/repositories/raw/content/org.onap.dcaegen2.platform.plugins/R6/clamppolicyplugin/1.1.0/clamppolicyplugin_types.yaml
+
+onap.import.dmaapPlugin= https://nexus.onap.org/content/repositories/raw/org.onap.ccsdk.platform.plugins/type_files/dmaap/dmaap.yaml
\ No newline at end of file

diff --git a/mod/runtimeapi/runtime-web/src/main/resources/imports/OnapDublinImports.yaml b/mod/runtimeapi/runtime-web/src/main/resources/imports/OnapImports.yaml
similarity index 100%
rename from mod/runtimeapi/runtime-web/src/main/resources/imports/OnapDublinImports.yaml
rename to mod/runtimeapi/runtime-web/src/main/resources/imports/OnapImports.yaml

diff --git a/releases/1.0.0-designtool-container.yaml b/releases/1.0.0-designtool-container.yaml
new file mode 100644 (file)
index 0000000..28974dd
--- /dev/null
+++ b/releases/1.0.0-designtool-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '1.0.0'
+project: 'dcaegen2-platform'
+log_dir: 'dcaegen2-platform-mod-master-designtool-merge-java/2'
+ref: 747ca040f85851b33a2be7abb58426dd25008d2e
+containers:
+  - name: 'org.onap.dcaegen2.platform.mod.designtool-web'
+    version: '1.0.0-SNAPSHOT-20200217T165545Z'

diff --git a/releases/1.0.0-distributorapi-container.yaml b/releases/1.0.0-distributorapi-container.yaml
new file mode 100644 (file)
index 0000000..76870c4
--- /dev/null
+++ b/releases/1.0.0-distributorapi-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '1.0.0'
+project: 'dcaegen2-platform'
+log_dir: 'dcaegen2-platform-mod-distributorapi-docker-merge-master/4'
+ref: 34b776928e1a0fa029d2de13a020873bff8a601f
+containers:
+  - name: 'org.onap.dcaegen2.platform.mod.distributorapi'
+    version: '1.0.0-SNAPSHOT-20200226T234626Z'
\ No newline at end of file

diff --git a/releases/1.0.0-mod-nifi-registry-container.yaml b/releases/1.0.0-mod-nifi-registry-container.yaml
new file mode 100644 (file)
index 0000000..f7a1bfc
--- /dev/null
+++ b/releases/1.0.0-mod-nifi-registry-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '1.0.0'
+project: 'dcaegen2-platform'
+log_dir: 'dcaegen2-platform-mod-master-designtool-merge-java/2'
+ref: 747ca040f85851b33a2be7abb58426dd25008d2e
+containers:
+  - name: 'org.onap.dcaegen2.platform.mod.mod-registry'
+    version: '1.0.0-SNAPSHOT-20200217T165545Z'
\ No newline at end of file

diff --git a/releases/1.0.0-runtimeapi-container.yaml b/releases/1.0.0-runtimeapi-container.yaml
new file mode 100644 (file)
index 0000000..a96424a
--- /dev/null
+++ b/releases/1.0.0-runtimeapi-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '1.0.0'
+project: 'dcaegen2-platform'
+log_dir: 'dcaegen2-platform-mod-master-runtimeapi-merge-java/9'
+ref: 7666d2a36849f88e917d87abec2e177dac500191
+containers:
+  - name: 'org.onap.dcaegen2.platform.mod.runtime-web'
+    version: '1.0.0-20200228T221655Z'
\ No newline at end of file

diff --git a/releases/1.3.0-blueprint-generator.yaml b/releases/1.3.0-blueprint-generator.yaml
new file mode 100644 (file)
index 0000000..eb2c900
--- /dev/null
+++ b/releases/1.3.0-blueprint-generator.yaml
@@ -0,0 +1,4 @@
+distribution_type: 'maven'
+version: '1.3.0'
+project: 'dcaegen2/platform'
+log_dir: 'dcaegen2-platform-mod-bpgenerator-maven-stage-master/1'

diff --git a/releases/2.12.0-onboardingapi-container.yaml b/releases/2.12.0-onboardingapi-container.yaml
new file mode 100644 (file)
index 0000000..35db855
--- /dev/null
+++ b/releases/2.12.0-onboardingapi-container.yaml
@@ -0,0 +1,8 @@
+distribution_type: 'container'
+container_release_tag: '2.12.0'
+project: 'dcaegen2-platform'
+log_dir: 'dcaegen2-platform-mod-onboardingapi-docker-merge-master/4'
+ref: 56c650139f899f1a6d271ed80780a9b576d7ff22
+containers:
+  - name: 'org.onap.dcaegen2.platform.mod.onboardingapi'
+    version: '2.12.0-SNAPSHOT-20200228T144346Z'
\ No newline at end of file