Topology Discovery and optical-service DGs

to support MDONS usecase

Change-Id: I1c28e799cc83325e8913d17ee8b718b0a4160cb2
Issue-ID: SDNC-928
Signed-off-by: Franklin Dsilva <franklin.dsilva@us.fujitsu.com>

Former-commit-id: 6a42d5eee5d71870527c8a302308f3e49829a496

4 files changed, 76 insertions, 1 deletions

diff --git a/installation/sdnc/pom.xml b/installation/sdnc/pom.xml
index 3d8d14e4..0128aba9 100644
--- a/installation/sdnc/pom.xml
+++ b/installation/sdnc/pom.xml
@@ -47,8 +47,15 @@
             <version>${sdnc.northbound.version}</version>
             <classifier>repo</classifier>
             <type>zip</type>
+       </dependency>
+       <dependency>
+            <groupId>org.onap.sdnc.northbound</groupId>
+            <artifactId>optical-service-installer</artifactId>
+            <version>${sdnc.northbound.version}</version>
+            <classifier>repo</classifier>
+            <type>zip</type>
         </dependency>
-        <dependency>
+      	<dependency>
             <groupId>org.onap.sdnc.northbound</groupId>
             <artifactId>vnftools-installer</artifactId>
             <version>${sdnc.northbound.version}</version>
diff --git a/installation/sdnc/src/main/resources/sdnctl.dump b/installation/sdnc/src/main/resources/sdnctl.dump
index 47766661..2fc7bcff 100644
--- a/installation/sdnc/src/main/resources/sdnctl.dump
+++ b/installation/sdnc/src/main/resources/sdnctl.dump
@@ -1891,6 +1891,26 @@ CREATE TABLE `RANGE_RULE` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `REQUEST_DETAILS`
+--
+
+DROP TABLE IF EXISTS `REQUEST_DETAILS`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `REQUEST_DETAILS` (
+  `request_id` varchar(255) NOT NULL,
+  `controller_id` varchar(255) DEFAULT NULL,
+  `status` varchar(255) DEFAULT NULL,
+  `service_rate` varchar(255) DEFAULT NULL,
+  `service_instance_id` varchar(255) DEFAULT NULL,
+  `service_type` varchar(255) DEFAULT NULL,
+  `global_customer_id` varchar(255) DEFAULT NULL,
+  `notification_url` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`request_id`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `REQUEST_PROGRESS`
 --
 
@@ -2421,6 +2441,26 @@ CREATE TABLE `TOPOLOGY_PARAMETER_TO_ENTRIES` (
 /*!40101 SET character_set_client = @saved_cs_client */;
 
 --
+-- Table structure for table `TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE`
+--
+
+DROP TABLE IF EXISTS `TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE`;
+/*!40101 SET @saved_cs_client     = @@character_set_client */;
+/*!40101 SET character_set_client = utf8 */;
+CREATE TABLE `TOPOLOGY_LOGICAL_RELATION_TO_PINTERFACE` (
+  `interface_name` varchar(255) NOT NULL,
+  `interface_id` varchar(255) NOT NULL,
+  `pnf_name` varchar(255) NOT NULL,
+  `pnf_id` varchar(255) NOT NULL,
+  `controller_id` varchar(255) DEFAULT NULL,
+  `rate` varchar(255) DEFAULT NULL,
+  `clli` varchar(255) DEFAULT NULL,
+  `connection_point` varchar(255) DEFAULT NULL,
+  PRIMARY KEY (`interface_name`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+/*!40101 SET character_set_client = @saved_cs_client */;
+
+--
 -- Table structure for table `TRANSACTION_LOG`
 --
 
diff --git a/installation/src/main/properties/optical-service-dg.properties b/installation/src/main/properties/optical-service-dg.properties
new file mode 100644
index 00000000..c4a5b174
--- /dev/null
+++ b/installation/src/main/properties/optical-service-dg.properties
@@ -0,0 +1,18 @@
+restapi.templateDir=/opt/onap/sdnc/restapi/templates
+controller.url=http://sdnc.onap:8282
+controller.user=admin
+controller.pwd=Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
+
+
+#Templates
+restapi.template.optical.service.create.filename=optical-service-create-msa.json
+restapi.template.optical.service.delete.filename=optical-service-delete-msa.json
+restapi.template.so.response.filename=async-response-so.json
+
+#URLS
+
+sdnc.async.url=/asyncNotification
+so.username=sdncaBpmn
+so.password=password1$
+tapi.cep.details.url=/cxf/tapi/v2/connectivities/service-interface-points?topology-id-or-name=otn&sip-id-or-name=
+tapi.delete.service.url=/cxf/tapi/v2/connectivities/tapi-services?topology-id-or-name=otn&service-id-or-name=
diff --git a/installation/src/main/properties/rpc-message-sliapi-execute-async.vt b/installation/src/main/properties/rpc-message-sliapi-execute-async.vt
new file mode 100644
index 00000000..b47a6733
--- /dev/null
+++ b/installation/src/main/properties/rpc-message-sliapi-execute-async.vt
@@ -0,0 +1,10 @@
+{
+        "input": {
+                "module-name": "optical-service",
+                "rpc-name": $rpc_name,
+                "mode": "sync",
+                "sli-parameter": $sli_parameters
+        }
+}
+
+