From 451a78b101dc70fefc792561bdfef1839958dab0 Mon Sep 17 00:00:00 2001
From: fengyuanxing <feng.yuanxing@zte.com.cn>
Date: Wed, 8 Feb 2017 15:22:53 +0800
Subject: [PATCH] add assembly pom xml

Change-Id: I2f619ea148d8d5065f869a80ae4e6e98ca303648
Issue-Id: GVNFM-26
Signed-off-by: fengyuanxing <feng.yuanxing@zte.com.cn>
---
 res/assembly.xml                                   |  8 +++---
 .../mysql/openo-gvnfm-vnfres-createdb.sql          | 32 ++++++++++++++++++++++
 .../mysql/openo-gvnfm-vnfres-createobj.sql         | 32 ++++++++++++++++++++++
 res/pom.xml                                        | 13 +++++----
 4 files changed, 75 insertions(+), 10 deletions(-)
 create mode 100644 res/assembly/dbscripts/mysql/openo-gvnfm-vnfres-createdb.sql
 create mode 100644 res/assembly/dbscripts/mysql/openo-gvnfm-vnfres-createobj.sql

diff --git a/res/assembly.xml b/res/assembly.xml
index 08fffa0..e0338f4 100644
--- a/res/assembly.xml
+++ b/res/assembly.xml
@@ -16,14 +16,14 @@
 <assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0" 
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0 http://maven.apache.org/xsd/assembly-1.1.0.xsd">
-    <id>lcm</id>
+    <id>res</id>
     <formats>
         <format>zip</format>
     </formats>
     <fileSets>
         <fileSet>
-            <directory>lcm</directory>
-            <outputDirectory>/lcm</outputDirectory>
+            <directory>res</directory>
+            <outputDirectory>/res</outputDirectory>
             <includes>
                 <include>**/*.py</include>
             </includes>
@@ -47,5 +47,5 @@
             </includes>
         </fileSet>
     </fileSets>
-    <baseDirectory>gvnfm/lcm</baseDirectory>
+    <baseDirectory>gvnfm-vnfres/res</baseDirectory>
 </assembly>
diff --git a/res/assembly/dbscripts/mysql/openo-gvnfm-vnfres-createdb.sql b/res/assembly/dbscripts/mysql/openo-gvnfm-vnfres-createdb.sql
new file mode 100644
index 0000000..32d2450
--- /dev/null
+++ b/res/assembly/dbscripts/mysql/openo-gvnfm-vnfres-createdb.sql
@@ -0,0 +1,32 @@
+--
+-- Copyright 2017 ZTE Corporation.
+--
+-- 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.
+--
+
+
+/******************drop old database and user***************************/
+use mysql;
+drop database IF  EXISTS gvnfm;
+delete from user where User='gvnfm';
+FLUSH PRIVILEGES;
+
+/******************create new database and user***************************/
+create database gvnfm CHARACTER SET utf8;
+
+GRANT ALL PRIVILEGES ON gvnfm.* TO 'gvnfm'@'%' IDENTIFIED BY 'gvnfm' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON mysql.* TO 'gvnfm'@'%' IDENTIFIED BY 'gvnfm' WITH GRANT OPTION;
+
+GRANT ALL PRIVILEGES ON gvnfm.* TO 'gvnfm'@'localhost' IDENTIFIED BY 'gvnfm' WITH GRANT OPTION;
+GRANT ALL PRIVILEGES ON mysql.* TO 'gvnfm'@'localhost' IDENTIFIED BY 'gvnfm' WITH GRANT OPTION;
+FLUSH PRIVILEGES; 
\ No newline at end of file
diff --git a/res/assembly/dbscripts/mysql/openo-gvnfm-vnfres-createobj.sql b/res/assembly/dbscripts/mysql/openo-gvnfm-vnfres-createobj.sql
new file mode 100644
index 0000000..3e59143
--- /dev/null
+++ b/res/assembly/dbscripts/mysql/openo-gvnfm-vnfres-createobj.sql
@@ -0,0 +1,32 @@
+--
+-- Copyright 2017 ZTE Corporation.
+--
+-- 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.
+--
+
+use gvnfm;
+
+DROP TABLE IF EXISTS GVNFM_INST;
+CREATE TABLE GVNFM_INST ( 
+  `CPINSTANCEID` varchar(255) NOT NULL PRIMARY KEY, 
+  `CPDID` varchar(255) NOT NULL, 
+  `CPINSTANCENAME` varchar(255) NOT NULL, 
+  `OWNERTYPE` integer NOT NULL, 
+  `OWNERID` varchar(255) NOT NULL, 
+  `RELATEDTYPE` integer NOT NULL, 
+  `RELATEDVL` varchar(255) NULL, 
+  `RELATEDCP` varchar(255) NULL, 
+  `RELATEDPORT` varchar(255) NULL, 
+  `STATUS` varchar(255) NOT NULL 
+);
+ 
\ No newline at end of file
diff --git a/res/pom.xml b/res/pom.xml
index 56041dc..9ec2aad 100644
--- a/res/pom.xml
+++ b/res/pom.xml
@@ -15,17 +15,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.vnfres</groupId>
+    <artifactId>gvnfm-vnfres</artifactId>
     <version>1.1.0-SNAPSHOT</version>
     <packaging>pom</packaging>
-    <name>gvnfm-lcm</name>
-    <description>gvnfm lcm</description>
+    <name>gvnfm-vnfres</name>
+    <description>gvnfm vnfres</description>
     <build>
       <plugins>
         <plugin>
-- 
2.16.6