Merge "Raise an error when PNF in service model but not in userParams"

diff --git a/pom.xml b/pom.xml
index 0cefebb..90e347b 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" ?>
-<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">
+<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>
   <parent>
     <groupId>org.onap.oparent</groupId>
@@ -35,6 +36,7 @@
     <module>cxf-logging</module>
     <module>so-monitoring</module>
     <module>so-simulator</module>
+    <module>so-etsi-nfvo</module>
     <module>packages</module>
   </modules>
   <properties>

diff --git a/so-etsi-nfvo/pom.xml b/so-etsi-nfvo/pom.xml
new file mode 100644 (file)
index 0000000..e7d9840
--- /dev/null
+++ b/so-etsi-nfvo/pom.xml
@@ -0,0 +1,16 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so</groupId>
+    <artifactId>so</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <groupId>org.onap.so.etsi.nfvo</groupId>
+  <artifactId>so-etsi-nfvo</artifactId>
+  <packaging>pom</packaging>
+  <name>SO ETSI NFVO</name>
+  <modules>
+    <module>so-etsi-nfvo-ns-lcm</module>
+  </modules>
+</project>
\ No newline at end of file

diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/pom.xml b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/pom.xml
new file mode 100644 (file)
index 0000000..d723be9
--- /dev/null
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/pom.xml
@@ -0,0 +1,19 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.etsi.nfvo</groupId>
+    <artifactId>so-etsi-nfvo</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>so-etsi-nfvo-ns-lcm</artifactId>
+  <packaging>pom</packaging>
+  <name>SO ETSI NFVO NS LCM Manager</name>
+  <modules>
+    <module>so-etsi-nfvo-ns-lcm-api</module>
+    <module>so-etsi-nfvo-ns-lcm-database-service</module>
+    <module>so-etsi-nfvo-ns-lcm-bpmn-flows</module>
+    <module>so-etsi-nfvo-ns-lcm-service</module>
+    <module>so-etsi-nfvo-ns-lcm-application</module>
+  </modules>
+</project>
\ No newline at end of file

diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-api/pom.xml b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-api/pom.xml
new file mode 100644 (file)
index 0000000..1a5f5cb
--- /dev/null
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-api/pom.xml
@@ -0,0 +1,11 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.etsi.nfvo</groupId>
+    <artifactId>so-etsi-nfvo-ns-lcm</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>so-etsi-nfvo-ns-lcm-api</artifactId>
+  <name>SO ETSI NFVO NS LCM Manager Api</name>
+</project>
\ No newline at end of file

diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-application/pom.xml b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-application/pom.xml
new file mode 100644 (file)
index 0000000..cf6a3f8
--- /dev/null
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-application/pom.xml
@@ -0,0 +1,11 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.etsi.nfvo</groupId>
+    <artifactId>so-etsi-nfvo-ns-lcm</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>so-etsi-nfvo-ns-lcm-application</artifactId>
+  <name>SO ETSI NFVO NS LCM Application</name>
+</project>
\ No newline at end of file

diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/pom.xml b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/pom.xml
new file mode 100644 (file)
index 0000000..734d4e0
--- /dev/null
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-bpmn-flows/pom.xml
@@ -0,0 +1,11 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.etsi.nfvo</groupId>
+    <artifactId>so-etsi-nfvo-ns-lcm</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>so-etsi-nfvo-ns-lcm-bpmn-flows</artifactId>
+  <name>SO ETSI NFVO NS LCM BPMN Flows</name>
+</project>
\ No newline at end of file

diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/pom.xml b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/pom.xml
new file mode 100644 (file)
index 0000000..8e1fba4
--- /dev/null
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-database-service/pom.xml
@@ -0,0 +1,11 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.etsi.nfvo</groupId>
+    <artifactId>so-etsi-nfvo-ns-lcm</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>so-etsi-nfvo-ns-lcm-database-service</artifactId>
+  <name>SO ETSI NFVO NS LCM Database Service</name>
+</project>
\ No newline at end of file

diff --git a/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-service/pom.xml b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-service/pom.xml
new file mode 100644 (file)
index 0000000..cde0ca7
--- /dev/null
+++ b/so-etsi-nfvo/so-etsi-nfvo-ns-lcm/so-etsi-nfvo-ns-lcm-service/pom.xml
@@ -0,0 +1,11 @@
+<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 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.onap.so.etsi.nfvo</groupId>
+    <artifactId>so-etsi-nfvo-ns-lcm</artifactId>
+    <version>1.7.1-SNAPSHOT</version>
+  </parent>
+  <artifactId>so-etsi-nfvo-ns-lcm-service</artifactId>
+  <name>SO ETSI NFVO NS LCM Service</name>
+</project>
\ No newline at end of file