From b4c486a20d3be2d580921d00506dd0771692fd7a Mon Sep 17 00:00:00 2001
From: Patrick Brady <pb071s@att.com>
Date: Thu, 3 Aug 2017 14:26:48 -0700
Subject: Correcting new vnf_dg_mapping sql

The path was wrong to the sql script before,
and it was not included in the bundle.

Change-Id: Id34950dcb424b9c71f203da12820a27ed77d7d45
Signed-off-by: Patrick Brady <pb071s@att.com>
Issue: APPC-88
---
 .../src/main/resources/VNF_DG_MAPPING.sql          | 50 ++++++++++++++++++++++
 .../installer/src/main/scripts/VNF_DG_MAPPING.sql  | 30 -------------
 .../installer/src/main/scripts/install.sh          |  2 +-
 3 files changed, 51 insertions(+), 31 deletions(-)
 create mode 100644 platform-logic/installer/src/main/resources/VNF_DG_MAPPING.sql
 delete mode 100644 platform-logic/installer/src/main/scripts/VNF_DG_MAPPING.sql

(limited to 'platform-logic')

diff --git a/platform-logic/installer/src/main/resources/VNF_DG_MAPPING.sql b/platform-logic/installer/src/main/resources/VNF_DG_MAPPING.sql
new file mode 100644
index 0000000..c978bbc
--- /dev/null
+++ b/platform-logic/installer/src/main/resources/VNF_DG_MAPPING.sql
@@ -0,0 +1,50 @@
+
+-- ============LICENSE_START=======================================================
+-- APPC
+-- ================================================================================
+-- Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+-- ================================================================================
+-- 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.
+-- ============LICENSE_END=========================================================
+
+
+--
+-- Table structure for table `VNF_DG_MAPPING`
+--
+
+USE sdnctl;
+DROP TABLE IF EXISTS `VNF_DG_MAPPING`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `VNF_DG_MAPPING` (
+  `action` varchar(50) NOT NULL,
+  `api_version` varchar(50) DEFAULT NULL,
+  `vnf_type` varchar(50) DEFAULT NULL,
+  `vnf_version` varchar(50) DEFAULT NULL,
+  `dg_name` varchar(50) NOT NULL,
+  `dg_version` varchar(50) DEFAULT NULL,
+  `dg_module` varchar(50) NOT NULL,
+  UNIQUE KEY `INPUT_CONSTRAINT` (`action`,`api_version`,`vnf_type`,`vnf_version`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
+-- Dumping data for table `VNF_DG_MAPPING`
+--
+
+LOCK TABLES `VNF_DG_MAPPING` WRITE;
+/*!40000 ALTER TABLE `VNF_DG_MAPPING` DISABLE KEYS */;
+INSERT INTO `VNF_DG_MAPPING` VALUES ('Restart','2.01','','','legacy_operation','2.0.0','APPC'), ('Restart','2.00','','','Restart_VNF','2.0.1','APPC');
+
+/*!40000 ALTER TABLE `VNF_DG_MAPPING` ENABLE KEYS */;
+UNLOCK TABLES;
diff --git a/platform-logic/installer/src/main/scripts/VNF_DG_MAPPING.sql b/platform-logic/installer/src/main/scripts/VNF_DG_MAPPING.sql
deleted file mode 100644
index 764e694..0000000
--- a/platform-logic/installer/src/main/scripts/VNF_DG_MAPPING.sql
+++ /dev/null
@@ -1,30 +0,0 @@
---
--- Table structure for table `VNF_DG_MAPPING`
---
-
-USE sdnctl;
-DROP TABLE IF EXISTS `VNF_DG_MAPPING`;
-/*!40101 SET @saved_cs_client     = @@character_set_client */;
-/*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `VNF_DG_MAPPING` (
-  `action` varchar(50) NOT NULL,
-  `api_version` varchar(50) DEFAULT NULL,
-  `vnf_type` varchar(50) DEFAULT NULL,
-  `vnf_version` varchar(50) DEFAULT NULL,
-  `dg_name` varchar(50) NOT NULL,
-  `dg_version` varchar(50) DEFAULT NULL,
-  `dg_module` varchar(50) NOT NULL,
-  UNIQUE KEY `INPUT_CONSTRAINT` (`action`,`api_version`,`vnf_type`,`vnf_version`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-/*!40101 SET character_set_client = @saved_cs_client */;
-
---
--- Dumping data for table `VNF_DG_MAPPING`
---
-
-LOCK TABLES `VNF_DG_MAPPING` WRITE;
-/*!40000 ALTER TABLE `VNF_DG_MAPPING` DISABLE KEYS */;
-INSERT INTO `VNF_DG_MAPPING` VALUES ('Restart','2.01','','','legacy_operation','2.0.0','APPC'), ('Restart','2.00','','','Restart_VNF','2.0.1','APPC');
-
-/*!40000 ALTER TABLE `VNF_DG_MAPPING` ENABLE KEYS */;
-UNLOCK TABLES;
diff --git a/platform-logic/installer/src/main/scripts/install.sh b/platform-logic/installer/src/main/scripts/install.sh
index 9711b70..77052ae 100644
--- a/platform-logic/installer/src/main/scripts/install.sh
+++ b/platform-logic/installer/src/main/scripts/install.sh
@@ -52,5 +52,5 @@ MYSQL_DB=${MYSQL_DB:-sdnctl}
 MYSQL_HOST=${MYSQL_HOST:-dbhost}
 
 mysql --user=${MYSQL_USER} --password=${MYSQL_PWD} --host=${MYSQL_HOST} ${MYSQL_DB} <<-END
-SOURCE VNF_DG_MAPPING.sql
+SOURCE /opt/openecomp/appc/svclogic/config/VNF_DG_MAPPING.sql
 END
-- 
cgit 1.2.3-korg