aboutsummaryrefslogtreecommitdiffstats
path: root/adapters
diff options
context:
space:
mode:
Diffstat (limited to 'adapters')
-rw-r--r--adapters/mso-adapter-utils/pom.xml2
-rw-r--r--adapters/mso-adapters-rest-interface/pom.xml2
-rw-r--r--adapters/mso-catalog-db-adapter/pom.xml2
-rw-r--r--adapters/mso-network-adapter-async-client/pom.xml2
-rw-r--r--adapters/mso-network-adapter/pom.xml2
-rw-r--r--adapters/mso-requests-db-adapter/pom.xml2
-rw-r--r--adapters/mso-sdnc-adapter/pom.xml2
-rw-r--r--adapters/mso-tenant-adapter/pom.xml2
-rw-r--r--adapters/mso-vfc-adapter/pom.xml2
-rw-r--r--adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java2
-rw-r--r--adapters/mso-vnf-adapter-async-client/pom.xml2
-rw-r--r--adapters/mso-vnf-adapter/pom.xml2
-rw-r--r--adapters/mso-workflow-message-adapter/WebContent/WEB-INF/web.xml6
-rw-r--r--adapters/mso-workflow-message-adapter/pom.xml2
-rw-r--r--adapters/pom.xml2
15 files changed, 19 insertions, 15 deletions
diff --git a/adapters/mso-adapter-utils/pom.xml b/adapters/mso-adapter-utils/pom.xml
index 90d1bbd680..176db7255b 100644
--- a/adapters/mso-adapter-utils/pom.xml
+++ b/adapters/mso-adapter-utils/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-adapter-utils</artifactId>
diff --git a/adapters/mso-adapters-rest-interface/pom.xml b/adapters/mso-adapters-rest-interface/pom.xml
index c8f3a8b01a..319f44dc28 100644
--- a/adapters/mso-adapters-rest-interface/pom.xml
+++ b/adapters/mso-adapters-rest-interface/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-adapters-rest-interface</artifactId>
diff --git a/adapters/mso-catalog-db-adapter/pom.xml b/adapters/mso-catalog-db-adapter/pom.xml
index 752d7f66fa..8c29815eb8 100644
--- a/adapters/mso-catalog-db-adapter/pom.xml
+++ b/adapters/mso-catalog-db-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
diff --git a/adapters/mso-network-adapter-async-client/pom.xml b/adapters/mso-network-adapter-async-client/pom.xml
index 6e0c9bf702..fe0b92262c 100644
--- a/adapters/mso-network-adapter-async-client/pom.xml
+++ b/adapters/mso-network-adapter-async-client/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-network-adapter-async-client</artifactId>
diff --git a/adapters/mso-network-adapter/pom.xml b/adapters/mso-network-adapter/pom.xml
index 94e5759ee3..8cbb7c68c3 100644
--- a/adapters/mso-network-adapter/pom.xml
+++ b/adapters/mso-network-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-network-adapter</artifactId>
diff --git a/adapters/mso-requests-db-adapter/pom.xml b/adapters/mso-requests-db-adapter/pom.xml
index c3ed987cab..db7f1d46bb 100644
--- a/adapters/mso-requests-db-adapter/pom.xml
+++ b/adapters/mso-requests-db-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
diff --git a/adapters/mso-sdnc-adapter/pom.xml b/adapters/mso-sdnc-adapter/pom.xml
index 7c1ba1a47f..41d7d8bfa1 100644
--- a/adapters/mso-sdnc-adapter/pom.xml
+++ b/adapters/mso-sdnc-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-sdnc-adapter</artifactId>
diff --git a/adapters/mso-tenant-adapter/pom.xml b/adapters/mso-tenant-adapter/pom.xml
index 3ceb853f27..58ca7b1a3a 100644
--- a/adapters/mso-tenant-adapter/pom.xml
+++ b/adapters/mso-tenant-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-tenant-adapter</artifactId>
diff --git a/adapters/mso-vfc-adapter/pom.xml b/adapters/mso-vfc-adapter/pom.xml
index b5e3780cd9..1c14f12f7d 100644
--- a/adapters/mso-vfc-adapter/pom.xml
+++ b/adapters/mso-vfc-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-vfc-adapter</artifactId>
diff --git a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
index 8d820bcf01..2c2143c32e 100644
--- a/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
+++ b/adapters/mso-vfc-adapter/src/main/java/org/openecomp/mso/adapters/vfc/VfcManager.java
@@ -365,7 +365,7 @@ public class VfcManager {
nsOperInfo.setErrorCode(String.valueOf(rsp.getStatus()));
- if(RequestsDbConstant.OperationType.CREATE.equals(nsOperInfo.getOperType())) {
+ if(RequestsDbConstant.OperationType.CREATE.equalsIgnoreCase(nsOperInfo.getOperType())) {
nsOperInfo.setStatus(RequestsDbConstant.Status.FINISHED);
}
(RequestsDatabase.getInstance()).updateResOperStatus(nsOperInfo);
diff --git a/adapters/mso-vnf-adapter-async-client/pom.xml b/adapters/mso-vnf-adapter-async-client/pom.xml
index c42c002dc1..344f981bc9 100644
--- a/adapters/mso-vnf-adapter-async-client/pom.xml
+++ b/adapters/mso-vnf-adapter-async-client/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-vnf-adapter-async-client</artifactId>
diff --git a/adapters/mso-vnf-adapter/pom.xml b/adapters/mso-vnf-adapter/pom.xml
index 9c5d74cb81..d5a31b3cbf 100644
--- a/adapters/mso-vnf-adapter/pom.xml
+++ b/adapters/mso-vnf-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-vnf-adapter</artifactId>
diff --git a/adapters/mso-workflow-message-adapter/WebContent/WEB-INF/web.xml b/adapters/mso-workflow-message-adapter/WebContent/WEB-INF/web.xml
index e920281508..18df807b85 100644
--- a/adapters/mso-workflow-message-adapter/WebContent/WEB-INF/web.xml
+++ b/adapters/mso-workflow-message-adapter/WebContent/WEB-INF/web.xml
@@ -14,7 +14,11 @@
</context-param>
<context-param>
<param-name>mso.configuration</param-name>
- <param-value>MSO_PROP_WORKFLOW_MESSAGE_ADAPTER=mso.workflow-message-adapter.properties,MSO_PROP_TOPOLOGY=topology.properties,MSO_PROP_AAF=cadi.properties</param-value>
+ <param-value>MSO_PROP_WORKFLOW_MESSAGE_ADAPTER=mso.workflow-message-adapter.properties,MSO_PROP_TOPOLOGY=topology.properties</param-value>
+ </context-param>
+ <context-param>
+ <param-name>mso.cloud_config.configuration</param-name>
+ <param-value>cloud_config.json=2</param-value>
</context-param>
<context-param>
<param-name>resteasy.resources</param-name>
diff --git a/adapters/mso-workflow-message-adapter/pom.xml b/adapters/mso-workflow-message-adapter/pom.xml
index 82d23093b3..3124d7c545 100644
--- a/adapters/mso-workflow-message-adapter/pom.xml
+++ b/adapters/mso-workflow-message-adapter/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>adapters</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so.adapters</groupId>
<artifactId>mso-workflow-message-adapter</artifactId>
diff --git a/adapters/pom.xml b/adapters/pom.xml
index 111db29137..75790aafe2 100644
--- a/adapters/pom.xml
+++ b/adapters/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>org.openecomp.so</groupId>
<artifactId>so</artifactId>
- <version>1.1.0-SNAPSHOT</version>
+ <version>1.1.1-SNAPSHOT</version>
</parent>
<groupId>org.openecomp.so</groupId>