From 1ee4a11393e48d1b98649872a1fc383c46ea7475 Mon Sep 17 00:00:00 2001 From: yangyan Date: Tue, 2 Apr 2019 10:33:55 +0800 Subject: [PATCH] fix assembly issue Change-Id: Ia9926a574fb6802ca8c513e79eb5f7d19ba4bdd5 Issue-ID: VFC-1325 Signed-off-by: yangyan --- assembly.xml | 10 +- docker/instance_init.sh | 1 - resources/bin/initDB.sh | 4 - .../dbscripts/mysql/vfc-nfvo-lcm-createobj.sql | 320 --------------------- 4 files changed, 9 insertions(+), 326 deletions(-) delete mode 100644 resources/dbscripts/mysql/vfc-nfvo-lcm-createobj.sql diff --git a/assembly.xml b/assembly.xml index f7ad868d..c0e0ef3f 100644 --- a/assembly.xml +++ b/assembly.xml @@ -32,7 +32,7 @@ **/*.xsd **/*.bpel **/*.yml - **/*.sh + **/*.sh @@ -42,6 +42,14 @@ *.txt + + resources + /resources + + **/*.sh + **/*.sql + + docker /docker diff --git a/docker/instance_init.sh b/docker/instance_init.sh index 90778a4b..70e83016 100755 --- a/docker/instance_init.sh +++ b/docker/instance_init.sh @@ -1,6 +1,5 @@ #/bin/bash -pip install PyMySQL==0.9.3 mkdir -p /service/vfc/nfvo/lcm/resources/bin/logs mkdir -p /var/log/onap/vfc/nslcm/ diff --git a/resources/bin/initDB.sh b/resources/bin/initDB.sh index 13c0f2ca..01bb1561 100644 --- a/resources/bin/initDB.sh +++ b/resources/bin/initDB.sh @@ -15,10 +15,6 @@ # limitations under the License. # -###### -#test for vfc-db -###### - DIRNAME=`dirname $0` HOME=`cd $DIRNAME/; pwd` MYSQL_USER=$1 diff --git a/resources/dbscripts/mysql/vfc-nfvo-lcm-createobj.sql b/resources/dbscripts/mysql/vfc-nfvo-lcm-createobj.sql deleted file mode 100644 index c2447766..00000000 --- a/resources/dbscripts/mysql/vfc-nfvo-lcm-createobj.sql +++ /dev/null @@ -1,320 +0,0 @@ --- --- Copyright 2018 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 vfcnfvolcm; - -DROP TABLE IF EXISTS NFVO_CPINST; -CREATE TABLE NFVO_CPINST ( - `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 -); - -DROP TABLE IF EXISTS NFVO_FPINST; -CREATE TABLE NFVO_FPINST ( - `FPID` varchar(255) NOT NULL, - `FPINSTID` varchar(255) NOT NULL PRIMARY KEY, - `FPNAME` varchar(255) NOT NULL, - `NSINSTID` varchar(255) NOT NULL, - `VNFFGINSTID` varchar(255) NOT NULL, - `SYMMETRIC` integer NULL, - `POLICYINFO` longtext NOT NULL, - `FORWORDERPATHS` varchar(255) NULL, - `STATUS` varchar(255) NOT NULL, - `SDNCONTROLLERID` varchar(255) NOT NULL, - `SFCID` varchar(255) NOT NULL, - `FLOWCLASSIFIERS` varchar(255) NOT NULL, - `PORTPAIRGROUPS` longtext NOT NULL -); - -DROP TABLE IF EXISTS NFVO_JOB; -CREATE TABLE NFVO_JOB ( - `JOBID` varchar(255) NOT NULL PRIMARY KEY, - `JOBTYPE` varchar (255) NOT NULL, - `JOBACTION` varchar(255) NOT NULL, - `RESID` varchar(255) NOT NULL, - `STATUS` integer NULL, - `STARTTIME` varchar(255) NULL, - `ENDTIME` varchar(255) NULL, - `PROGRESS` integer NULL, - `USER` varchar(255) NULL, - `PARENTJOBID` varchar(255) NULL, - `RESNAME` varchar(255) NULL -); - -DROP TABLE IF EXISTS NFVO_JOB_STATUS; -CREATE TABLE NFVO_JOB_STATUS ( - `id` integer AUTO_INCREMENT NOT NULL PRIMARY KEY, - `INDEXID` integer NOT NULL, - `JOBID` varchar(255) NOT NULL, - `STATUS` varchar(255) NOT NULL, - `PROGRESS` integer NULL, - `DESCP` longtext NOT NULL, - `ERRCODE` varchar(255) NULL, - `ADDTIME` varchar(255) NULL -); - -DROP TABLE IF EXISTS NFVO_NFINST; -CREATE TABLE NFVO_NFINST ( - `NFINSTID` varchar(200) NOT NULL PRIMARY KEY, - `M_NFINSTID` varchar(200) NULL, - `NFNAME` varchar(100) NULL, - `TEMPLATEID` varchar(200) NULL, - `VNFID` varchar(200) NULL, - `PACKAGEID` varchar(200) NULL, - `VNFMINSTID` varchar(200) NULL, - `NSINSTID` varchar(200) NULL, - `STATUS` varchar(20) NULL, - `FLAVOURID` varchar(200) NULL, - `VNFLEVEL` varchar(200) NULL, - `LOCATION` varchar(200) NULL, - `MAXVM` integer NULL, - `MAXCPU` integer NULL, - `MAXRAM` integer NULL, - `MAXHD` integer NULL, - `MAXSHD` integer NULL, - `MAXNET` integer NULL, - `VERSION` varchar(255) NULL, - `VENDOR` varchar(255) NULL, - `VNFDMODEL` longtext NULL, - `INPUTPARAMS` longtext NULL, - `SCALEPARAMS` longtext NULL, - `CREATETIME` varchar(200) NULL, - `LASTUPTIME` varchar(200) NULL, - `EXTENSION` longtext NULL -); - -DROP TABLE IF EXISTS NFVO_NFPACKAGE; -CREATE TABLE NFVO_NFPACKAGE ( - `UUID` varchar(255) NOT NULL PRIMARY KEY, - `NFPACKAGEID` varchar(200) NOT NULL, - `VNFDID` varchar(255) NOT NULL, - `VENDOR` varchar(255) NOT NULL, - `VNFDVERSION` varchar(255) NOT NULL, - `VNFVERSION` varchar(255) NOT NULL, - `VNFDMODEL` longtext NULL, - `VNFDPATH` varchar(300) NULL -); - -DROP TABLE IF EXISTS NFVO_NSPACKAGE; -CREATE TABLE NFVO_NSPACKAGE ( - `ID` varchar(200) NOT NULL PRIMARY KEY, - `NSDID` varchar(200) NOT NULL, - `NAME` varchar(200) NOT NULL, - `VENDOR` varchar(200) NULL, - `DESCRIPTION` varchar(200) NULL, - `VERSION` varchar(200) NULL, - `NSDMODEL` longtext NULL, - `NSDPATH` varchar(300) NULL -); - -DROP TABLE IF EXISTS NFVO_NSINST; -CREATE TABLE NFVO_NSINST ( - `ID` varchar(200) NOT NULL PRIMARY KEY, - `NAME` varchar(200) NOT NULL, - `NSPACKAGEID` varchar(200) NULL, - `NSDID` varchar(200) NOT NULL, - `NSDINVARIANTID` varchar(200) NOT NULL, - `DESCRIPTION` varchar(255) NULL, - `SDNCONTROLLERID` varchar(200) NULL, - `FLAVOURID` varchar(200) NULL, - `NSLEVEL` varchar(200) NULL, - `STATUS` varchar(200) NULL, - `NSDMODEL` longtext NULL, - `INPUTPARAMS` longtext NULL, - `SCALEPARAMS` longtext NULL, - `CREATETIME` varchar(200) NULL, - `LASTUPTIME` varchar(200) NULL, - `GLOBALCUSTOMERID` varchar(50) NULL, - `SERVICETYPE` varchar(50) NULL -); - -DROP TABLE IF EXISTS NFVO_PORTINST; -CREATE TABLE NFVO_PORTINST ( - `PORTID` varchar(255) NOT NULL PRIMARY KEY, - `NETWORKID` varchar(255) NOT NULL, - `SUBNETWORKID` varchar(255) NOT NULL, - `VIMID` varchar(255) NOT NULL, - `RESOURCEID` varchar(255) NOT NULL, - `NAME` varchar(255) NOT NULL, - `INSTID` varchar(255) NOT NULL, - `CPINSTANCEID` varchar(255) NOT NULL, - `BANDWIDTH` varchar(255) NOT NULL, - `OPERATIONALSTATE` varchar(255) NOT NULL, - `IPADDRESS` varchar(255) NOT NULL, - `MACADDRESS` varchar(255) NOT NULL, - `FLOATIPADDRESS` varchar(255) NOT NULL, - `SERVICEIPADDRESS` varchar(255) NOT NULL, - `TYPEVIRTUALNIC` varchar(255) NOT NULL, - `SFCENCAPSULATION` varchar(255) NOT NULL, - `DIRECTION` varchar (255) NOT NULL, - `TENANT` varchar(255) NOT NULL -); - -DROP TABLE IF EXISTS NFVO_VLINST; -CREATE TABLE NFVO_VLINST ( - `VLINSTANCEID` varchar(255) NOT NULL PRIMARY KEY, - `VLDID` varchar(255) NOT NULL, - `VLINSTANCENAME` varchar(255) NULL, - `OWNERTYPE` integer NOT NULL, - `OWNERID` varchar(255) NOT NULL, - `RELATEDNETWORKID` varchar(255) NULL, - `RELATEDSUBNETWORKID` varchar(255) NULL, - `VLTYPE` integer NOT NULL, - `VIMID` varchar(255) NOT NULL, - `TENANT` varchar(255) NOT NULL, - `STATUS` varchar(255) NOT NULL -); - -DROP TABLE IF EXISTS NFVO_VMINST; -CREATE TABLE NFVO_VMINST ( - `VMID` varchar(255) NOT NULL PRIMARY KEY, - `VIMID` varchar (255) NOT NULL, - `RESOURCEID` varchar(255) NOT NULL, - `INSTTYPE` integer NULL, - `INSTID` varchar(255) NULL, - `VMNAME` varchar(255) NOT NULL, - `OPERATIONALSTATE` integer NOT NULL, - `ZONEID` varchar(255) NULL, - `TENANT` varchar(255) NULL, - `HOSTID` varchar(255) NOT NULL, - `DETAILINFO` varchar(255) NULL -); - -DROP TABLE IF EXISTS NFVO_VNFCINST; -CREATE TABLE NFVO_VNFCINST ( - `VNFCINSTANCEID` varchar(255) NOT NULL PRIMARY KEY, - `VDUID` varchar(255) NOT NULL, - `NFINSTID` varchar(255) NOT NULL, - `VMID` varchar(255) NOT NULL, - `STATUS` varchar(255) NOT NULL -); - -DROP TABLE IF EXISTS NFVO_VNFFGINST; -CREATE TABLE NFVO_VNFFGINST ( - `VNFFGDID` varchar(255) NOT NULL, - `VNFFGINSTID` varchar(255) NOT NULL PRIMARY KEY, - `NSINSTID` varchar(255) NOT NULL, - `DESC` varchar(255) NULL, - `VENDOR` varchar(255) NULL, - `VERSION` varchar(255) NULL, - `ENDPOINTNUMBER` integer NOT NULL, - `VLLIST` varchar(1024) NOT NULL, - `CPLIST` varchar(1024) NOT NULL, - `VNFLIST` varchar(1024) NOT NULL, - `FPLIST` varchar(1024) NOT NULL, - `STATUS` varchar(255) NOT NULL -); - -DROP TABLE IF EXISTS NFVO_NFPACKAGEFILE; -CREATE TABLE NFVO_NFPACKAGEFILE ( - `ID` integer AUTO_INCREMENT NOT NULL PRIMARY KEY, - `NFPACKAGEID` varchar(50) NOT NULL, - `FILENAME` varchar(100) NOT NULL, - `FILETYPE` varchar(2) NOT NULL, - `IMAGEID` varchar(50) NOT NULL, - `VIMID` varchar(50) NOT NULL, - `VIMUSER` varchar(50) NOT NULL, - `TENANT` varchar(50) NOT NULL, - `PURPOSE` varchar(1000) NOT NULL, - `STATUS` varchar(10) NOT NULL -); - -SET FOREIGN_KEY_CHECKS = 0; -DROP TABLE IF EXISTS t_lcm_servicebaseinfo; -SET FOREIGN_KEY_CHECKS = 1; -CREATE TABLE t_lcm_servicebaseinfo ( - serviceId VARCHAR(255) NOT NULL, - serviceName VARCHAR(255) NOT NULL, - serviceType VARCHAR(20) NOT NULL, - description VARCHAR(255) NULL, - activeStatus VARCHAR(20) NOT NULL, - status VARCHAR(20) NOT NULL, - creator VARCHAR(50) NOT NULL, - createTime BIGINT NOT NULL, - CONSTRAINT t_lcm_servicebaseinfo PRIMARY KEY(serviceId) -); -DROP TABLE IF EXISTS t_lcm_defPackage_mapping; -CREATE TABLE t_lcm_defPackage_mapping ( - serviceId VARCHAR(255) NOT NULL, - serviceDefId VARCHAR(255) NOT NULL, - templateId VARCHAR(255) NOT NULL, - templateName VARCHAR(255) NOT NULL, - CONSTRAINT t_lcm_defPackage_mapping PRIMARY KEY(serviceId), - CONSTRAINT t_lcm_defPackage_mapping FOREIGN KEY (serviceId) REFERENCES t_lcm_servicebaseinfo (serviceId) -); -DROP TABLE IF EXISTS t_lcm_inputParam_mapping; -CREATE TABLE t_lcm_inputParam_mapping ( - serviceId VARCHAR(255) NOT NULL, - inputKey VARCHAR(255) NOT NULL, - inputValue mediumtext NULL, - CONSTRAINT t_lcm_inputParam_mapping PRIMARY KEY(serviceId,inputKey), - CONSTRAINT t_lcm_inputParam_mapping FOREIGN KEY (serviceId) REFERENCES t_lcm_servicebaseinfo (serviceId) -); - -DROP TABLE IF EXISTS NFVO_WF_PLAN; -CREATE TABLE NFVO_WF_PLAN ( - `DEPLOYEDID` varchar(255) NOT NULL PRIMARY KEY, - `PROCESSID` varchar(255) NOT NULL, - `STATUS` varchar(255) NOT NULL, - `MESSAGE` varchar(1024) NULL, - `PLANNAME` varchar(255) NOT NULL -); - -DROP TABLE IF EXISTS NFVO_OOF_DATA; -CREATE TABLE NFVO_OOF_DATA ( - `REQUESTID` varchar(255) NOT NULL, - `TRANSACTIONID` varchar(255) NOT NULL, - `REQUESTSTATUS` varchar(50) NOT NULL, - `RESOURCEMODULENAME` varchar(100) NOT NULL, - `SERVICERESOURCEID` varchar(255) NOT NULL, - `VIMID` varchar(255) NULL, - `CLOUDOWNER` varchar(100) NULL, - `CLOUDREGIONID` varchar(255) NULL, - `VDUINFO` longtext NULL, - CONSTRAINT ID PRIMARY KEY(REQUESTID,TRANSACTIONID) -); - -DROP TABLE IF EXISTS NFVO_PNFINST; -CREATE TABLE NFVO_PNFINST ( - `PNFID` varchar(255) NOT NULL PRIMARY KEY, - `PNFNAME` varchar(255) NOT NULL, - `PNFDID` varchar(50) NOT NULL, - `PNFDINFOID` varchar(100) NOT NULL, - `PNFPROFILEID` varchar(255) NOT NULL, - `CPINFO` longtext NOT NULL, - `EMSID` varchar(255) NOT NULL, - `NSINSTANCES` varchar(1000) NOT NULL -); - -DROP TABLE IF EXISTS NFVO_SUBSCRIPTION; -CREATE TABLE `NFVO_SUBSCRIPTION` ( - `SUBSCRIPTIONID` varchar(200) NOT NULL PRIMARY KEY, - `CALLBACKURI` longtext NOT NULL, - `AUTHINFO` longtext, - `NOTIFICATIONTYPES` varchar(255), - `OPERATIONTYPES` longtext, - `OPERATIONSTATES` longtext, - `VNFINSTANCEFILTER` longtext, - `LINKS` longtext NOT NULL -); -- 2.16.6