Merge "Add instantiation state check"

diff --git a/lcm/assembly.xml b/lcm/assembly.xml
index 08fffa0..b195400 100644 (file)
--- a/lcm/assembly.xml
+++ b/lcm/assembly.xml
@@ -47,5 +47,5 @@
             </includes>
         </fileSet>
     </fileSets>
-    <baseDirectory>gvnfm/lcm</baseDirectory>
+    <baseDirectory>gvnfm-vnflcm/lcm</baseDirectory>
 </assembly>

diff --git a/lcm/pom.xml b/lcm/pom.xml
index 56041dc..2f4f74b 100644 (file)
--- a/lcm/pom.xml
+++ b/lcm/pom.xml
@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <!--
     Copyright 2017 ZTE Corporation.
 
@@ -15,17 +16,18 @@
 -->
 <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">
     <parent>
-        <groupId>org.openo.gvnfm</groupId>
-        <artifactId>nfvo-root</artifactId>
+        <groupId>org.openo.oparent</groupId>
+        <artifactId>oparent</artifactId>
         <version>1.1.0-SNAPSHOT</version>
+        <relativePath>../oparent</relativePath>
     </parent>
     <modelVersion>4.0.0</modelVersion>
-    <groupId>org.openo.gvnfm</groupId>
-    <artifactId>gvnfm-lcm</artifactId>
+    <groupId>org.openo.gvnfm.vnflcm</groupId>
+    <artifactId>gvnfm-vnflcm</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>gvnfm-lcm</name>
-    <description>gvnfm lcm</description>
+    <name>gvnfm-vnflcm/lcm</name>
+    <description>gvnfm vnflcm</description>
     <build>
       <plugins>
         <plugin>