From d0e890900ce40e6789b0c578a662cce5d10a9293 Mon Sep 17 00:00:00 2001 From: yangyan Date: Tue, 2 Apr 2019 10:42:56 +0800 Subject: [PATCH] fix assembly issue Change-Id: Iea2683d4eed51d4f7a6f98546f55ea54dba79a58 Issue-ID: VFC-1325 Signed-off-by: yangyan --- assembly.xml | 10 ++++- docker/instance_init.sh | 1 - requirements.txt | 2 +- resources/bin/initDB.sh | 5 --- .../dbscripts/mysql/vfc-nfvo-catalog-createobj.sql | 49 ---------------------- 5 files changed, 10 insertions(+), 57 deletions(-) delete mode 100644 resources/dbscripts/mysql/vfc-nfvo-catalog-createobj.sql diff --git a/assembly.xml b/assembly.xml index b243a82a..ba8b4937 100644 --- a/assembly.xml +++ b/assembly.xml @@ -29,7 +29,7 @@ **/*.json **/*.xml **/*.yml - **/*.sh + **/*.sh @@ -39,6 +39,14 @@ *.txt + + resources + /resources + + **/*.sh + **/*.sql + + docker /docker diff --git a/docker/instance_init.sh b/docker/instance_init.sh index 534be75a..64b8e864 100755 --- a/docker/instance_init.sh +++ b/docker/instance_init.sh @@ -1,6 +1,5 @@ #!/bin/bash -pip install PyMySQL==0.9.3 if [ ! -f /var/log/onap/vfc/catalog/runtime_catalog.log ]; then mkdir -p /var/log/onap/vfc/catalog touch /var/log/onap/vfc/catalog/runtime_catalog.log diff --git a/requirements.txt b/requirements.txt index f2b1e064..73576c12 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,7 +3,7 @@ Django==1.11.9 djangorestframework==3.7.7 # for access MySQL -PyMySQL==0.7.11 +PyMySQL==0.9.3 # redis cache redis==2.10.5 diff --git a/resources/bin/initDB.sh b/resources/bin/initDB.sh index b15d1cfd..3b277935 100644 --- a/resources/bin/initDB.sh +++ b/resources/bin/initDB.sh @@ -14,11 +14,6 @@ # See the License for the specific language governing permissions and # 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-catalog-createobj.sql b/resources/dbscripts/mysql/vfc-nfvo-catalog-createobj.sql deleted file mode 100644 index 8fa81260..00000000 --- a/resources/dbscripts/mysql/vfc-nfvo-catalog-createobj.sql +++ /dev/null @@ -1,49 +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 nfvocatalog; - -DROP TABLE IF EXISTS CATALOG_JOB; -DROP TABLE IF EXISTS CATALOG_JOB_STATUS; -DROP TABLE IF EXISTS CATALOG_NSPACKAGE; -DROP TABLE IF EXISTS CATALOG_SOFTWAREIMAGEMODEL; -DROP TABLE IF EXISTS CATALOG_VNFPACKAGE; -DROP TABLE IF EXISTS CATALOG_PNFPACKAGE; - --- --- Create model JobModel --- -CREATE TABLE `CATALOG_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); --- --- Create model JobStatusModel --- -CREATE TABLE `CATALOG_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); --- --- Create model NSPackageModel --- -CREATE TABLE `CATALOG_NSPACKAGE` (`NSPACKAGEID` varchar(50) NOT NULL PRIMARY KEY, `NSPACKAGEURI` varchar(300) NULL, `CHECKSUM` varchar(50) NULL, `SDCCSARID` varchar(50) NULL, `ONBOARDINGSTATE` varchar(20) NULL, `OPERATIONALSTATE` varchar(20) NULL, `USAGESTATE` varchar(20) NULL, `DELETIONPENDING` varchar(20) NULL, `NSDID` varchar(50) NULL, `NSDNAME` varchar(50) NULL, `NSDDESIGNER` varchar(50) NULL, `NSDDESCRIPTION` varchar(100) NULL, `NSDVERSION` varchar(20) NULL, `USERDEFINEDDATA` longtext NULL, `LOCALFILEPATH` varchar(300) NULL, `NSDMODEL` longtext NULL, `INVARIANTID` varchar(50) NULL); --- --- Create model SoftwareImageModel --- -CREATE TABLE `CATALOG_SOFTWAREIMAGEMODEL` (`IMAGEID` varchar(50) NOT NULL PRIMARY KEY, `CONTAINERFORMAT` varchar(20) NOT NULL, `DISKFORMAT` varchar(20) NOT NULL, `MINDISK` varchar(20) NOT NULL, `MINRAM` varchar(20) NOT NULL, `USAERMETADATA` varchar(1024) NOT NULL, `VNFPACKAGEID` varchar(50) NOT NULL, `FILEPATH` varchar(300) NOT NULL, `STATUS` varchar(10) NOT NULL, `VIMID` varchar(50) NOT NULL); --- --- Create model VnfPackageModel --- -CREATE TABLE `CATALOG_VNFPACKAGE` (`VNFPACKAGEID` varchar(50) NOT NULL PRIMARY KEY, `VNFPACKAGEURI` varchar(300) NULL, `SDCCSARURI` varchar(300) NULL, `CHECKSUM` varchar(50) NULL, `ONBOARDINGSTATE` varchar(20) NULL, `OPERATIONALSTATE` varchar(20) NULL, `USAGESTATE` varchar(20) NULL, `DELETIONPENDING` varchar(20) NULL, `VNFDID` varchar(50) NULL, `VENDOR` varchar(50) NULL, `VNFDPRODUCTNAME` varchar(50) NULL, `VNFDVERSION` varchar(20) NULL, `VNFSOFTWAREVERSION` varchar(20) NULL, `USERDEFINEDDATA` longtext NULL, `LOCALFILEPATH` varchar(300) NULL, `VNFDMODEL` longtext NULL); --- --- Create model PnfPackageModel --- -CREATE TABLE `CATALOG_PNFPACKAGE` (`PNFPACKAGEID` varchar(50) NOT NULL PRIMARY KEY, `PNFPACKAGEURI` varchar(300) NULL, `SDCCSARURI` varchar(300) NULL, `CHECKSUM` varchar(50) NULL, `ONBOARDINGSTATE` varchar(20) NULL, `USAGESTATE` varchar(20) NULL, `DELETIONPENDING` varchar(20) NULL, `PNFDID` varchar(50) NULL, `VENDOR` varchar(50) NULL, `PNFDPRODUCTNAME` varchar(50) NULL, `PNFDVERSION` varchar(20) NULL, `PNFSOFTWAREVERSION` varchar(20) NULL, `USERDEFINEDDATA` longtext NULL, `LOCALFILEPATH` varchar(300) NULL, `PNFDMODEL` longtext NULL, `PNFDNAME` varchar(100) NULL); -- 2.16.6