Seed code submit of generic-resource-api 33/10433/2
authorDan Timoney <dtimoney@att.com>
Wed, 6 Sep 2017 00:33:51 +0000 (20:33 -0400)
committerDan Timoney <dtimoney@att.com>
Wed, 6 Sep 2017 00:48:29 +0000 (20:48 -0400)
Final seed code submit of generic-resource-api.  This version is ready
to submit if it verifies clean.

Change-Id: Id5d5cec97a5deccfbda478c0dd7e1967900d76a1
Issue-ID: SDNC-45
Signed-off-by: Dan Timoney <dtimoney@att.com>
20 files changed:
generic-resource-api/.gitignore [new file with mode: 0644]
generic-resource-api/features/pom.xml [new file with mode: 0644]
generic-resource-api/features/src/main/resources/features.xml [new file with mode: 0644]
generic-resource-api/installer/pom.xml [new file with mode: 0755]
generic-resource-api/installer/src/assembly/assemble_installer_zip.xml [new file with mode: 0644]
generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml [new file with mode: 0644]
generic-resource-api/installer/src/main/resources/scripts/install-feature.sh [new file with mode: 0644]
generic-resource-api/model/pom.xml [new file with mode: 0644]
generic-resource-api/model/scripts/python/yang2props.py [new file with mode: 0755]
generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang [new file with mode: 0644]
generic-resource-api/pom.xml [new file with mode: 0644]
generic-resource-api/provider/pom.xml [new file with mode: 0644]
generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java [new file with mode: 0644]
generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiSvcLogicServiceClient.java [new file with mode: 0644]
generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java [new file with mode: 0644]
generic-resource-api/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/sdnc/northbound/generic/resource/api/provider/impl/rev140523/GENERICRESOURCEAPIProviderModule.java [new file with mode: 0644]
generic-resource-api/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/sdnc/northbound/generic/resource/api/provider/impl/rev140523/GENERICRESOURCEAPIProviderModuleFactory.java [new file with mode: 0644]
generic-resource-api/provider/src/main/resources/initial/generic-resource-api-provider.xml [new file with mode: 0644]
generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang [new file with mode: 0644]
pom.xml

diff --git a/generic-resource-api/.gitignore b/generic-resource-api/.gitignore
new file mode 100644 (file)
index 0000000..930c033
--- /dev/null
@@ -0,0 +1,40 @@
+#####standard .git ignore entries#####
+
+## IDE Specific Files ##
+.classpath
+.project
+.settings
+.idea
+.externalToolBuilders
+maven-eclipse.xml
+workspace
+
+## Compilation Files ##
+*.class
+**/target
+target
+target-ide
+MANIFEST.MF
+
+## Misc Ignores (OS specific etc) ##
+bin/
+dist
+*~
+*.ipr
+*.iml
+*.iws
+classes
+out/
+.DS_STORE
+.metadata
+
+## Folders which contain auto generated source code ##
+yang-gen-config
+yang-gen-sal
+
+
+
+#####Archetype specific .git ignore entries#######
+generate
+Archetype_Next_Steps.README
+
diff --git a/generic-resource-api/features/pom.xml b/generic-resource-api/features/pom.xml
new file mode 100644 (file)
index 0000000..7c2e890
--- /dev/null
@@ -0,0 +1,101 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.onap.sdnc.northbound</groupId>
+               <artifactId>generic-resource-api</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+       </parent>
+
+       <artifactId>generic-resource-api.features</artifactId>
+       <packaging>jar</packaging>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.sdnc.northbound</groupId>
+                       <artifactId>generic-resource-api.model</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.sdnc.northbound</groupId>
+                       <artifactId>generic-resource-api.provider</artifactId>
+                       <type>xml</type>
+                       <classifier>config</classifier>
+               </dependency>
+               <dependency>
+                       <groupId>org.onap.sdnc.northbound</groupId>
+                       <artifactId>generic-resource-api.provider</artifactId>
+               </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.mdsal</groupId>
+            <artifactId>features-mdsal</artifactId>
+           <version>${odl.mdsal.features.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency><!-- Required for launching the feature tests-->
+            <groupId>org.opendaylight.odlparent</groupId>
+            <artifactId>features-test</artifactId>
+            <version>${odl.commons.opendaylight.version}</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.opendaylight.yangtools</groupId>
+            <artifactId>features-yangtools</artifactId>
+           <version>${odl.yangtools.version}</version>
+            <type>xml</type>
+            <classifier>features</classifier>
+            <scope>runtime</scope>
+        </dependency>
+       </dependencies>
+
+       <build>
+               <resources>
+                       <resource>
+                               <filtering>true</filtering>
+                               <directory>src/main/resources</directory>
+                       </resource>
+               </resources>
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>filter</id>
+                                               <goals>
+                                                       <goal>resources</goal>
+                                               </goals>
+                                               <phase>generate-resources</phase>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>build-helper-maven-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>attach-artifacts</id>
+                                               <goals>
+                                                       <goal>attach-artifact</goal>
+                                               </goals>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <artifacts>
+                                                               <artifact>
+                                                                       <file>${project.build.directory}/classes/${features.file}</file>
+                                                                       <type>xml</type>
+                                                                       <classifier>features</classifier>
+                                                               </artifact>
+                                                       </artifacts>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
diff --git a/generic-resource-api/features/src/main/resources/features.xml b/generic-resource-api/features/src/main/resources/features.xml
new file mode 100644 (file)
index 0000000..ac7a1d0
--- /dev/null
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<features name="generic-resource-api-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
+
+    <feature name='GENERIC-RESOURCE-API' description="generic-resource-api.GENERIC-RESOURCE-API" version='${project.version}'>
+        <feature version="${odl.controller.mdsal.version}">odl-mdsal-broker</feature>
+        <feature version="${sdnctl.sli.version}">sdnc-sli</feature>
+        <!-- It is assumed that applications are installed on BVC, which installs bvc-core including MD-SAL etc.
+             Do not list those features out here as that will tie your implementation to a specific version
+             of MD-SAL / BVC and force updates to your application for every upgrade of BVC core platform.-->
+        <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api.model/${project.version}</bundle>
+        <bundle>mvn:org.onap.sdnc.northbound/generic-resource-api.provider/${project.version}</bundle>
+        <configfile finalname="etc/opendaylight/karaf/200-generic-resource-api-provider.xml">mvn:org.onap.sdnc.northbound/generic-resource-api.provider/${project.version}/xml/config</configfile>
+    </feature>
+
+</features>
diff --git a/generic-resource-api/installer/pom.xml b/generic-resource-api/installer/pom.xml
new file mode 100755 (executable)
index 0000000..b190ff7
--- /dev/null
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <artifactId>generic-resource-api</artifactId>
+               <groupId>org.onap.sdnc.northbound</groupId>
+               <version>1.2.0-SNAPSHOT</version>
+       </parent>
+       <artifactId>generic-resource-api-installer</artifactId>
+       <name>Generic Resource API  - Karaf  Installer</name>
+       <packaging>pom</packaging>
+
+       <properties>
+               <application.name>sdnc-generic-resources-api</application.name>
+               <features.boot>sdnc-generic-resources-api</features.boot>
+               <features.repositories>mvn:org.onap.sdnc.northbound/generic-resources-api-features/${project.version}/xml/features</features.repositories>
+               <include.transitive.dependencies>false</include.transitive.dependencies>
+       </properties>
+
+       <dependencies>
+
+               <dependency>
+                       <groupId>org.onap.sdnc.northbound</groupId>
+                       <artifactId>generic-resource-api.features</artifactId>
+                       <version>${project.version}</version>
+                       <classifier>features</classifier>
+                       <type>xml</type>
+                       <exclusions>
+                               <exclusion>
+                                       <groupId>*</groupId>
+                                       <artifactId>*</artifactId>
+                               </exclusion>
+                       </exclusions>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.onap.sdnc.northbound</groupId>
+                       <artifactId>generic-resource-api.provider</artifactId>
+                       <version>${project.version}</version>
+               </dependency>
+
+
+       </dependencies>
+
+       <build>
+               <plugins>
+                       <plugin>
+                               <artifactId>maven-assembly-plugin</artifactId>
+                               <version>2.6</version>
+                               <executions>
+                                       <execution>
+                                               <id>maven-repo-zip</id>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <attach>false</attach>
+                                                       <finalName>stage/${application.name}-${project.version}</finalName>
+                                                       <descriptors>
+                                                               <descriptor>src/assembly/assemble_mvnrepo_zip.xml</descriptor>
+                                                       </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
+                                               </configuration>
+                                       </execution>
+                                       <execution>
+                                               <id>installer-zip</id>
+                                               <goals>
+                                                       <goal>single</goal>
+                                               </goals>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <attach>true</attach>
+                                                       <finalName>${application.name}-${project.version}-installer</finalName>
+                                                       <descriptors>
+                                                               <descriptor>src/assembly/assemble_installer_zip.xml</descriptor>
+                                                       </descriptors>
+                                                       <appendAssemblyId>false</appendAssemblyId>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-dependency-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>copy-dependencies</id>
+                                               <goals>
+                                                       <goal>copy-dependencies</goal>
+                                               </goals>
+                                               <phase>prepare-package</phase>
+                                               <configuration>
+                                                       <transitive>false</transitive>
+                                                       <outputDirectory>${project.build.directory}/assembly/system</outputDirectory>
+                                                       <overWriteReleases>false</overWriteReleases>
+                                                       <overWriteSnapshots>true</overWriteSnapshots>
+                                                       <overWriteIfNewer>true</overWriteIfNewer>
+                                                       <useRepositoryLayout>true</useRepositoryLayout>
+                                                       <addParentPoms>false</addParentPoms>
+                                                       <copyPom>false</copyPom>
+                                                       <includeGroupIds>org.onap.sdnc</includeGroupIds>
+                                                       <excludeArtifactIds>sli-common,sli-provider,dblib-common,dblib-provider</excludeArtifactIds>
+                                                       <scope>provided</scope>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                       <plugin>
+                               <artifactId>maven-resources-plugin</artifactId>
+                               <version>2.6</version>
+                               <executions>
+                                       <execution>
+                                               <id>copy-version</id>
+                                               <goals>
+                                                       <goal>copy-resources</goal>
+                                               </goals><!-- here the phase you need -->
+                                               <phase>validate</phase>
+                                               <configuration>
+                                                       <outputDirectory>${basedir}/target/stage</outputDirectory>
+                                                       <resources>
+                                                               <resource>
+                                                                       <directory>src/main/resources/scripts</directory>
+                                                                       <includes>
+                                                                               <include>install-feature.sh</include>
+                                                                       </includes>
+                                                                       <filtering>true</filtering>
+                                                               </resource>
+                                                       </resources>
+                                               </configuration>
+                                       </execution>
+
+                               </executions>
+                       </plugin>
+
+               </plugins>
+       </build>
+
+</project>
diff --git a/generic-resource-api/installer/src/assembly/assemble_installer_zip.xml b/generic-resource-api/installer/src/assembly/assemble_installer_zip.xml
new file mode 100644 (file)
index 0000000..13156fd
--- /dev/null
@@ -0,0 +1,56 @@
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  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=========================================================
+  -->
+
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<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>installer_zip</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <!--  we want "system" and related files right at the root level
+          as this file is suppose to be unzip on top of a karaf
+          distro. -->
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>target/stage/</directory>
+            <outputDirectory>${application.name}</outputDirectory>
+            <fileMode>755</fileMode>
+            <includes>
+                <include>*.sh</include>
+            </includes>
+        </fileSet>
+        <fileSet>
+            <directory>target/stage/</directory>
+            <outputDirectory>${application.name}</outputDirectory>
+            <fileMode>644</fileMode>
+            <excludes>
+                <exclude>*.sh</exclude>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+
+</assembly>
diff --git a/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml b/generic-resource-api/installer/src/assembly/assemble_mvnrepo_zip.xml
new file mode 100644 (file)
index 0000000..c1b6357
--- /dev/null
@@ -0,0 +1,57 @@
+<!--
+  ============LICENSE_START=======================================================
+  openECOMP : SDN-C
+  ================================================================================
+  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=========================================================
+  -->
+
+<!-- Defines how we build the .zip file which is our distribution. -->
+
+<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>mvnrepo_zip</id>
+    <formats>
+        <format>zip</format>
+    </formats>
+
+    <!--  we want "system" and related files right at the root level
+          as this file is suppose to be unzip on top of a karaf
+          distro. -->
+    <includeBaseDirectory>false</includeBaseDirectory>
+
+    <fileSets>
+        <fileSet>
+            <directory>target/assembly/</directory>
+            <outputDirectory>.</outputDirectory>
+            <excludes>
+            </excludes>
+        </fileSet>
+    </fileSets>
+
+    <files>
+        <file>
+            <source>../provider/src/main/resources/initial/${feature-name}-provider.xml</source>
+            <destName>./etc/opendaylight/karaf/200-${feature-name}-provider.xml</destName>
+        </file>
+    <file>
+        <source>../model/target/generic-resource-api.properties</source>
+        <destName>./configuration/generic-resource-api.properties</destName>
+
+    </file>
+    </files>
+
+</assembly>
diff --git a/generic-resource-api/installer/src/main/resources/scripts/install-feature.sh b/generic-resource-api/installer/src/main/resources/scripts/install-feature.sh
new file mode 100644 (file)
index 0000000..6e8620e
--- /dev/null
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+###
+# ============LICENSE_START=======================================================
+# openECOMP : SDN-C
+# ================================================================================
+# 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=========================================================
+###
+
+ODL_HOME=${ODL_HOME:-/opt/opendaylight/current}
+ODL_KARAF_CLIENT=${ODL_KARAF_CLIENT:-${ODL_HOME}/bin/client}
+ODL_KARAF_CLIENT_OPTS=${ODL_KARAF_CLIENT_OPTS:-"-u karaf"}
+INSTALLERDIR=$(dirname $0)
+
+REPOZIP=${INSTALLERDIR}/${features.boot}-${project.version}.zip
+
+if [ -f ${REPOZIP} ]
+then
+       unzip -d ${ODL_HOME} ${REPOZIP}
+else
+       echo "ERROR : repo zip ($REPOZIP) not found"
+       exit 1
+fi
+
+${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:repo-add ${features.repositories}
+${ODL_KARAF_CLIENT} ${ODL_KARAF_CLIENT_OPTS} feature:install ${features.boot}
diff --git a/generic-resource-api/model/pom.xml b/generic-resource-api/model/pom.xml
new file mode 100644 (file)
index 0000000..9b8b3fe
--- /dev/null
@@ -0,0 +1,161 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.onap.sdnc.northbound</groupId>
+               <artifactId>generic-resource-api</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+       </parent>
+
+       <artifactId>generic-resource-api.model</artifactId>
+       <packaging>bundle</packaging>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.opendaylight.mdsal</groupId>
+                       <artifactId>yang-binding</artifactId>
+                       <version>${odl.mdsal.yang.binding.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.yangtools</groupId>
+                       <artifactId>yang-common</artifactId>
+                       <version>${odl.yangtools.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.mdsal.model</groupId>
+                       <artifactId>ietf-inet-types</artifactId>
+                       <version>${odl.ietf-inet-types.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.mdsal.model</groupId>
+                       <artifactId>ietf-yang-types</artifactId>
+                       <version>${odl.ietf-yang-types.version}</version>
+               </dependency>
+       </dependencies>
+
+       <build>
+
+               <plugins>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <instructions>
+                                               <Import-Package>*</Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-maven-plugin</artifactId>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.opendaylight.mdsal</groupId>
+                                               <artifactId>maven-sal-api-gen-plugin</artifactId>
+                                               <version>${odl.sal.api.gen.plugin.version}</version>
+                                               <type>jar</type>
+                                       </dependency>
+                               </dependencies>
+                               <executions>
+                                       <execution>
+                                               <goals>
+                                                       <goal>generate-sources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <yangFilesRootDir>${yang.file.directory}</yangFilesRootDir>
+                                                       <codeGenerators>
+                                                               <generator>
+                                                                       <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                                                       <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                                                               </generator>
+                                                       </codeGenerators>
+                                                       <inspectDependencies>true</inspectDependencies>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+                        <plugin>
+                                <groupId>org.codehaus.mojo</groupId>
+                                <artifactId>exec-maven-plugin</artifactId>
+                                <version>1.2.1</version>
+                                <executions>
+                                        <execution>
+                                                <configuration>
+                                                        <executable>python</executable>
+                                                        <arguments>
+                                                                <argument>scripts/python/yang2props.py</argument>
+                                                                <argument>src/main/yang/GENERIC-RESOURCE-API.yang</argument>
+                                                                <argument>target/generic-resource-api.properties</argument>
+                                                        </arguments>
+                                                </configuration>
+                                                <id>generation</id>
+                                                <phase>generate-resources</phase>
+                                                <goals>
+                                                        <goal>exec</goal>
+                                                </goals>
+                                        </execution>
+                                </executions>
+                        </plugin>
+                        <plugin>
+                                <groupId>org.codehaus.mojo</groupId>
+                                <artifactId>build-helper-maven-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>attach-artifacts</id>
+                                                <goals>
+                                                        <goal>attach-artifact</goal>
+                                                </goals>
+                                                <phase>package</phase>
+                                                <configuration>
+                                                        <artifacts>
+                                                                <artifact>
+                                                                        <file>${project.build.directory}/generic-resource-api.properties</file>
+                                                                        <type>properties</type>
+                                                                        <classifier>generic-resource-api</classifier>
+                                                                </artifact>
+                                                        </artifacts>
+                                                </configuration>
+                                        </execution>
+                                </executions>
+                        </plugin>
+
+        </plugins>
+        <pluginManagement>
+            <plugins>
+                <!--This plugin's configuration is used to store Eclipse m2e settings only. It has no influence on the Maven build itself.-->
+                <plugin>
+                    <groupId>org.eclipse.m2e</groupId>
+                    <artifactId>lifecycle-mapping</artifactId>
+                    <version>1.0.0</version>
+                    <configuration>
+                        <lifecycleMappingMetadata>
+                            <pluginExecutions>
+                                <pluginExecution>
+                                    <pluginExecutionFilter>
+                                        <groupId>
+                                            org.codehaus.mojo
+                                        </groupId>
+                                        <artifactId>
+                                            exec-maven-plugin
+                                        </artifactId>
+                                        <versionRange>
+                                            [1.2.1,)
+                                        </versionRange>
+                                        <goals>
+                                            <goal>exec</goal>
+                                        </goals>
+                                    </pluginExecutionFilter>
+                                    <action>
+                                        <ignore />
+                                    </action>
+                                </pluginExecution>
+                            </pluginExecutions>
+                        </lifecycleMappingMetadata>
+                    </configuration>
+                </plugin>
+            </plugins>
+        </pluginManagement>
+       </build>
+</project>
diff --git a/generic-resource-api/model/scripts/python/yang2props.py b/generic-resource-api/model/scripts/python/yang2props.py
new file mode 100755 (executable)
index 0000000..559d31b
--- /dev/null
@@ -0,0 +1,57 @@
+#!/usr/bin/python
+
+import re
+import sys
+
+
+# Convert word from foo-bar to FooBar
+# words begining with a digit will be converted to _digit
+def to_enum(s):
+    if s[0].isdigit():
+        s = "_" + s
+    else:
+        s = s[0].upper() + s[1:]
+    return re.sub(r'(?!^)-([a-zA-Z])', lambda m: m.group(1).upper(), s)
+
+leaf = ""
+val = ""
+li = []
+
+if len(sys.argv) < 3:
+     print 'yang2props.py <input yang> <output properties>'
+     sys.exit(2)
+
+with open(sys.argv[1], "r") as ins:
+    for line in ins:
+        # if we see a leaf save the name for later
+        if "leaf " in line:
+           match = re.search(r'leaf (\S+)', line)
+           if match:
+                 leaf = match.group(1)
+      
+        # if we see enum convert the value to enum format and see if it changed
+        # if the value is different write a property entry
+        if "enum " in line:
+           match = re.search(r'enum "(\S+)";', line)
+           if match:
+                val = match.group(1)
+               enum = to_enum(val)
+
+                # see if converting to enum changed the string
+               if val != enum:
+                    property = "yang."+leaf+"."+enum+"="+val
+                   if property not in li:
+                       li.append( property)
+
+
+# Open output file
+fo = open(sys.argv[2], "wb")
+fo.write("# yang conversion properties \n")
+fo.write("# used to convert Enum back to the original yang value \n")
+fo.write("\n".join(li))
+fo.write("\n")
+
+# Close opend file
+fo.close()
+
+   
diff --git a/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang b/generic-resource-api/model/src/main/yang/GENERIC-RESOURCE-API.yang
new file mode 100644 (file)
index 0000000..233fbaf
--- /dev/null
@@ -0,0 +1,1670 @@
+module GENERIC-RESOURCE-API {\r
+\r
+   namespace "org:onap:sdnc:northbound:generic-resource";\r
+\r
+   prefix generic-resource-api;\r
+\r
+   import ietf-inet-types { prefix "inet"; revision-date "2010-09-24"; }\r
+\r
+   import ietf-yang-types { prefix yang; }\r
+\r
+   revision "2017-08-24" {\r
+     description\r
+        "ONAP Amsterdam version";\r
+   }\r
+\r
+   grouping service-model-infrastructure {\r
+      list service {\r
+         key "service-instance-id";\r
+         leaf service-instance-id {\r
+            description "Keep as M";\r
+            type string;\r
+            mandatory true;\r
+         }\r
+         uses service-data;\r
+         uses service-status;\r
+      }\r
+   }\r
+   grouping service-data {\r
+      container service-data {\r
+         uses service-operation-information;\r
+         uses service-topology;\r
+         uses service-level-oper-status;\r
+         container networks {\r
+            list network {\r
+               key "network-id";\r
+               leaf network-id {\r
+                  type string;\r
+                  mandatory true;\r
+               }\r
+               container network-data {\r
+                  uses network-operation-information;\r
+                  uses network-topology;\r
+                  container network-provided-allotted-resources {\r
+                     leaf-list network-provided-ar-id {\r
+                        description "List of allotted resources using capacity from this network";\r
+                        type string;\r
+                        ordered-by user;\r
+                     }\r
+                  }\r
+                  uses network-level-oper-status;\r
+               }\r
+            }\r
+         }\r
+         container vnfs {\r
+            list vnf {\r
+               key "vnf-id";\r
+               leaf vnf-id {\r
+                  type string;\r
+                  mandatory true;\r
+               }\r
+               container vnf-data {\r
+                  uses vnf-operation-information;\r
+                  uses vnf-topology;\r
+                  container vnf-provided-allotted-resources {\r
+                     leaf-list vnf-provided-ar-id {\r
+                        description "List of allotted resources using capacity from this vnf";\r
+                        type string;\r
+                        ordered-by user;\r
+                     }\r
+                  }\r
+                  uses vnf-level-oper-status;\r
+                  container vf-modules {\r
+                     list vf-module {\r
+                        key "vf-module-id";\r
+                        leaf vf-module-id {\r
+                           type string;\r
+                           mandatory true;\r
+                        }\r
+                        container vf-module-data {\r
+                           uses vf-module-operation-information;\r
+                           uses vf-module-topology;\r
+                           uses vf-module-level-oper-status;\r
+                        }\r
+                     }\r
+                  }\r
+               }\r
+            }\r
+         }\r
+         container consumed-allotted-resources {\r
+            list consumed-allotted-resource {\r
+               key "allotted-resource-id";\r
+               uses allotted-resource-info;\r
+            }\r
+         }\r
+         container provided-allotted-resources {\r
+            list provided-allotted-resource {\r
+               key "allotted-resource-id";\r
+               uses allotted-resource-info;\r
+            }\r
+         }\r
+      }\r
+   }\r
+   grouping service-status {\r
+      container service-status {\r
+         leaf response-code {\r
+            type string;\r
+         }\r
+         leaf response-message {\r
+            type string;\r
+         }\r
+         leaf final-indicator {\r
+            type string;\r
+         }\r
+         leaf request-status {\r
+            type enumeration {\r
+               enum "synccomplete";\r
+               enum "asynccomplete";\r
+               enum "notifycomplete";\r
+            }\r
+         }\r
+         leaf action {\r
+            description "value would one of possible request-actions; match the list in service-data oper-status";\r
+            type string;\r
+         }\r
+         leaf rpc-name {\r
+            type string;\r
+         }\r
+         leaf rpc-action {\r
+            description "this is the svc-action from the incoming request";\r
+            type enumeration {\r
+               enum "assign";\r
+               enum "activate";\r
+               enum "configure";\r
+               enum "delete";\r
+               enum "unassign";\r
+               enum "deactivate";\r
+            }\r
+         }\r
+         leaf response-timestamp {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping service-operation-information {\r
+      uses sdnc-request-header;\r
+      uses request-information;\r
+      uses service-information;\r
+      uses service-request-input;\r
+   }\r
+   grouping service-request-input {\r
+      container service-request-input {\r
+         leaf service-instance-name {\r
+            type string;\r
+         }\r
+         container service-input-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping service-topology {\r
+      container service-topology {\r
+         uses service-topology-identifier;\r
+         uses ecomp-model-information;\r
+         uses service-assignments;\r
+         uses service-parameters;\r
+      }\r
+   }\r
+   grouping service-topology-identifier {\r
+      container service-topology-identifier {\r
+         leaf service-instance-id {\r
+            description "repeated";\r
+            type string;\r
+         }\r
+         leaf service-type {\r
+            description "tag labeled subscription-service-type in the service-information input";\r
+            type string;\r
+         }\r
+         leaf service-id {\r
+            description "from MSO input on STO assign";\r
+            type string;\r
+         }\r
+         leaf service-instance-name {\r
+            description "optionally comes from service-request-input container or is assigned by sdn-c";\r
+            type string;\r
+         }\r
+         leaf global-customer-id {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping service-assignments {\r
+      container service-assignments {\r
+      }\r
+   }\r
+   grouping service-parameters {\r
+      container service-parameters {\r
+         list service-parameter {\r
+            key "service-parameter-name";\r
+            leaf service-parameter-name {\r
+               type string;\r
+            }\r
+            leaf service-parameter-value {\r
+               type string;\r
+            }\r
+         }\r
+      }\r
+   }\r
+   grouping service-level-oper-status {\r
+      container service-level-oper-status {\r
+         uses oper-status-data;\r
+      }\r
+   }\r
+   grouping network-operation-information {\r
+      uses sdnc-request-header;\r
+      uses request-information;\r
+      uses service-information;\r
+      uses network-information;\r
+      uses network-request-input;\r
+   }\r
+   grouping network-information {\r
+      container network-information {\r
+         leaf network-id {\r
+            type string;\r
+         }\r
+         leaf network-type {\r
+            type string;\r
+         }\r
+         uses ecomp-model-information;\r
+      }\r
+   }\r
+   grouping network-request-input {\r
+      container network-request-input {\r
+         leaf network-name {\r
+            type string;\r
+         }\r
+         uses region-identifier;\r
+         container network-input-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping network-topology {\r
+      container network-topology {\r
+         uses network-topology-identifier-structure;\r
+         uses region-identifier;\r
+         uses ecomp-model-information;\r
+         uses network-assignments;\r
+         uses network-parameters;\r
+      }\r
+   }\r
+   grouping network-topology-identifier-structure {\r
+      container network-topology-identifier-structure {\r
+         leaf network-id {\r
+            type string;\r
+         }\r
+         leaf network-name {\r
+            type string;\r
+         }\r
+         leaf network-role {\r
+            type string;\r
+         }\r
+         leaf network-type {\r
+            type string;\r
+         }\r
+         leaf network-technology {\r
+            description "should we keep this?";\r
+            type string;\r
+         }\r
+         leaf eipam-v4-address-plan {\r
+            description "??";\r
+            type string;\r
+         }\r
+         leaf eipam-v6-address-plan {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping network-assignments {\r
+      container network-assignments {\r
+      }\r
+   }\r
+   grouping network-parameters {\r
+      container network-parameters {\r
+         list network-parameter {\r
+            key "network-parameter-name";\r
+            leaf network-parameter-name {\r
+               type string;\r
+            }\r
+            leaf network-parameter-value {\r
+               type string;\r
+            }\r
+         }\r
+      }\r
+   }\r
+   grouping network-level-oper-status {\r
+      container network-level-oper-status {\r
+         uses oper-status-data;\r
+      }\r
+   }\r
+   grouping vnf-operation-information {\r
+      uses sdnc-request-header;\r
+      uses request-information;\r
+      uses service-information;\r
+      uses vnf-information;\r
+      uses vnf-request-input;\r
+   }\r
+   grouping vnf-information {\r
+      container vnf-information {\r
+         leaf vnf-id {\r
+            type string;\r
+         }\r
+         leaf vnf-type {\r
+            description "vnf-model-id in Pats model?in Pats vnf submodule, contained within vnf-instance-topology-identifier grouping (along with vnf-name and vnf-instance-id)";\r
+            type string;\r
+         }\r
+         uses ecomp-model-information;\r
+      }\r
+   }\r
+   grouping vnf-request-input {\r
+      container vnf-request-input {\r
+         leaf request-version {\r
+            description "keep this? e.g. 1702";\r
+            type string;\r
+         }\r
+         leaf vnf-name {\r
+            description "in Pats vnf submodule, contained within vnf-instance-topology-identifier (along with vnf-model-id and vnf-instance-id)";\r
+            type string;\r
+         }\r
+         uses region-identifier;\r
+         container vnf-networks {\r
+            list vnf-network {\r
+               key "network-role";\r
+               uses vnf-network-data;\r
+            }\r
+         }\r
+         container vnf-input-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping vnf-topology {\r
+      container vnf-topology {\r
+         uses vnf-topology-identifier-structure;\r
+         uses region-identifier;\r
+         uses ecomp-model-information;\r
+         uses vnf-resource-assignments;\r
+         container vnf-parameters-data {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping vnf-topology-identifier-structure {\r
+      container vnf-topology-identifier-structure {\r
+         leaf vnf-id {\r
+            type string;\r
+         }\r
+         leaf vnf-type {\r
+            description "In preload tree, this label is used for the vf-module-type";\r
+            type string;\r
+         }\r
+         leaf nf-type {\r
+            type string;\r
+         }\r
+         leaf nf-role {\r
+            type string;\r
+         }\r
+         leaf nf-function {\r
+            type string;\r
+         }\r
+         leaf nf-code {\r
+            description "used in vnf naming";\r
+            type string;\r
+         }\r
+         leaf vnf-name {\r
+            description "optionally comes from vnf-request-input container or is assigned by sdn-c";\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping vnf-resource-assignments {\r
+      container vnf-resource-assignments {\r
+         leaf vnf-status {\r
+            description "Do we need this?Orchestration status from AAI - to be set by SDNCWill not be used for vIPR.";\r
+            type string;\r
+         }\r
+         container availability-zones {\r
+            leaf-list availability-zone {\r
+               description "Openstack availability zone name or UUID";\r
+               type string;\r
+               ordered-by user;\r
+            }\r
+            leaf max-count {\r
+               description "From the TOSCA data. Indicates the largest availability zone count needed by any vf-module in the VNF.";\r
+               type uint8;\r
+            }\r
+         }\r
+         container vnf-networks {\r
+            list vnf-network {\r
+               key "network-role";\r
+               uses vnf-network-data;\r
+            }\r
+         }\r
+      }\r
+   }\r
+   grouping vnf-network-data {\r
+      leaf network-role {\r
+         description "A Network Role to which a VNF must connect";\r
+         type string;\r
+      }\r
+      leaf network-name {\r
+         description "Unique Neutron UUID of an instance of the network role ";\r
+         type string;\r
+      }\r
+      leaf neutron-id {\r
+         description "Unique Neutron UUID of an instance of the network role ";\r
+         type string;\r
+      }\r
+      leaf network-id {\r
+         description "Unique Neutron UUID of an instance of the network role ";\r
+         type string;\r
+      }\r
+      leaf contrail-network-fqdn {\r
+         description "contrail network policy object";\r
+         type string;\r
+      }\r
+      container subnets-data {\r
+         list subnet-data {\r
+            key "ip-version";\r
+            leaf ip-version {\r
+               description "Should be ipv4 or ipv6";\r
+               type string;\r
+            }\r
+            leaf subnet-id {\r
+               description "subnet UUID to be passed into the HEAT template";\r
+               type string;\r
+            }\r
+         }\r
+      }\r
+   }\r
+   grouping vnf-level-oper-status {\r
+      container vnf-level-oper-status {\r
+         uses oper-status-data;\r
+      }\r
+   }\r
+   grouping vf-module-operation-information {\r
+      uses sdnc-request-header;\r
+      uses request-information;\r
+      uses service-information;\r
+      uses vnf-information;\r
+      uses vf-module-information;\r
+      uses vf-module-request-input;\r
+   }\r
+   grouping vf-module-information {\r
+      container vf-module-information {\r
+         leaf vf-module-id {\r
+            type string;\r
+         }\r
+         leaf vf-module-type {\r
+            type string;\r
+         }\r
+         uses ecomp-model-information;\r
+      }\r
+   }\r
+   grouping vf-module-request-input {\r
+      container vf-module-request-input {\r
+         leaf request-version {\r
+            description "keep this?";\r
+            type string;\r
+         }\r
+         leaf vf-module-name {\r
+            type string;\r
+         }\r
+         uses region-identifier;\r
+         container vf-module-input-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping vf-module-topology {\r
+      container vf-module-topology {\r
+         uses vf-module-topology-identifier;\r
+         uses region-identifier;\r
+         uses ecomp-model-information;\r
+         uses vf-module-assignments;\r
+         container vf-module-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping vf-module-topology-identifier {\r
+      container vf-module-topology-identifier {\r
+         leaf vf-module-id {\r
+            description "vf-module id";\r
+            type string;\r
+         }\r
+         leaf vf-module-name {\r
+            description "vf-module-name";\r
+            type string;\r
+         }\r
+         leaf vf-module-type {\r
+            description "In Pats model referred to as model-id";\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping vf-module-assignments {\r
+      container vf-module-assignments {\r
+         leaf vf-module-status {\r
+            description "Do we need this?Orchestration status from AAI - to be set by SDNCNot being used for vIPR.";\r
+            type string;\r
+         }\r
+         container vms {\r
+            list vm {\r
+               key "vm-type";\r
+               uses vm-topology-data;\r
+            }\r
+         }\r
+      }\r
+   }\r
+   grouping vm-topology-data {\r
+      leaf vm-type {\r
+         type string;\r
+         mandatory true;\r
+      }\r
+      leaf nfc-naming-code {\r
+         description "used in vm naming(draft 29: changed from nfc-code)";\r
+         type string;\r
+      }\r
+      leaf vm-type-tag {\r
+         description "from tosca data on vfc";\r
+         type string;\r
+      }\r
+      leaf vm-count {\r
+         type uint8;\r
+      }\r
+      container vm-names {\r
+         leaf-list vm-name {\r
+            description "ordered-by: user";\r
+            type string;\r
+            ordered-by user;\r
+         }\r
+      }\r
+      container vm-networks {\r
+         list vm-network {\r
+            key "network-role";\r
+            uses vm-network-data;\r
+         }\r
+      }\r
+   }\r
+   grouping vm-network-data {\r
+      leaf network-role {\r
+         description "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF";\r
+         type string;\r
+         mandatory true;\r
+      }\r
+      leaf network-role-tag {\r
+         type string;\r
+      }\r
+      container network-information-items {\r
+         list network-information-item {\r
+            key "ip-version";\r
+            leaf ip-version {\r
+               description "Use ipv4 or ipv6";\r
+               type string;\r
+            }\r
+            leaf use-dhcp {\r
+               description "Indicator to use DHCP on this network for this VM";\r
+               type enumeration {\r
+                  enum "Y";\r
+                  enum "N";\r
+               }\r
+            }\r
+            leaf ip-count {\r
+               description "The number of ip addresses to be assigned per vm for this network role";\r
+               type uint8;\r
+            }\r
+            container network-ips {\r
+               leaf-list network-ip {\r
+                  description "List of assigned ip addresses of type ip-version on a network. Is there a way to specify  format to indicate ipv4 or ipv6 format?";\r
+                  type string;\r
+                  ordered-by user;\r
+               }\r
+            }\r
+         }\r
+      }\r
+      container mac-addresses {\r
+         leaf-list mac-address {\r
+            description "List of network assignments for this vm-type";\r
+            type string;\r
+            ordered-by user;\r
+         }\r
+      }\r
+      container floating-ips {\r
+         leaf-list floating-ip-v4 {\r
+            description "Floating ipv4 for VMs of a given type on this network";\r
+            type inet:ip-address;\r
+            ordered-by user;\r
+         }\r
+         leaf-list floating-ip-v6 {\r
+            description "Floating ipv6 for VMs of a given type on this network";\r
+            type inet:ipv6-address;\r
+            ordered-by user;\r
+         }\r
+      }\r
+      container interface-route-prefixes {\r
+         leaf-list interface-route-prefix {\r
+            description "ordered-by: user";\r
+            type string;\r
+            ordered-by user;\r
+         }\r
+      }\r
+      container sriov-parameters {\r
+         container heat-vlan-filters {\r
+            leaf-list heat-vlan-filter {\r
+               type string;\r
+               ordered-by user;\r
+            }\r
+         }\r
+         container application-tags {\r
+            container c-tags {\r
+               leaf-list c-tag {\r
+                  type string;\r
+                  ordered-by user;\r
+               }\r
+            }\r
+            container s-tags {\r
+               leaf-list s-tag {\r
+                  type string;\r
+                  ordered-by user;\r
+               }\r
+            }\r
+         }\r
+      }\r
+   }\r
+   grouping vf-module-level-oper-status {\r
+      container vf-module-level-oper-status {\r
+         uses oper-status-data;\r
+      }\r
+   }\r
+   grouping allotted-resource-info {\r
+      leaf allotted-resource-id {\r
+         type string;\r
+      }\r
+      leaf allotted-resource-type {\r
+         description "Not an enum, but expected values are contrail-route and security-zone.";\r
+         type string;\r
+      }\r
+      leaf allotted-resource-pointer {\r
+         description "Pointer to the allotted-resources topology";\r
+         type string;\r
+      }\r
+   }\r
+   grouping contrail-route-operation-information {\r
+      uses sdnc-request-header;\r
+      uses request-information;\r
+      uses service-information;\r
+      uses allotted-resource-information;\r
+      uses contrail-route-request-input;\r
+   }\r
+   grouping contrail-route-request-input {\r
+      container contrail-route-request-input {\r
+         container source-network {\r
+            uses network-info;\r
+         }\r
+         container dest-network {\r
+            uses network-info;\r
+         }\r
+         container contrail-applied-service-info {\r
+            leaf service-instance-id {\r
+               description "The service-instance-id of the service in which the resource(s) providing the applied-service are. For vIPR, this is the service-instance-id of the vIPR-ATM service in which the vIPR-ATM VNF Contrail service is the applied service. MSO will populate with the input data.";\r
+               type string;\r
+            }\r
+            leaf contrail-fqdn {\r
+               description "For future use by MSO on input; MSO not expected to populate in 1707. If MSO can identify the contrail-fqdn of the Contrail applied service for this contrail-route, then it would be specified here on input. Otherwise, SDN-C will look it up by the vIPR-ATM VNF in the service-instance-id of the contrail-applied-service-info grouing.";\r
+               type string;\r
+            }\r
+         }\r
+         container contrail-route-input-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping network-info {\r
+      leaf network-id {\r
+         type string;\r
+      }\r
+      leaf network-role {\r
+         type string;\r
+      }\r
+   }\r
+   grouping contrail-route-topology {\r
+      container contrail-route-topology {\r
+         uses allotted-resource-identifiers;\r
+         uses ecomp-model-information;\r
+         uses contrail-route-assignments;\r
+         container contrail-route-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping contrail-route-assignments {\r
+      container contrail-route-assignments {\r
+         leaf fq-name {\r
+            description "The Contrail fq-name of the network policy";\r
+            type string;\r
+         }\r
+         leaf contrail-id {\r
+            description "The ID assigned by Contrail to the network-policy (one for one with the fq-name)";\r
+            type string;\r
+         }\r
+         container source-network {\r
+            uses network-info;\r
+         }\r
+         container dest-network {\r
+            uses network-info;\r
+         }\r
+         container contrail-applied-service {\r
+            leaf service-instance-id {\r
+               description "The service-instance-id of the vnf from which the contrail applied service is coming";\r
+               type string;\r
+            }\r
+            leaf vnf-id {\r
+               description "The vnf representing the contrail applied service";\r
+               type string;\r
+            }\r
+            leaf contrail-fqdn {\r
+               description "This is the fq-name of the Contrail service instance through which the route is passing.";\r
+               type string;\r
+            }\r
+         }\r
+         leaf vlan-tag {\r
+            description "Contrail-assigned vlan-tag to the vipr vm interface for this route.";\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping security-zone-operation-information {\r
+      uses sdnc-request-header;\r
+      uses request-information;\r
+      uses service-information;\r
+      uses allotted-resource-information;\r
+      uses security-zone-request-input;\r
+   }\r
+   grouping security-zone-request-input {\r
+      container security-zone-request-input {\r
+         leaf vlan-tag {\r
+            type string;\r
+         }\r
+         leaf trusted-network-role {\r
+            description "In the case of vIPR, this is the landing networks network-role; used in naming";\r
+            type string;\r
+         }\r
+         leaf untrusted-network-role {\r
+            description "In the case of vIPR, this is the tenant oam networks network-role; used in naming";\r
+            type string;\r
+         }\r
+         container security-zone-input-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping security-zone-topology {\r
+      container security-zone-topology {\r
+         uses allotted-resource-identifiers;\r
+         uses ecomp-model-information;\r
+         uses security-zone-assignments;\r
+         container security-zone-parameters {\r
+            uses param;\r
+         }\r
+      }\r
+   }\r
+   grouping security-zone-assignments {\r
+      container security-zone-assignments {\r
+         leaf trusted-network-role {\r
+            description "In the case of vIPR, this is the landing networks network-role; used in naming";\r
+            type string;\r
+         }\r
+         leaf security-zone-name-trusted {\r
+            type string;\r
+         }\r
+         leaf untrusted-network-role {\r
+            description "In the case of vIPR, this is the tenant oam networks network-role; used in naming";\r
+            type string;\r
+         }\r
+         leaf security-zone-name-untrusted {\r
+            type string;\r
+         }\r
+         leaf security-zone-service-instance-id {\r
+            description "Will be the same as the parent-service-instance-id";\r
+            type string;\r
+         }\r
+         leaf security-zone-vnf-id {\r
+            description "Selected by SDNC from the security-zone-service-instance-id";\r
+            type string;\r
+         }\r
+         leaf vlan-tag {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping allotted-resource-information {\r
+      container allotted-resource-information {\r
+         leaf allotted-resource-id {\r
+            type string;\r
+         }\r
+         leaf allotted-resource-type {\r
+            description "Not an enum, but expected values are contrail-route and security-zone.";\r
+            type string;\r
+         }\r
+         leaf parent-service-instance-id {\r
+            description "Service-instance-id of the parent service to which this allotted resource belongs.";\r
+            type string;\r
+         }\r
+         uses ecomp-model-information;\r
+      }\r
+   }\r
+   grouping allotted-resource-identifiers {\r
+      container allotted-resource-identifiers {\r
+         leaf allotted-resource-id {\r
+            type string;\r
+         }\r
+         leaf allotted-resource-name {\r
+            description "For a contrail-route, the network policy name.";\r
+            type string;\r
+         }\r
+         leaf allotted-resource-type {\r
+            description "(Added in draft 32)Expected to be contrail-route or security-zone.";\r
+            type string;\r
+         }\r
+         leaf consuming-service-instance-id {\r
+            description "The service-instance-id of the consuming service of this allotted resource";\r
+            type string;\r
+         }\r
+         leaf parent-service-instance-id {\r
+            description "Service-instance-id of the parent service to which this allotted resource belongs.";\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping allotted-resource-oper-status {\r
+      container allotted-resource-oper-status {\r
+         uses oper-status-data;\r
+      }\r
+   }\r
+   grouping allotted-resource-status {\r
+      container allotted-resource-status {\r
+         leaf response-code {\r
+            type string;\r
+         }\r
+         leaf response-message {\r
+            type string;\r
+         }\r
+         leaf final-indicator {\r
+            type string;\r
+         }\r
+         leaf request-status {\r
+            type enumeration {\r
+               enum "synccomplete";\r
+               enum "asynccomplete";\r
+               enum "notifycomplete";\r
+            }\r
+         }\r
+         leaf action {\r
+            description "value would one of possible request-actions; match the list in service-data oper-status";\r
+            type string;\r
+         }\r
+         leaf rpc-name {\r
+            type string;\r
+         }\r
+         leaf rpc-action {\r
+            description "this is the svc-action from the incoming request";\r
+            type enumeration {\r
+               enum "assign";\r
+               enum "activate";\r
+               enum "create";\r
+               enum "delete";\r
+               enum "unassign";\r
+               enum "deactivate";\r
+            }\r
+         }\r
+         leaf response-timestamp {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping topology-response-common {\r
+      leaf svc-request-id {\r
+         description "the request id from the request message for which this is the responseKeep as M";\r
+         type string;\r
+      }\r
+      leaf response-code {\r
+         description "a success code or an defined error codeKeep as M";\r
+         type string;\r
+      }\r
+      leaf response-message {\r
+         description "message included for error code";\r
+         type string;\r
+      }\r
+      leaf ack-final-indicator {\r
+         description "Expected to be Y or N.";\r
+         type string;\r
+      }\r
+   }\r
+   grouping sdnc-request-header {\r
+      container sdnc-request-header {\r
+         leaf svc-request-id {\r
+            description "Uniquely generated by calling system (e.g. MSO or SDN-GP)";\r
+            type string;\r
+         }\r
+         leaf svc-action {\r
+            description "Enumerated listThis is the rpcAction";\r
+            type enumeration {\r
+               enum "reserve";\r
+               enum "assign";\r
+               enum "activate";\r
+               enum "delete";\r
+               enum "changeassign";\r
+               enum "changedelete";\r
+               enum "rollback";\r
+               enum "deactivate";\r
+               enum "unassign";\r
+               enum "create";\r
+            }\r
+         }\r
+         leaf svc-notification-url {\r
+            description "Contains URL for asynchronous response";\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping request-information {\r
+      container request-information {\r
+         leaf request-id {\r
+            description "Request ID generated upstream of MSO";\r
+            type string;\r
+         }\r
+         leaf request-action {\r
+            description "still need to work Disconnect";\r
+            type enumeration {\r
+               enum "CreateNetworkInstance";\r
+               enum "ActivateNetworkInstance";\r
+               enum "CreateServiceInstance";\r
+               enum "DeleteServiceInstance";\r
+               enum "DeleteNetworkInstance";\r
+               enum "CreateVnfInstance";\r
+               enum "ActivateVnfInstance";\r
+               enum "DeleteVnfInstance";\r
+               enum "CreateVfModuleInstance";\r
+               enum "ActivateVfModuleInstance";\r
+               enum "DeleteVfModuleInstance";\r
+               enum "CreateContrailRouteInstance";\r
+               enum "DeleteContrailRouteInstance";\r
+               enum "CreateSecurityZoneInstance";\r
+               enum "DeleteSecurityZoneInstance";\r
+            }\r
+         }\r
+         leaf source {\r
+            type string;\r
+         }\r
+         leaf notification-url {\r
+            type string;\r
+         }\r
+         leaf order-number {\r
+            type string;\r
+         }\r
+         leaf order-version {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping service-information {\r
+      container service-information {\r
+         leaf service-id {\r
+            description "This maps to the product-family-id in A&AI";\r
+            type string;\r
+         }\r
+         leaf subscription-service-type {\r
+            description "used to reference a&ai subscription-service-type. For example, we show as vIPR-ATM in example.";\r
+            type string;\r
+         }\r
+         uses ecomp-model-information;\r
+         leaf service-instance-id {\r
+            type string;\r
+         }\r
+         leaf global-customer-id {\r
+            description "need for put of data to AnAI (MSO provides)";\r
+            type string;\r
+         }\r
+         leaf subscriber-name {\r
+            description "Would not be expected for vIPR-ATM or mobility services.";\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping ecomp-model-information {\r
+      container ecomp-model-information {\r
+         leaf model-invariant-uuid {\r
+            description "identifies the invariant uuid for this service or resource";\r
+            type string;\r
+         }\r
+         leaf model-customization-uuid {\r
+            description "customized resource for use within a given service.Would not be present at the service level but would be present for the resource level";\r
+            type string;\r
+         }\r
+         leaf model-uuid {\r
+            description "identifies the uuid for this service or resource, which is version specific";\r
+            type string;\r
+         }\r
+         leaf model-version {\r
+            type string;\r
+         }\r
+         leaf model-name {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping region-identifier {\r
+      leaf tenant {\r
+         type string;\r
+      }\r
+      leaf aic-cloud-region {\r
+         description "The AIC cloud region which maps to contrail versions";\r
+         type string;\r
+      }\r
+      leaf aic-clli {\r
+         description "Not expected to be used";\r
+         type string;\r
+      }\r
+   }\r
+   grouping param {\r
+      list param {\r
+         key "name";\r
+         leaf name {\r
+            type string;\r
+         }\r
+         leaf value {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping instance-reference {\r
+      leaf instance-id {\r
+         type string;\r
+      }\r
+      leaf object-path {\r
+         description "restconf retrieval path to this particular objectE.g. restconf/config/GENERIC-RESOURCE-API:services/service/$service-instance-id/service-data/service-topology/";\r
+         type string;\r
+      }\r
+   }\r
+   grouping oper-status-data {\r
+      leaf order-status {\r
+         description "TBD - do we need Request failed statuses? RequestFailed | InProgressTimeout";\r
+         type enumeration {\r
+            enum "Active";\r
+            enum "PendingAssignment";\r
+            enum "PendingCreate";\r
+            enum "PendingUpdate";\r
+            enum "PendingDelete";\r
+            enum "Deleted";\r
+            enum "Created";\r
+         }\r
+      }\r
+      leaf last-rpc-action {\r
+         type enumeration {\r
+            enum "assign";\r
+            enum "activate";\r
+            enum "delete";\r
+            enum "unassign";\r
+            enum "deactivate";\r
+            enum "create";\r
+         }\r
+      }\r
+      leaf last-action {\r
+         description "should be list of possible request-actions";\r
+         type enumeration {\r
+            enum "CreateNetworkInstance";\r
+            enum "ActivateNetworkInstance";\r
+            enum "CreateServiceInstance";\r
+            enum "DeleteServiceInstance";\r
+            enum "DeleteNetworkInstance";\r
+            enum "CreateVnfInstance";\r
+            enum "ActivateVnfInstance";\r
+            enum "DeleteVnfInstance";\r
+            enum "CreateVfModuleInstance";\r
+            enum "ActivateVfModuleInstance";\r
+            enum "DeleteVfModuleInstance";\r
+            enum "CreateContrailRouteInstance";\r
+            enum "DeleteContrailRouteInstance";\r
+            enum "CreateSecurityZoneInstance";\r
+            enum "DeleteSecurityZoneInstance";\r
+         }\r
+      }\r
+      leaf last-svc-request-id {\r
+         description "Not currently populated in service data.";\r
+         type string;\r
+      }\r
+      leaf last-order-status {\r
+         description "fieldused by generic-resource-api";\r
+         type enumeration {\r
+            enum "Active";\r
+            enum "PendingAssignment";\r
+            enum "PendingCreate";\r
+            enum "PendingUpdate";\r
+            enum "PendingDelete";\r
+            enum "Deleted";\r
+            enum "Created";\r
+         }\r
+      }\r
+      leaf create-timestamp {\r
+         description "Not currently populated in service data.";\r
+         type string;\r
+      }\r
+      leaf modify-timestamp {\r
+         type string;\r
+      }\r
+   }\r
+   grouping service-response-information {\r
+      container service-response-information {\r
+         uses instance-reference;\r
+      }\r
+   }\r
+   grouping network-response-information {\r
+      container network-response-information {\r
+         uses instance-reference;\r
+      }\r
+   }\r
+   grouping vnf-response-information {\r
+      container vnf-response-information {\r
+         uses instance-reference;\r
+      }\r
+   }\r
+   grouping vf-module-response-information {\r
+      container vf-module-response-information {\r
+         uses instance-reference;\r
+      }\r
+   }\r
+   grouping contrail-route-response-information {\r
+      container contrail-route-response-information {\r
+         uses instance-reference;\r
+      }\r
+   }\r
+   grouping security-zone-response-information {\r
+      container security-zone-response-information {\r
+         uses instance-reference;\r
+      }\r
+   }\r
+   grouping preload-model-information {\r
+      list vnf-preload-list {\r
+         key "vnf-name vnf-type";\r
+         leaf vnf-name {\r
+            description "vf-module-name or network name";\r
+            type string;\r
+            mandatory true;\r
+         }\r
+         leaf vnf-type {\r
+            description "vf-module-type or network type";\r
+            type string;\r
+            mandatory true;\r
+         }\r
+         uses preload-data;\r
+      }\r
+   }\r
+   grouping vnf-topology-response-body {\r
+      leaf svc-request-id {\r
+         type string;\r
+      }\r
+      leaf response-code {\r
+         type string;\r
+      }\r
+      leaf response-message {\r
+         type string;\r
+      }\r
+      leaf ack-final-indicator {\r
+         type string;\r
+      }\r
+   }\r
+   grouping preload-data {\r
+      container preload-data {\r
+         uses vnf-topology-information;\r
+         uses network-topology-information;\r
+         uses oper-status;\r
+      }\r
+   }\r
+   grouping vnf-topology-information {\r
+      container vnf-topology-information {\r
+         uses vnf-topology-identifier;\r
+         uses vnf-assignments;\r
+         uses vnf-parameters;\r
+      }\r
+   }\r
+   grouping vnf-topology-identifier {\r
+      container vnf-topology-identifier {\r
+         leaf service-type {\r
+            type string;\r
+         }\r
+         leaf service-id {\r
+            type string;\r
+         }\r
+         leaf vnf-name {\r
+            description "vf-module-name";\r
+            type string;\r
+         }\r
+         leaf vnf-type {\r
+            description "vf-module-type";\r
+            type string;\r
+         }\r
+         leaf generic-vnf-name {\r
+            type string;\r
+         }\r
+         leaf generic-vnf-type {\r
+            type string;\r
+         }\r
+         leaf generic-vnf-id {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping vnf-assignments {\r
+      container vnf-assignments {\r
+         leaf vnf-status {\r
+            description "Orchestration Status from AAI - to be set by SDNC";\r
+            type string;\r
+         }\r
+         list availability-zones {\r
+            key "availability-zone";\r
+            leaf availability-zone {\r
+               description "Openstack availability zone name or UUID";\r
+               type string;\r
+            }\r
+         }\r
+         list vnf-networks {\r
+            key "";\r
+            uses vnf-network;\r
+            uses sriov-vlan-filter-list;\r
+         }\r
+         uses vm-topology;\r
+      }\r
+   }\r
+   grouping vm-topology {\r
+      list vnf-vms {\r
+         key "vm-type";\r
+         leaf vm-type {\r
+            type string;\r
+            mandatory true;\r
+         }\r
+         leaf vm-count {\r
+            type uint8;\r
+         }\r
+         list vm-names {\r
+            key "vm-name";\r
+            leaf vm-name {\r
+               type string;\r
+            }\r
+         }\r
+         list vm-networks {\r
+            key "";\r
+            uses vm-network;\r
+         }\r
+      }\r
+   }\r
+   grouping vnf-network {\r
+      leaf network-role {\r
+         description "A Network Role to which a VNF must connect";\r
+         type string;\r
+         mandatory true;\r
+      }\r
+      leaf network-name {\r
+         description "Unique Neutron UUID of an instance of the network role ";\r
+         type string;\r
+      }\r
+      leaf neutron-id {\r
+         description "Unique Neutron UUID of an instance of the network role ";\r
+         type string;\r
+      }\r
+      leaf network-id {\r
+         description "Unique Neutron UUID of an instance of the network role ";\r
+         type string;\r
+      }\r
+      leaf subnet-id {\r
+         description "ipv4 subnet UUID to be passed into the HEAT template";\r
+         type string;\r
+      }\r
+      leaf subnet-name {\r
+         description "ipv4 subnet-name that corresponds to the ipv4 subnet-id";\r
+         type string;\r
+      }\r
+      leaf contrail-network-fqdn {\r
+         description "contrail network policy object";\r
+         type string;\r
+      }\r
+      leaf ipv6-subnet-id {\r
+         description "ipv6 subnet UUID to be passed into the HEAT template";\r
+         type string;\r
+      }\r
+      leaf ipv6-subnet-name {\r
+         description "ipv6 subnet-name that corresponds to the ipv6 subnet-id";\r
+         type string;\r
+      }\r
+   }\r
+   grouping sriov-vlan-filter-list {\r
+      list sriov-vlan-filter-list {\r
+         key "sriov-vlan-filter";\r
+         leaf sriov-vlan-filter {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping vm-network {\r
+      leaf network-role {\r
+         description "network (identified by role) that this VM connects to.  Should also be included in the vnf-networks for the containing VNF";\r
+         type string;\r
+      }\r
+      leaf use-dhcp {\r
+         description "Indicator to use DHCP on this network for this VM";\r
+         type enumeration {\r
+            enum "Y";\r
+            enum "N";\r
+         }\r
+      }\r
+      leaf ip-count {\r
+         description "The number of ip addresses to be assigned per vm for this network role";\r
+         type uint8;\r
+      }\r
+      list network-ips {\r
+         key "ip-address";\r
+         leaf ip-address {\r
+            description "List of assigned ipv4 addresses on a network";\r
+            type inet:ip-address;\r
+         }\r
+      }\r
+      list network-ips-v6 {\r
+         key "ip-address-ipv6";\r
+         leaf ip-address-ipv6 {\r
+            description "List of assigned ipv6 addresses on a network";\r
+            type inet:ipv6-address;\r
+         }\r
+      }\r
+      list network-macs {\r
+         key "mac-address";\r
+         leaf mac-address {\r
+            description "List of network assignments for this VM (one per network)";\r
+            type string;\r
+         }\r
+      }\r
+      leaf floating-ip {\r
+         description "Floating ipv4 for VMs of a given type on this network";\r
+         type inet:ip-address;\r
+      }\r
+      leaf floating-ip-v6 {\r
+         description "Floating ipv6 for VMs of a given type on this network";\r
+         type inet:ipv6-address;\r
+      }\r
+      list interface-route-prefixes {\r
+         key "interface-route-prefix-cidr";\r
+         leaf interface-route-prefix-cidr {\r
+            description "route prefixes (CIDRs) in ip/cidr format to be provided to MSO in vnf-topology as a list of static routes";\r
+            type string;\r
+            mandatory true;\r
+         }\r
+         leaf interface-route-prefix {\r
+            description "route prefixes (CIDRs) to be provided to MSO in vnf-topology as a list of static routes";\r
+            type inet:ip-address;\r
+         }\r
+      }\r
+   }\r
+   grouping vnf-parameters {\r
+      list vnf-parameters {\r
+         key "vnf-parameter-name";\r
+         leaf vnf-parameter-name {\r
+            description "The name of an arbitrary instance-specific vnf-parameters";\r
+            type string;\r
+         }\r
+         leaf vnf-parameter-value {\r
+            description "The value of an arbitrary instance-specific vnf-parameters ";\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping network-topology-information {\r
+      container network-topology-information {\r
+         uses network-topology-identifier;\r
+         uses subnets;\r
+         uses vpn-bindings;\r
+         uses network-policy;\r
+         uses route-table-reference;\r
+         uses provider-network-information;\r
+      }\r
+   }\r
+   grouping network-topology-identifier {\r
+      container network-topology-identifier {\r
+         leaf service-type {\r
+            type string;\r
+         }\r
+         leaf network-name {\r
+            type string;\r
+         }\r
+         leaf network-role {\r
+            type string;\r
+         }\r
+         leaf network-type {\r
+            type string;\r
+         }\r
+         leaf network-technology {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping subnets {\r
+      list subnets {\r
+         key "start-address";\r
+         leaf start-address {\r
+            type inet:ip-address;\r
+         }\r
+         leaf gateway-address {\r
+            type inet:ip-address;\r
+         }\r
+         leaf cidr-mask {\r
+            type string;\r
+         }\r
+         leaf ip-version {\r
+            type string;\r
+         }\r
+         leaf dhcp-enabled {\r
+            type enumeration {\r
+               enum "Y";\r
+               enum "N";\r
+            }\r
+         }\r
+         leaf dhcp-start-address {\r
+            type string;\r
+         }\r
+         leaf dhcp-end-address {\r
+            type string;\r
+         }\r
+         leaf subnet-name {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping vpn-bindings {\r
+      list vpn-bindings {\r
+         key "vpn-binding-id";\r
+         leaf vpn-binding-id {\r
+            type string;\r
+         }\r
+         leaf global-route-target {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping network-policy {\r
+      list network-policy {\r
+         key "network-policy-fqdn";\r
+         leaf network-policy-fqdn {\r
+            type string;\r
+         }\r
+         leaf network-policy-id {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping route-table-reference {\r
+      list route-table-reference {\r
+         key "route-table-reference-fqdn";\r
+         leaf route-table-reference-fqdn {\r
+            type string;\r
+            mandatory true;\r
+         }\r
+         leaf route-table-reference-id {\r
+            type string;\r
+         }\r
+      }\r
+   }\r
+   grouping provider-network-information {\r
+      leaf physical-network-name {\r
+         type string;\r
+      }\r
+      leaf is-provider-network {\r
+         type boolean;\r
+      }\r
+      leaf is-shared-network {\r
+         type boolean;\r
+      }\r
+      leaf is-external-network {\r
+         type boolean;\r
+      }\r
+   }\r
+   grouping oper-status {\r
+      container oper-status {\r
+         leaf order-status {\r
+            type enumeration {\r
+               enum "Active";\r
+               enum "PendingAssignment";\r
+               enum "PendingCreate";\r
+               enum "PendingUpdate";\r
+               enum "PendingDelete";\r
+               enum "Deleted";\r
+            }\r
+         }\r
+         leaf last-action {\r
+            description "this is preload request actions";\r
+            type enumeration {\r
+               enum "VNFActivateRequest";\r
+               enum "ChangeVNFActivateRequest";\r
+               enum "VnfInstanceActivateRequest";\r
+               enum "ChangeVnfInstanceActivateRequest";\r
+               enum "VfModuleActivateRequest";\r
+               enum "ChangeVfModuleActivateRequest";\r
+               enum "DisconnectVNFRequest";\r
+               enum "DisconnectVnfInstanceRequest";\r
+               enum "DisconnectVfModuleRequest";\r
+               enum "PreloadVNFRequest";\r
+               enum "DeletePreloadVNFRequest";\r
+               enum "PreloadVnfInstanceRequest";\r
+               enum "DeletePreloadVnfInstanceRequest";\r
+               enum "PreloadVfModuleRequest";\r
+               enum "DeletePreloadVfModuleRequest";\r
+            }\r
+         }\r
+         leaf last-svc-request-id {\r
+            type string;\r
+         }\r
+         leaf last-order-status {\r
+            type enumeration {\r
+               enum "Active";\r
+               enum "PendingAssignment";\r
+               enum "PendingCreate";\r
+               enum "PendingUpdate";\r
+               enum "PendingDelete";\r
+               enum "Deleted";\r
+            }\r
+         }\r
+         leaf create-timestamp {\r
+            type string;\r
+         }\r
+         leaf modify-timestamp {\r
+            type string;\r
+         }\r
+         leaf maintenance-indicator {\r
+            type enumeration {\r
+               enum "Y";\r
+               enum "N";\r
+            }\r
+         }\r
+      }\r
+   }\r
+   container services {\r
+      uses service-model-infrastructure;\r
+   }\r
+   container contrail-route-allotted-resources {\r
+      list contrail-route-allotted-resource {\r
+         key "allotted-resource-id";\r
+         leaf allotted-resource-id {\r
+            type string;\r
+            mandatory true;\r
+         }\r
+         container allotted-resource-data {\r
+            container allotted-resource-operation-information {\r
+               uses contrail-route-operation-information;\r
+            }\r
+            uses contrail-route-topology;\r
+            uses allotted-resource-oper-status;\r
+         }\r
+         uses allotted-resource-status;\r
+      }\r
+   }\r
+   container security-zone-allotted-resources {\r
+      list security-zone-allotted-resource {\r
+         key "allotted-resource-id";\r
+         leaf allotted-resource-id {\r
+            type string;\r
+            mandatory true;\r
+         }\r
+         container allotted-resource-data {\r
+            container allotted-resource-operation-information {\r
+               uses security-zone-operation-information;\r
+            }\r
+            uses security-zone-topology;\r
+            container security-zone-parameters {\r
+               uses param;\r
+            }\r
+            uses allotted-resource-oper-status;\r
+         }\r
+         uses allotted-resource-status;\r
+      }\r
+   }\r
+   rpc service-topology-operation {\r
+      input {\r
+         uses service-operation-information;\r
+      }\r
+      output {\r
+         uses topology-response-common;\r
+         uses service-response-information;\r
+      }\r
+   }\r
+   rpc network-topology-operation {\r
+      input {\r
+         uses network-operation-information;\r
+      }\r
+      output {\r
+         uses topology-response-common;\r
+         uses network-response-information;\r
+         uses service-response-information;\r
+      }\r
+   }\r
+   rpc vnf-topology-operation {\r
+      input {\r
+         uses vnf-operation-information;\r
+      }\r
+      output {\r
+         uses topology-response-common;\r
+         uses vnf-response-information;\r
+         uses service-response-information;\r
+      }\r
+   }\r
+   rpc vf-module-topology-operation {\r
+      input {\r
+         uses vf-module-operation-information;\r
+      }\r
+      output {\r
+         uses topology-response-common;\r
+         uses vf-module-response-information;\r
+         uses vnf-response-information;\r
+         uses service-response-information;\r
+      }\r
+   }\r
+   rpc contrail-route-topology-operation {\r
+      input {\r
+         uses contrail-route-operation-information;\r
+      }\r
+      output {\r
+         uses topology-response-common;\r
+         uses contrail-route-response-information;\r
+         uses service-response-information;\r
+      }\r
+   }\r
+   rpc security-zone-topology-operation {\r
+      input {\r
+         uses security-zone-operation-information;\r
+      }\r
+      output {\r
+         uses topology-response-common;\r
+         uses security-zone-response-information;\r
+         uses service-response-information;\r
+      }\r
+   }\r
+   container preload-vnfs {\r
+      uses preload-model-information;\r
+   }\r
+   rpc preload-vnf-topology-operation {\r
+      input {\r
+         uses sdnc-request-header;\r
+         uses request-information;\r
+         uses vnf-topology-information;\r
+      }\r
+      output {\r
+         uses vnf-topology-response-body;\r
+      }\r
+   }\r
+   rpc preload-network-topology-operation {\r
+      input {\r
+         uses sdnc-request-header;\r
+         uses request-information;\r
+         uses network-topology-information;\r
+      }\r
+      output {\r
+         uses vnf-topology-response-body;\r
+      }\r
+   }\r
+} ////closes the module\r
diff --git a/generic-resource-api/pom.xml b/generic-resource-api/pom.xml
new file mode 100644 (file)
index 0000000..2d76101
--- /dev/null
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.onap.sdnc.northbound</groupId>
+               <artifactId>sdnc-northbound</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+       </parent>
+
+       <groupId>org.onap.sdnc.northbound</groupId>
+       <artifactId>generic-resource-api</artifactId>
+       <version>1.2.0-SNAPSHOT</version>
+       <packaging>pom</packaging>
+
+    <properties>
+        <feature-name>generic-resource-api</feature-name>
+    </properties>
+       <modules>
+               <module>model</module>
+               <module>features</module>
+               <module>installer</module>
+               <module>provider</module>
+       </modules>
+
+
+       <dependencyManagement>
+               <dependencies>
+                       <dependency>
+                               <groupId>org.onap.sdnc.northbound</groupId>
+                               <artifactId>generic-resource-api.features</artifactId>
+                               <version>${project.version}</version>
+                               <type>xml</type>
+                               <classifier>features</classifier>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.sdnc.northbound</groupId>
+                               <artifactId>generic-resource-api.model</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.sdnc.northbound</groupId>
+                               <artifactId>generic-resource-api.provider</artifactId>
+                               <version>${project.version}</version>
+                               <type>xml</type>
+                               <classifier>config</classifier>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.onap.sdnc.northbound</groupId>
+                               <artifactId>generic-resource-api.provider</artifactId>
+                               <version>${project.version}</version>
+                       </dependency>
+               </dependencies>
+       </dependencyManagement>
+</project>
diff --git a/generic-resource-api/provider/pom.xml b/generic-resource-api/provider/pom.xml
new file mode 100644 (file)
index 0000000..c3f61c9
--- /dev/null
@@ -0,0 +1,190 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<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">
+       <modelVersion>4.0.0</modelVersion>
+
+       <parent>
+               <groupId>org.onap.sdnc.northbound</groupId>
+               <artifactId>generic-resource-api</artifactId>
+               <version>1.2.0-SNAPSHOT</version>
+       </parent>
+
+       <artifactId>generic-resource-api.provider</artifactId>
+       <packaging>bundle</packaging>
+
+       <dependencies>
+               <dependency>
+                       <groupId>org.onap.sdnc.northbound</groupId>
+                       <artifactId>generic-resource-api.model</artifactId>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>config-api</artifactId>
+                       <version>${odl.controller.config.api.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>sal-binding-config</artifactId>
+                       <version>${odl.mdsal.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>sal-binding-api</artifactId>
+                       <version>${odl.mdsal.version}</version>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>sal-common-util</artifactId>
+                       <version>${odl.mdsal.version}</version>
+               </dependency>
+
+        <!--
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>sal-test-model</artifactId>
+                       <version>${odl.mdsal.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.netconf</groupId>
+                       <artifactId>sal-rest-connector</artifactId>
+                       <version>${odl.mdsal.version}</version>
+                       <scope>test</scope>
+               </dependency>
+
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>sal-binding-broker-impl</artifactId>
+                       <version>${odl.mdsal.version}</version>
+                       <scope>test</scope>
+               </dependency>
+               <dependency>
+                       <groupId>org.opendaylight.controller</groupId>
+                       <artifactId>sal-binding-broker-impl</artifactId>
+                       <version>${odl.mdsal.version}}</version>
+                       <type>test-jar</type>
+                       <classifier>tests</classifier>
+                       <scope>test</scope>
+               </dependency>
+        -->
+               <dependency>
+                       <groupId>org.apache.commons</groupId>
+                       <artifactId>commons-lang3</artifactId>
+               </dependency>
+
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-common</artifactId>
+            <version>${sdnctl.sli.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.onap.ccsdk.sli.core</groupId>
+            <artifactId>sli-provider</artifactId>
+            <version>${sdnctl.sli.version}</version>
+        </dependency>
+
+               <dependency>
+                       <groupId>junit</groupId>
+                       <artifactId>junit</artifactId>
+                       <version>3.8.1</version>
+                       <scope>test</scope>
+               </dependency>
+       </dependencies>
+
+       <build>
+           <plugins>
+        <!--
+               <plugin>
+                <groupId>com.brocade.tools</groupId>
+                    <artifactId>providermodule-plugin</artifactId>
+                    <version>1.0.0-SNAPSHOT</version>
+                    <configuration>
+                        <packageId>org.onap.sdnc.northbound</packageId>
+                        <appName>generic-resource-api</appName>
+                    </configuration>
+                    <executions>
+                       <execution>
+                          <phase>process-sources</phase>
+                          <goals>
+                              <goal>process</goal>
+                          </goals>
+                    </execution>
+                </executions>
+            </plugin>
+            -->
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <extensions>true</extensions>
+                               <configuration>
+                                       <instructions>
+                                               <Export-Package>org.opendaylight.controller.config.yang.config.generic-resource-api_provider.impl</Export-Package>
+                                               <Import-Package>*</Import-Package>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.opendaylight.yangtools</groupId>
+                               <artifactId>yang-maven-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>config</id>
+                                               <goals>
+                                                       <goal>generate-sources</goal>
+                                               </goals>
+                                               <configuration>
+                                                       <codeGenerators>
+                                                               <generator>
+                                                                       <codeGeneratorClass>org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator</codeGeneratorClass>
+                                                                       <outputBaseDir>${jmxGeneratorPath}</outputBaseDir>
+                                                                       <additionalConfiguration>
+                                                                               <namespaceToPackage1>urn:opendaylight:params:xml:ns:yang:controller==org.opendaylight.controller.config.yang</namespaceToPackage1>
+                                                                       </additionalConfiguration>
+                                                               </generator>
+                                                               <generator>
+                                                                       <codeGeneratorClass>org.opendaylight.mdsal.binding.maven.api.gen.plugin.CodeGeneratorImpl</codeGeneratorClass>
+                                                                       <outputBaseDir>${salGeneratorPath}</outputBaseDir>
+                                                               </generator>
+                                                       </codeGenerators>
+                                                       <inspectDependencies>true</inspectDependencies>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                               <dependencies>
+                                       <dependency>
+                                               <groupId>org.opendaylight.mdsal</groupId>
+                                               <artifactId>maven-sal-api-gen-plugin</artifactId>
+                                               <version>${odl.sal.api.gen.plugin.version}</version>
+                                               <type>jar</type>
+                                       </dependency>
+                                       <dependency>
+                                               <groupId>org.opendaylight.controller</groupId>
+                                               <artifactId>yang-jmx-generator-plugin</artifactId>
+                                               <version>${odl.yang.jmx.generator.version}</version>
+                                       </dependency>
+                               </dependencies>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>build-helper-maven-plugin</artifactId>
+                               <executions>
+                                       <execution>
+                                               <id>attach-artifacts</id>
+                                               <goals>
+                                                       <goal>attach-artifact</goal>
+                                               </goals>
+                                               <phase>package</phase>
+                                               <configuration>
+                                                       <artifacts>
+                                                               <artifact>
+                                                                       <file>${project.build.directory}/classes/initial/generic-resource-api-provider.xml</file>
+                                                                       <type>xml</type>
+                                                                       <classifier>config</classifier>
+                                                               </artifact>
+                                                       </artifacts>
+                                               </configuration>
+                                       </execution>
+                               </executions>
+                       </plugin>
+               </plugins>
+       </build>
+</project>
diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiProvider.java
new file mode 100644 (file)
index 0000000..702e4b8
--- /dev/null
@@ -0,0 +1,2067 @@
+package org.onap.sdnc.northbound;
+
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
+import java.util.Date;
+import java.util.Properties;
+import java.util.TimeZone;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+
+import org.opendaylight.controller.md.sal.binding.api.DataBroker;
+import org.opendaylight.controller.md.sal.binding.api.ReadOnlyTransaction;
+import org.opendaylight.controller.md.sal.binding.api.WriteTransaction;
+import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType;
+import org.opendaylight.controller.md.sal.common.api.data.OptimisticLockFailedException;
+import org.opendaylight.controller.md.sal.common.api.data.TransactionCommitFailedException;
+import org.opendaylight.controller.sal.binding.api.BindingAwareBroker;
+import org.opendaylight.controller.sal.binding.api.NotificationProviderService;
+import org.opendaylight.controller.sal.binding.api.RpcProviderRegistry;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ContrailRouteTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.GENERICRESOURCEAPIService;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfs;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfsBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.SecurityZoneTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.Services;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServicesBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationInput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationInputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationOutput;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationOutputBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.contrail.route.response.information.ContrailRouteResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.response.information.NetworkResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.data.PreloadData;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.data.PreloadDataBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadList;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadListBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadListKey;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.request.information.RequestInformation;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeader;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeader.SvcAction;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.security.zone.response.information.SecurityZoneResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.ServiceData;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.ServiceDataBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.model.infrastructure.Service;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.model.infrastructure.ServiceBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.model.infrastructure.ServiceKey;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.response.information.ServiceResponseInformationBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatus.RequestStatus;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatus.RpcAction;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatusBuilder;
+import org.opendaylight.yangtools.yang.binding.InstanceIdentifier;
+import org.opendaylight.yangtools.yang.common.RpcResult;
+import org.opendaylight.yangtools.yang.common.RpcResultBuilder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.google.common.base.Optional;
+import com.google.common.util.concurrent.CheckedFuture;
+import com.google.common.util.concurrent.Futures;
+import com.google.common.util.concurrent.SettableFuture;
+
+
+/**
+ * Defines a base implementation for your provider. This class extends from a helper class
+ * which provides storage for the most commonly used components of the MD-SAL. Additionally the
+ * base class provides some basic logging and initialization / clean up methods.
+ *
+ * To use this, copy and paste (overwrite) the following method into the TestApplicationProviderModule
+ * class which is auto generated under src/main/java in this project
+ * (created only once during first compilation):
+ *
+ * <pre>
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+
+         //final GENERIC-RESOURCE-APIProvider provider = new GENERIC-RESOURCE-APIProvider();
+         final GenericResourceApiProvider provider = new GenericResourceApiProvider();
+         provider.setDataBroker( getDataBrokerDependency() );
+         provider.setNotificationService( getNotificationServiceDependency() );
+         provider.setRpcRegistry( getRpcRegistryDependency() );
+         provider.initialize();
+         return new AutoCloseable() {
+
+            @Override
+            public void close() throws Exception {
+                //TODO: CLOSE ANY REGISTRATION OBJECTS CREATED USING ABOVE BROKER/NOTIFICATION
+                //SERVIE/RPC REGISTRY
+                provider.close();
+            }
+        };
+    }
+
+
+    </pre>
+ */
+
+public class GenericResourceApiProvider implements AutoCloseable, GENERICRESOURCEAPIService{
+
+    private final Logger log = LoggerFactory.getLogger( GenericResourceApiProvider.class );
+    private final String appName = "generic-resource-api";
+
+    private final ExecutorService executor;
+
+    protected DataBroker dataBroker;
+    protected NotificationProviderService notificationService;
+    protected RpcProviderRegistry rpcRegistry;
+    protected BindingAwareBroker.RpcRegistration<GENERICRESOURCEAPIService> rpcRegistration;
+
+    public GenericResourceApiProvider(DataBroker dataBroker2,
+            NotificationProviderService notificationProviderService,
+            RpcProviderRegistry rpcProviderRegistry) {
+        this.log.info( "Creating provider for " + appName );
+        executor = Executors.newFixedThreadPool(1);
+        dataBroker = dataBroker2;
+        notificationService = notificationProviderService;
+        rpcRegistry = rpcProviderRegistry;
+        initialize();
+
+    }
+
+    public void initialize(){
+        log.info( "Initializing provider for " + appName );
+        // Create the top level containers
+        createContainers();
+        try {
+            GenericResourceApiUtil.loadProperties();
+        } catch (Exception e) {
+            log.error("Caught Exception while trying to load properties file");
+        }
+        rpcRegistration = rpcRegistry.addRpcImplementation(GENERICRESOURCEAPIService.class, this);
+
+        log.info( "Initialization complete for " + appName );
+    }
+
+
+    protected void initializeChild() {
+        //Override if you have custom initialization intelligence
+    }
+
+
+    @Override
+    public void close() throws Exception {
+        log.info( "Closing provider for " + appName );
+        executor.shutdown();
+        rpcRegistration.close();
+        log.info( "Successfully closed provider for " + appName );
+    }
+
+    private static class Iso8601Util
+    {
+        private static TimeZone tz = TimeZone.getTimeZone("UTC");
+        private static DateFormat df = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ss.SSS'Z'");
+
+        static { df.setTimeZone(tz); }
+
+        private static String now() {
+            return df.format(new Date());
+        }
+    }
+
+
+    public void setDataBroker(DataBroker dataBroker) {
+        this.dataBroker = dataBroker;
+        if( log.isDebugEnabled() ){
+            log.debug( "DataBroker set to " + (dataBroker==null?"null":"non-null") + "." );
+        }
+    }
+
+    public void setNotificationService(
+            NotificationProviderService notificationService) {
+        this.notificationService = notificationService;
+        if( log.isDebugEnabled() ){
+            log.debug( "Notification Service set to " + (notificationService==null?"null":"non-null") + "." );
+        }
+    }
+
+    public void setRpcRegistry(RpcProviderRegistry rpcRegistry) {
+        this.rpcRegistry = rpcRegistry;
+        if( log.isDebugEnabled() ){
+            log.debug( "RpcRegistry set to " + (rpcRegistry==null?"null":"non-null") + "." );
+        }
+    }
+
+    private void createContainers() {
+
+        final WriteTransaction t = dataBroker.newReadWriteTransaction();
+
+        // Create the service-instance container
+        t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(Services.class),
+                new ServicesBuilder().build());
+        t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(Services.class),
+                new ServicesBuilder().build());
+
+        // Create the PreloadVnfs container
+        t.merge(LogicalDatastoreType.CONFIGURATION, InstanceIdentifier.create(PreloadVnfs.class),
+                new PreloadVnfsBuilder().build());
+        t.merge(LogicalDatastoreType.OPERATIONAL, InstanceIdentifier.create(PreloadVnfs.class),
+                new PreloadVnfsBuilder().build());
+
+        try {
+            CheckedFuture<Void, TransactionCommitFailedException> checkedFuture = t.submit();
+            checkedFuture.get();
+            log.info("Create Containers succeeded!: ");
+
+        } catch (InterruptedException | ExecutionException e) {
+            log.error("Create Containers Failed: " + e);
+            e.printStackTrace();
+        }
+    }
+
+    private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder, String errorCode, String errorMessage, String ackFinal)
+    {
+        serviceStatusBuilder.setResponseCode(errorCode);
+        serviceStatusBuilder.setResponseMessage(errorMessage);
+        serviceStatusBuilder.setFinalIndicator(ackFinal);
+        serviceStatusBuilder.setResponseTimestamp(Iso8601Util.now());
+    }
+
+    private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder,  RequestInformation requestInformation)
+    {
+        if (requestInformation != null && requestInformation.getRequestAction() != null) {
+            serviceStatusBuilder.setAction(requestInformation.getRequestAction().toString());
+        }
+
+        /*
+        if (requestInformation != null && requestInformation.getRequestSubAction() != null) {
+            switch (requestInformation.getRequestSubAction())
+            {
+                case SUPP:
+                    serviceStatusBuilder.setVnfsdnSubaction(VnfsdnSubaction.SUPP);
+                    break;
+                case CANCEL:
+                    serviceStatusBuilder.setVnfsdnSubaction(VnfsdnSubaction.CANCEL);
+                    break;
+                default:
+                    log.error("Unknown RequestSubAction: " + requestInformation.getRequestSubAction() );
+                    break;
+            };
+        }
+        */
+    }
+
+    private void setServiceStatus(ServiceStatusBuilder serviceStatusBuilder,  SdncRequestHeader requestHeader)
+    {
+        if (requestHeader != null && requestHeader.getSvcAction() != null) {
+            switch (requestHeader.getSvcAction())
+            {
+                case Assign:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Assign);
+                    break;
+                case Unassign:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Unassign);
+                    break;
+                case Activate:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Activate);
+                    break;
+                case Deactivate:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Deactivate);
+                    break;
+                case Delete:
+                    serviceStatusBuilder.setRpcAction(RpcAction.Delete);
+                    break;
+                default:
+                    log.error("Unknown SvcAction: " + requestHeader.getSvcAction() );
+                    break;
+            };
+        }
+    }
+
+    private void getServiceData(String siid, ServiceDataBuilder serviceDataBuilder)
+    {
+        // default to config
+        getServiceData(siid,serviceDataBuilder,LogicalDatastoreType.CONFIGURATION);
+    }
+
+
+    private void getServiceData(String siid, ServiceDataBuilder serviceDataBuilder, LogicalDatastoreType type)
+    {
+        // See if any data exists yet for this siid, if so grab it.
+        InstanceIdentifier serviceInstanceIdentifier =
+                InstanceIdentifier.<Services>builder(Services.class)
+                .child(Service.class, new ServiceKey(siid)).toInstance();
+        ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction();
+        Optional<Service> data = null;
+        try {
+            data = (Optional<Service>) readTx.read(type, serviceInstanceIdentifier).get();
+        } catch (InterruptedException | ExecutionException e) {
+            log.error("Caught Exception reading MD-SAL ("+type+") for ["+siid+"] " ,e);
+        }
+
+        if (data.isPresent()) {
+            ServiceData serviceData = (ServiceData) data.get().getServiceData();
+            if (serviceData != null) {
+                log.info("Read MD-SAL ("+type+") data for ["+siid+"] ServiceData: " + serviceData);
+                serviceDataBuilder.setSdncRequestHeader(serviceData.getSdncRequestHeader());
+                serviceDataBuilder.setRequestInformation(serviceData.getRequestInformation());
+                serviceDataBuilder.setServiceInformation(serviceData.getServiceInformation());
+                serviceDataBuilder.setServiceRequestInput(serviceData.getServiceRequestInput());
+                serviceDataBuilder.setServiceTopology(serviceData.getServiceTopology());
+                serviceDataBuilder.setServiceLevelOperStatus(serviceData.getServiceLevelOperStatus());
+                serviceDataBuilder.setNetworks(serviceData.getNetworks());
+                serviceDataBuilder.setVnfs(serviceData.getVnfs());
+                serviceDataBuilder.setProvidedAllottedResources(serviceData.getProvidedAllottedResources());
+                serviceDataBuilder.setConsumedAllottedResources(serviceData.getConsumedAllottedResources());
+                // service-instance-id needs to be set
+            } else {
+                log.info("No service-data found in MD-SAL ("+type+") for ["+siid+"] ");
+            }
+        } else {
+            log.info("No data found in MD-SAL ("+type+") for ["+siid+"] ");
+        }
+    }
+
+    private void getPreloadData(String vnf_name, String vnf_type, PreloadDataBuilder preloadDataBuilder)
+    {
+        // default to config
+        getPreloadData(vnf_name, vnf_type ,preloadDataBuilder,LogicalDatastoreType.CONFIGURATION);
+    }
+
+    private void getPreloadData(String preload_name, String preload_type, PreloadDataBuilder preloadDataBuilder, LogicalDatastoreType type)
+    {
+        // See if any data exists yet for this name/type, if so grab it.
+        InstanceIdentifier preloadInstanceIdentifier =
+                InstanceIdentifier.<PreloadVnfs>builder(PreloadVnfs.class)
+                .child(VnfPreloadList.class, new VnfPreloadListKey(preload_name, preload_type)).toInstance();
+        ReadOnlyTransaction readTx = dataBroker.newReadOnlyTransaction();
+        Optional<VnfPreloadList> data = null;
+        try {
+            data = (Optional<VnfPreloadList>) readTx.read(type, preloadInstanceIdentifier).get();
+        } catch (InterruptedException | ExecutionException e) {
+            log.error("Caught Exception reading MD-SAL ("+type+") for ["+preload_name+","+preload_type+"] " ,e);
+        }
+
+        if ( data.isPresent()) {
+            PreloadData preloadData = (PreloadData) data.get().getPreloadData();
+            if (preloadData != null) {
+                log.info("Read MD-SAL ("+type+") data for ["+preload_name+","+preload_type+"] PreloadData: " + preloadData);
+                preloadDataBuilder.setVnfTopologyInformation(preloadData.getVnfTopologyInformation());
+                preloadDataBuilder.setNetworkTopologyInformation(preloadData.getNetworkTopologyInformation());
+                preloadDataBuilder.setOperStatus(preloadData.getOperStatus());
+            } else {
+                log.info("No preload-data found in MD-SAL ("+type+") for ["+preload_name+","+preload_type+"] ");
+            }
+        } else {
+            log.info("No data found in MD-SAL ("+type+") for ["+preload_name+","+preload_type+"] ");
+        }
+    }
+
+    private void SaveService (final Service entry, boolean merge, LogicalDatastoreType storeType) throws IllegalStateException {
+        // Each entry will be identifiable by a unique key, we have to create that identifier
+        InstanceIdentifier.InstanceIdentifierBuilder<Service> serviceBuilder =
+                InstanceIdentifier.<Services>builder(Services.class)
+                .child(Service.class, entry.getKey());
+        InstanceIdentifier<Service> path = serviceBuilder.toInstance();
+
+        int tries = 2;
+        while(true) {
+            try {
+                WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+                if (merge) {
+                    tx.merge(storeType, path, entry);
+                } else {
+                    tx.put(storeType, path, entry);
+                }
+                tx.submit().checkedGet();
+                log.debug("Update DataStore succeeded");
+                break;
+            } catch (final TransactionCommitFailedException e) {
+                if(e instanceof OptimisticLockFailedException) {
+                    if(--tries <= 0) {
+                        log.debug("Got OptimisticLockFailedException on last try - failing ");
+                        throw new IllegalStateException(e);
+                    }
+                    log.debug("Got OptimisticLockFailedException - trying again ");
+                } else {
+                    log.debug("Update DataStore failed");
+                    throw new IllegalStateException(e);
+                }
+            }
+        }
+    }
+
+    private void DeleteService(final Service entry, LogicalDatastoreType storeType) throws IllegalStateException {
+        // Each entry will be identifiable by a unique key, we have to create
+        // that identifier
+        InstanceIdentifier.InstanceIdentifierBuilder<Service> serviceListIdBuilder = InstanceIdentifier.<Services> builder(Services.class).child(Service.class, entry.getKey());
+        InstanceIdentifier<Service> path = serviceListIdBuilder.toInstance();
+
+        int tries = 2;
+        while (true) {
+            try {
+                WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+                tx.delete(storeType, path);
+                tx.submit().checkedGet();
+                log.debug("DataStore delete succeeded");
+                break;
+            } catch (final TransactionCommitFailedException e) {
+                if (e instanceof OptimisticLockFailedException) {
+                    if (--tries <= 0) {
+                        log.debug("Got OptimisticLockFailedException on last try - failing ");
+                        throw new IllegalStateException(e);
+                    }
+                    log.debug("Got OptimisticLockFailedException - trying again ");
+                } else {
+                    log.debug("Update DataStore failed");
+                    throw new IllegalStateException(e);
+                }
+            }
+        }
+    }
+
+    private void SavePreloadList(final VnfPreloadList entry, boolean merge, LogicalDatastoreType storeType) throws IllegalStateException{
+
+        // Each entry will be identifiable by a unique key, we have to create that identifier
+        InstanceIdentifier.InstanceIdentifierBuilder<VnfPreloadList> vnfPreloadListBuilder =
+                InstanceIdentifier.<PreloadVnfs>builder(PreloadVnfs.class)
+                .child(VnfPreloadList.class, entry.getKey());
+        InstanceIdentifier<VnfPreloadList> path = vnfPreloadListBuilder.toInstance();
+        int tries = 2;
+        while(true) {
+            try {
+                WriteTransaction tx = dataBroker.newWriteOnlyTransaction();
+                if (merge) {
+                    tx.merge(storeType, path, entry);
+                } else {
+                    tx.put(storeType, path, entry);
+                }
+                tx.submit().checkedGet();
+                log.debug("Update DataStore succeeded");
+                break;
+            } catch (final TransactionCommitFailedException e) {
+                if(e instanceof OptimisticLockFailedException) {
+                    if(--tries <= 0) {
+                        log.debug("Got OptimisticLockFailedException on last try - failing ");
+                        throw new IllegalStateException(e);
+                    }
+                    log.debug("Got OptimisticLockFailedException - trying again ");
+                } else {
+                    log.debug("Update DataStore failed");
+                    throw new IllegalStateException(e);
+                }
+            }
+        }
+    }
+
+       @Override
+       public Future<RpcResult<ServiceTopologyOperationOutput>> serviceTopologyOperation(
+                       ServiceTopologyOperationInput input) {
+
+               final String SVC_OPERATION = "service-topology-operation";
+               ServiceData serviceData = null;
+               ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+               Properties parms = new Properties();
+
+               log.info( SVC_OPERATION +" called." );
+               // create a new response object
+               ServiceTopologyOperationOutputBuilder responseBuilder = new ServiceTopologyOperationOutputBuilder();
+
+               if(input == null ||
+            input.getServiceInformation() == null ||
+                input.getServiceInformation().getServiceInstanceId() == null ||
+                    input.getServiceInformation().getServiceInstanceId().length() == 0)
+        {
+                       log.debug("exiting " +SVC_OPERATION+ " because of null or empty service-instance-id");
+                       responseBuilder.setResponseCode("404");
+                       responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
+                       responseBuilder.setAckFinalIndicator("Y");
+                       RpcResult<ServiceTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<ServiceTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Grab the service instance ID from the input buffer
+               String siid = input.getServiceInformation().getServiceInstanceId();
+
+               if (input.getSdncRequestHeader() != null) {
+                       responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+               }
+
+               ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+               getServiceData(siid,serviceDataBuilder);
+
+               ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+               getServiceData(siid,operDataBuilder, LogicalDatastoreType.OPERATIONAL );
+
+               // Set the serviceStatus based on input
+               setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+               setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+               /*
+               // setup a service-data object builder
+               // ACTION service-topology-operation
+               // INPUT:
+               //  USES uses service-operation-information
+               // OUTPUT:
+               //  uses topology-response-common;
+        //  uses service-response-information;
+        */
+
+               log.info("Adding INPUT data for "+SVC_OPERATION+" ["+siid+"] input: " + input);
+               ServiceTopologyOperationInputBuilder inputBuilder = new ServiceTopologyOperationInputBuilder(input);
+               GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+               log.info("Adding OPERATIONAL data for "+SVC_OPERATION+" ["+siid+"] operational-data: " + operDataBuilder.build());
+               GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
+
+               // Call SLI sync method
+               // Get SvcLogicService reference
+
+               GenericResourceApiSvcLogicServiceClient svcLogicClient = new GenericResourceApiSvcLogicServiceClient();
+               Properties respProps = null;
+
+               String errorCode = "200";
+               String errorMessage = null;
+               String ackFinal = "Y";
+        String serviceObjectPath = null;
+
+               try
+               {
+                       if (svcLogicClient.hasGraph(appName, SVC_OPERATION , null, "sync"))
+                       {
+
+                               try
+                               {
+                                       respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
+                               }
+                               catch (Exception e)
+                               {
+                                       log.error("Caught exception executing service logic for "+ SVC_OPERATION, e);
+                                       errorMessage = e.getMessage();
+                                       errorCode = "500";
+                               }
+                       } else {
+                               errorMessage = "No service logic active for "+ appName +": '" + SVC_OPERATION + "'";
+                               errorCode = "503";
+                       }
+               }
+               catch (Exception e)
+               {
+                       errorCode = "500";
+                       errorMessage = e.getMessage();
+                       log.error("Caught exception looking for service logic", e);
+               }
+
+
+               if (respProps != null)
+               {
+                       errorCode = respProps.getProperty("error-code");
+                       errorMessage = respProps.getProperty("error-message");
+                       ackFinal = respProps.getProperty("ack-final", "Y");
+            serviceObjectPath = respProps.getProperty("service-object-path");
+               }
+
+               setServiceStatus(serviceStatusBuilder,errorCode, errorMessage, ackFinal);
+               serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+               //serviceStatusBuilder.setRpcName(RpcName.ServiceTopologyOperation);
+               serviceStatusBuilder.setRpcName(SVC_OPERATION);
+
+               if ( errorCode != null && errorCode.length() != 0 && !( errorCode.equals("0")|| errorCode.equals("200"))) {
+                       responseBuilder.setResponseCode(errorCode);
+                       responseBuilder.setResponseMessage(errorMessage);
+                       responseBuilder.setAckFinalIndicator(ackFinal);
+
+                       ServiceBuilder serviceBuilder = new ServiceBuilder();
+                       serviceBuilder.setServiceInstanceId(siid);
+                       serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+                       try {
+                               SaveService (serviceBuilder.build(), true,LogicalDatastoreType.CONFIGURATION);
+                       } catch (Exception e) {
+                               log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] \n",e);
+                       }
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+                       RpcResult<ServiceTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<ServiceTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Got success from SLI
+               try {
+                       serviceData = serviceDataBuilder.build();
+                       log.info("Updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] ServiceData: " + serviceData);
+
+                       // service object
+                       ServiceBuilder serviceBuilder = new ServiceBuilder();
+                       serviceBuilder.setServiceData(serviceData);
+                       serviceBuilder.setServiceInstanceId(siid);
+                       serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+                       SaveService (serviceBuilder.build(), false,LogicalDatastoreType.CONFIGURATION);
+
+                       if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null)
+                       {
+                               // Only update operational tree on delete
+                               if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete))
+                               {
+                                       log.info("Delete from both CONFIGURATION and OPERATIONAL tree.");
+                       DeleteService(serviceBuilder.build(), LogicalDatastoreType.OPERATIONAL);
+                       DeleteService(serviceBuilder.build(), LogicalDatastoreType.CONFIGURATION);
+                               }
+                       }
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+               } catch (Exception e) {
+                       log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] \n",e);
+                       responseBuilder.setResponseCode("500");
+                       responseBuilder.setResponseMessage(e.toString());
+                       responseBuilder.setAckFinalIndicator("Y");
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+                       RpcResult<ServiceTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<ServiceTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Update succeeded
+               responseBuilder.setResponseCode(errorCode);
+               responseBuilder.setAckFinalIndicator(ackFinal);
+               if (errorMessage != null)
+               {
+                       responseBuilder.setResponseMessage(errorMessage);
+               }
+               log.info("Updated MD-SAL for "+SVC_OPERATION+" ["+siid+"] ");
+               log.info("Returned SUCCESS for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+
+               RpcResult<ServiceTopologyOperationOutput> rpcResult =
+            RpcResultBuilder.<ServiceTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+               return Futures.immediateFuture(rpcResult);
+       }
+
+       @Override
+       public Future<RpcResult<VnfTopologyOperationOutput>> vnfTopologyOperation(
+                       VnfTopologyOperationInput input) {
+
+               final String SVC_OPERATION = "vnf-topology-operation";
+               ServiceData serviceData = null;
+               ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+               Properties parms = new Properties();
+
+               log.info( SVC_OPERATION +" called." );
+               // create a new response object
+               VnfTopologyOperationOutputBuilder responseBuilder = new VnfTopologyOperationOutputBuilder();
+
+               if(input == null ||
+            input.getServiceInformation() == null ||
+                input.getServiceInformation().getServiceInstanceId() == null ||
+                    input.getServiceInformation().getServiceInstanceId().length() == 0)
+        {
+                       log.debug("exiting " +SVC_OPERATION+ " because of null or empty service-instance-id");
+                       responseBuilder.setResponseCode("404");
+                       responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
+                       responseBuilder.setAckFinalIndicator("Y");
+                       RpcResult<VnfTopologyOperationOutput> rpcResult =
+                                       RpcResultBuilder.<VnfTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       // return error
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Grab the service instance ID from the input buffer
+               String siid = input.getServiceInformation().getServiceInstanceId();
+
+               if (input.getSdncRequestHeader() != null) {
+                       responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+               }
+
+               if(input.getVnfInformation() == null ||
+                input.getVnfInformation().getVnfId() == null ||
+                    input.getVnfInformation().getVnfId().length() == 0)
+        {
+                       log.debug("exiting " +SVC_OPERATION+ " because of null or empty vnf-id");
+                       responseBuilder.setResponseCode("404");
+                       responseBuilder.setResponseMessage("invalid input, null or empty vnf-id");
+                       responseBuilder.setAckFinalIndicator("Y");
+                       RpcResult<VnfTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<VnfTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+        /* Mobility wont use vipr intf in 1707
+
+               String preload_name  = null;
+               String preload_type = null;
+        if (input.getVnfRequestInput() != null &&
+                input.getVnfRequestInput().getVnfName() != null && input.getVnfRequestInput().getVnfName().length() != 0) {
+            preload_name  = input.getVnfRequestInput().getVnfName();
+        }
+        if (input.getVnfInformation().getVnfType() != null &&
+                input.getVnfInformation().getVnfType().length() != 0) {
+                   preload_type = input.getVnfInformation().getVnfType();
+        }
+
+               PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
+        if (preload_name != null && preload_type != null) {
+                   getPreloadData(preload_name, preload_type, preloadDataBuilder);
+        }
+        else {
+            log.info("vnf-name and vnf-type not present in the request");
+        }
+        */
+
+               ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+               getServiceData(siid,serviceDataBuilder);
+
+               ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+               getServiceData(siid,operDataBuilder, LogicalDatastoreType.OPERATIONAL );
+
+               // Set the serviceStatus based on input
+               setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+               setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+               //
+               // setup a service-data object builder
+               // ACTION vnf-topology-operation
+               // INPUT:
+               //  USES sdnc-request-header;
+               //  USES request-information;
+               //  USES service-information;
+               //  USES vnf-request-information
+               // OUTPUT:
+               //  USES vnf-topology-response-body;
+               //  USES vnf-information
+               //  USES service-information
+               //
+               // container service-data
+        //   uses vnf-configuration-information;
+        //   uses oper-status;
+
+               log.info("Adding INPUT data for "+SVC_OPERATION+" ["+siid+"] input: " + input);
+               VnfTopologyOperationInputBuilder inputBuilder = new VnfTopologyOperationInputBuilder(input);
+               GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+               log.info("Adding OPERATIONAL data for "+SVC_OPERATION+" ["+siid+"] operational-data: " + operDataBuilder.build());
+               GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
+
+        /*
+               log.info("Adding CONFIG data for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] preload-data: " + preloadDataBuilder.build());
+               GenericResourceApiUtil.toProperties(parms, "preload-data", preloadDataBuilder);
+        */
+
+               // Call SLI sync method
+               // Get SvcLogicService reference
+
+               GenericResourceApiSvcLogicServiceClient svcLogicClient = new GenericResourceApiSvcLogicServiceClient();
+               Properties respProps = null;
+
+               String errorCode = "200";
+               String errorMessage = null;
+               String ackFinal = "Y";
+        String serviceObjectPath = null;
+
+               try
+               {
+                       if (svcLogicClient.hasGraph(appName, SVC_OPERATION , null, "sync"))
+                       {
+
+                               try
+                               {
+                                       respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
+                               }
+                               catch (Exception e)
+                               {
+                                       log.error("Caught exception executing service logic for "+ SVC_OPERATION, e);
+                                       errorMessage = e.getMessage();
+                                       errorCode = "500";
+                               }
+                       } else {
+                               errorMessage = "No service logic active for "+ appName +": '" + SVC_OPERATION + "'";
+                               errorCode = "503";
+                       }
+               }
+               catch (Exception e)
+               {
+                       errorCode = "500";
+                       errorMessage = e.getMessage();
+                       log.error("Caught exception looking for service logic", e);
+               }
+
+               if (respProps != null)
+               {
+                       errorCode = respProps.getProperty("error-code");
+                       errorMessage = respProps.getProperty("error-message");
+                       ackFinal = respProps.getProperty("ack-final", "Y");
+            serviceObjectPath = respProps.getProperty("vnf-object-path");
+               }
+
+               setServiceStatus(serviceStatusBuilder,errorCode, errorMessage, ackFinal);
+               serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+               //serviceStatusBuilder.setRpcName(RpcName.VnfTopologyOperation);
+               serviceStatusBuilder.setRpcName(SVC_OPERATION);
+
+               if ( errorCode != null && errorCode.length() != 0 && !( errorCode.equals("0")|| errorCode.equals("200"))) {
+                       responseBuilder.setResponseCode(errorCode);
+                       responseBuilder.setResponseMessage(errorMessage);
+                       responseBuilder.setAckFinalIndicator(ackFinal);
+
+                       ServiceBuilder serviceBuilder = new ServiceBuilder();
+                       serviceBuilder.setServiceInstanceId(siid);
+                       serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+                       try {
+                               SaveService (serviceBuilder.build(), true,LogicalDatastoreType.CONFIGURATION);
+                               if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null)
+                               {
+                                       // Only update operational tree on activate or delete
+                                       if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Delete) ||
+                                                       input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))
+                                       {
+                                               log.info("Updating OPERATIONAL tree.");
+                                               SaveService (serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+                                       }
+                               }
+                       } catch (Exception e) {
+                               log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] \n",e);
+                       }
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+                       RpcResult<VnfTopologyOperationOutput> rpcResult =
+                           RpcResultBuilder.<VnfTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       // return error
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Got success from SLI
+               try {
+                       serviceData = serviceDataBuilder.build();
+                       log.info("Updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] ServiceData: " + serviceData);
+
+                       // service object
+                       ServiceBuilder serviceBuilder = new ServiceBuilder();
+                       serviceBuilder.setServiceData(serviceData);
+                       serviceBuilder.setServiceInstanceId(siid);
+                       serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+                       SaveService (serviceBuilder.build(), false,LogicalDatastoreType.CONFIGURATION);
+
+                       if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null)
+                       {
+                               // Only update operational tree on Assign
+                               if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))
+                               {
+                                       log.info("Updating OPERATIONAL tree.");
+                                       SaveService (serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+                               }
+                       }
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+               } catch (Exception e) {
+                       log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] \n",e);
+                       responseBuilder.setResponseCode("500");
+                       responseBuilder.setResponseMessage(e.toString());
+                       responseBuilder.setAckFinalIndicator("Y");
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+                       RpcResult<VnfTopologyOperationOutput> rpcResult =
+                           RpcResultBuilder.<VnfTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Update succeeded
+               responseBuilder.setResponseCode(errorCode);
+               responseBuilder.setAckFinalIndicator(ackFinal);
+               if (errorMessage != null)
+               {
+                       responseBuilder.setResponseMessage(errorMessage);
+               }
+               log.info("Updated MD-SAL for "+SVC_OPERATION+" ["+siid+"] ");
+               log.info("Returned SUCCESS for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+
+               RpcResult<VnfTopologyOperationOutput> rpcResult =
+                   RpcResultBuilder.<VnfTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+               // return success
+               return Futures.immediateFuture(rpcResult);
+       }
+
+    @Override
+    public Future<RpcResult<VfModuleTopologyOperationOutput>> vfModuleTopologyOperation(
+            VfModuleTopologyOperationInput input) {
+
+        final String SVC_OPERATION = "vf-module-topology-operation";
+        ServiceData serviceData = null;
+        ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+        Properties parms = new Properties();
+
+        log.info( SVC_OPERATION +" called." );
+        // create a new response object
+        VfModuleTopologyOperationOutputBuilder responseBuilder = new VfModuleTopologyOperationOutputBuilder();
+
+        if(input == null ||
+            input.getServiceInformation() == null ||
+                input.getServiceInformation().getServiceInstanceId() == null ||
+                    input.getServiceInformation().getServiceInstanceId().length() == 0)
+        {
+            log.debug("exiting " +SVC_OPERATION+ " because of null or empty service-instance-id");
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult =
+                    RpcResultBuilder.<VfModuleTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        if(input.getVnfInformation() == null ||
+                input.getVnfInformation().getVnfId() == null ||
+                    input.getVnfInformation().getVnfId().length() == 0)
+        {
+            log.debug("exiting " +SVC_OPERATION+ " because of null or empty vnf-id");
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage("invalid input, null or empty vnf-id");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<VfModuleTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        if(input.getVfModuleInformation() == null ||
+                input.getVfModuleInformation().getVfModuleId() == null ||
+                    input.getVfModuleInformation().getVfModuleId().length() == 0)
+        {
+            log.debug("exiting " +SVC_OPERATION+ " because of null or empty vf-module-id");
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage("invalid input, vf-module-id is null or empty");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<VfModuleTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the service instance ID from the input buffer
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+
+        /*
+        String preload_name  = null;
+        String preload_type = null;
+
+        preload_name  = input.getVfModuleRequestInput().getVfModuleName();
+
+        if(input.getVfModuleInformation().getVfModuleType() != null &&
+                    input.getVfModuleInformation().getVfModuleType().length() != 0) {
+            preload_type = input.getVfModuleInformation().getVfModuleType();
+        }
+
+        PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
+        if (preload_name != null && preload_type != null) {
+            getPreloadData(preload_name, preload_type, preloadDataBuilder);
+        }
+        else {
+            log.debug("vf-module-name and vf-module-type not present in the request.");
+        }
+        */
+
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid,serviceDataBuilder);
+
+        ServiceDataBuilder operDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid,operDataBuilder, LogicalDatastoreType.OPERATIONAL );
+
+        // Set the serviceStatus based on input
+        setServiceStatus(serviceStatusBuilder, input.getSdncRequestHeader());
+        setServiceStatus(serviceStatusBuilder, input.getRequestInformation());
+
+        //
+        // setup a service-data object builder
+        // ACTION vnf-topology-operation
+        // INPUT:
+        //  USES sdnc-request-header;
+        //  USES request-information;
+        //  USES service-information;
+        //  USES vnf-request-information
+        // OUTPUT:
+        //  USES vnf-topology-response-body;
+        //  USES vnf-information
+        //  USES service-information
+        //
+        // container service-data
+        //   uses vnf-configuration-information;
+        //   uses oper-status;
+
+        log.info("Adding INPUT data for "+SVC_OPERATION+" ["+siid+"] input: " + input);
+        VfModuleTopologyOperationInputBuilder inputBuilder = new VfModuleTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+        log.info("Adding OPERATIONAL data for "+SVC_OPERATION+" ["+siid+"] operational-data: " + operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
+
+        /*
+        log.info("Adding CONFIG data for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] preload-data: " +preloadDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, "preload-data", preloadDataBuilder);
+        */
+
+        // Call SLI sync method
+        // Get SvcLogicService reference
+
+        GenericResourceApiSvcLogicServiceClient svcLogicClient = new GenericResourceApiSvcLogicServiceClient();
+        Properties respProps = null;
+
+        String errorCode = "200";
+        String errorMessage = null;
+        String ackFinal = "Y";
+        String serviceObjectPath = null;
+
+        try
+        {
+            if (svcLogicClient.hasGraph(appName, SVC_OPERATION , null, "sync"))
+            {
+
+                try
+                {
+                    respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
+                }
+                catch (Exception e)
+                {
+                    log.error("Caught exception executing service logic for "+ SVC_OPERATION, e);
+                    errorMessage = e.getMessage();
+                    errorCode = "500";
+                }
+            } else {
+                errorMessage = "No service logic active for "+ appName +": '" + SVC_OPERATION + "'";
+                errorCode = "503";
+            }
+        }
+        catch (Exception e)
+        {
+            errorCode = "500";
+            errorMessage = e.getMessage();
+            log.error("Caught exception looking for service logic", e);
+        }
+
+        if (respProps != null)
+        {
+            errorCode = respProps.getProperty("error-code");
+            errorMessage = respProps.getProperty("error-message");
+            ackFinal = respProps.getProperty("ack-final", "Y");
+            serviceObjectPath = respProps.getProperty("vf-module-object-path");
+        }
+
+        setServiceStatus(serviceStatusBuilder,errorCode, errorMessage, ackFinal);
+        serviceStatusBuilder.setRequestStatus(RequestStatus.Synccomplete);
+        serviceStatusBuilder.setRpcName(SVC_OPERATION);
+
+        if ( errorCode != null && errorCode.length() != 0 && !( errorCode.equals("0")|| errorCode.equals("200"))) {
+            responseBuilder.setResponseCode(errorCode);
+            responseBuilder.setResponseMessage(errorMessage);
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            try {
+                SaveService (serviceBuilder.build(), true,LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] \n",e);
+            }
+            log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult =
+                    RpcResultBuilder.<VfModuleTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            // return error
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            serviceData = serviceDataBuilder.build();
+            log.info("Updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] ServiceData: " + serviceData);
+
+            // service object
+            ServiceBuilder serviceBuilder = new ServiceBuilder();
+            serviceBuilder.setServiceData(serviceData);
+            //serviceBuilder.setServiceInstanceId(serviceData.getServiceTopology().getServiceTopologyIdentifier().getServiceInstanceId());
+            serviceBuilder.setServiceInstanceId(siid);
+            serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+            SaveService (serviceBuilder.build(), false,LogicalDatastoreType.CONFIGURATION);
+
+                       if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null)
+                       {
+                               // Only update operational tree on activate or delete
+                               if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign) ||
+                                               input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))
+                               {
+                                       log.info("Updating OPERATIONAL tree.");
+                                       SaveService (serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+                               }
+                       }
+
+            ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+            serviceResponseInformationBuilder.setInstanceId(siid);
+            serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+            responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+        } catch (Exception e) {
+            log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] \n",e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.toString());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+            RpcResult<VfModuleTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<VfModuleTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(errorCode);
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        if (errorMessage != null)
+        {
+            responseBuilder.setResponseMessage(errorMessage);
+        }
+        log.info("Updated MD-SAL for "+SVC_OPERATION+" ["+siid+"] ");
+        log.info("Returned SUCCESS for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+
+        RpcResult<VfModuleTopologyOperationOutput> rpcResult =
+            RpcResultBuilder.<VfModuleTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+        // return success
+        return Futures.immediateFuture(rpcResult);
+    }
+
+       @Override
+       public Future<RpcResult<NetworkTopologyOperationOutput>> networkTopologyOperation(
+                       NetworkTopologyOperationInput input) {
+
+               final String SVC_OPERATION = "network-topology-operation";
+               ServiceData serviceData = null;
+               ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+               Properties parms = new Properties();
+
+               log.info( SVC_OPERATION +" called." );
+               // create a new response object
+               NetworkTopologyOperationOutputBuilder responseBuilder = new NetworkTopologyOperationOutputBuilder();
+
+               if(input == null ||
+            input.getServiceInformation() == null ||
+                input.getServiceInformation().getServiceInstanceId() == null ||
+                    input.getServiceInformation().getServiceInstanceId().length() == 0)
+        {
+                       log.debug("exiting " +SVC_OPERATION+ " because of null or empty service-instance-id");
+                       responseBuilder.setResponseCode("404");
+                       responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
+                       responseBuilder.setAckFinalIndicator("Y");
+                       RpcResult<NetworkTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<NetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        // Get the service-instance service data from MD-SAL
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid,serviceDataBuilder);
+
+               if (input.getSdncRequestHeader() != null) {
+                       responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+               }
+
+        ServiceData sd = serviceDataBuilder.build();
+        if (sd == null || sd.getServiceLevelOperStatus() == null)
+        {
+                       log.debug("exiting " +SVC_OPERATION+ " because the service-instance does not have any service data in SDNC");
+                       responseBuilder.setResponseCode("404");
+                       responseBuilder.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
+                       responseBuilder.setAckFinalIndicator("Y");
+                       RpcResult<NetworkTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<NetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+
+       /*
+               //String preload_name  = null;
+               //String preload_type = null;
+        // If both network-name and network-type are present in request, get the preload network from MD-SAL
+        if (input.getNetworkRequestInput() != null &&
+                input.getNetworkRequestInput().getNetworkName() != null &&
+                    input.getNetworkRequestInput().getNetworkName().length() != 0) {
+            preload_name = input.getNetworkRequestInput().getNetworkName();
+        }
+        if (input.getNetworkInformation() != null &&
+                input.getNetworkInformation().getNetworkType() != null &&
+                    input.getNetworkInformation().getNetworkType().length() != 0) {
+            preload_type = input.getNetworkInformation().getNetworkType();
+        }
+
+               PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
+        if (preload_name != null && preload_type != null) {
+                   getPreloadData(preload_name, preload_type, preloadDataBuilder);
+        }
+        else {
+                       log.debug("network-name and network-type not present in request");
+        }
+        */
+
+               log.info("Adding INPUT data for "+SVC_OPERATION+" ["+siid+"] input: " + input);
+               NetworkTopologyOperationInputBuilder inputBuilder = new NetworkTopologyOperationInputBuilder(input);
+               GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+               // Call SLI sync method
+               // Get SvcLogicService reference
+
+               GenericResourceApiSvcLogicServiceClient svcLogicClient = new GenericResourceApiSvcLogicServiceClient();
+               Properties respProps = null;
+
+               String errorCode = "200";
+               String errorMessage = null;
+               String ackFinal = "Y";
+               String networkId = "error";
+        String serviceObjectPath = null;
+        String networkObjectPath = null;
+
+               try
+               {
+                       if (svcLogicClient.hasGraph(appName, SVC_OPERATION , null, "sync"))
+                       {
+
+                               try
+                               {
+                                       respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
+                               }
+                               catch (Exception e)
+                               {
+                                       log.error("Caught exception executing service logic for "+ SVC_OPERATION, e);
+                                       errorMessage = e.getMessage();
+                                       errorCode = "500";
+                               }
+                       } else {
+                               errorMessage = "No service logic active for "+ appName +": '" + SVC_OPERATION + "'";
+                               errorCode = "503";
+                       }
+               }
+               catch (Exception e)
+               {
+                       errorCode = "500";
+                       errorMessage = e.getMessage();
+                       log.error("Caught exception looking for service logic", e);
+               }
+
+
+               if (respProps != null)
+               {
+                       errorCode = respProps.getProperty("error-code");
+                       errorMessage = respProps.getProperty("error-message");
+                       ackFinal = respProps.getProperty("ack-final", "Y");
+                       networkId = respProps.getProperty("networkId");
+                       serviceObjectPath = respProps.getProperty("service-object-path");
+                       networkObjectPath = respProps.getProperty("network-object-path");
+               }
+
+               if ( errorCode != null && errorCode.length() != 0 && !( errorCode.equals("0")|| errorCode.equals("200"))) {
+                       responseBuilder.setResponseCode(errorCode);
+                       responseBuilder.setResponseMessage(errorMessage);
+                       responseBuilder.setAckFinalIndicator(ackFinal);
+
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+
+                       RpcResult<NetworkTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<NetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Got success from SLI
+               try {
+
+                       serviceData = serviceDataBuilder.build();
+                       log.info("Updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] ServiceData: " + serviceData);
+
+                       // service object
+                       ServiceBuilder serviceBuilder = new ServiceBuilder();
+                       serviceBuilder.setServiceData(serviceData);
+                       serviceBuilder.setServiceInstanceId(siid);
+                       serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+                       SaveService (serviceBuilder.build(), false,LogicalDatastoreType.CONFIGURATION);
+
+                       if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null)
+                       {
+                               // Only update operational tree on Activate
+                               if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))
+                {
+                                       log.info("Updating OPERATIONAL tree.");
+                                       SaveService (serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+                               }
+                       }
+
+                       NetworkResponseInformationBuilder networkResponseInformationBuilder = new NetworkResponseInformationBuilder();
+                       networkResponseInformationBuilder.setInstanceId(networkId);
+                       networkResponseInformationBuilder.setObjectPath(networkObjectPath);
+                       responseBuilder.setNetworkResponseInformation(networkResponseInformationBuilder.build());
+
+                       ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+                       serviceResponseInformationBuilder.setInstanceId(siid);
+                       serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+                       responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+               } catch (IllegalStateException e) {
+                       log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] \n",e);
+                       responseBuilder.setResponseCode("500");
+                       responseBuilder.setResponseMessage(e.toString());
+                       responseBuilder.setAckFinalIndicator("Y");
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+                       RpcResult<NetworkTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<NetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Update succeeded
+               responseBuilder.setResponseCode(errorCode);
+               responseBuilder.setAckFinalIndicator(ackFinal);
+               if (errorMessage != null)
+               {
+                       responseBuilder.setResponseMessage(errorMessage);
+               }
+               log.info("Updated MD-SAL for "+SVC_OPERATION+" ["+siid+"] ");
+               log.info("Returned SUCCESS for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+
+               RpcResult<NetworkTopologyOperationOutput> rpcResult =
+            RpcResultBuilder.<NetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+               return Futures.immediateFuture(rpcResult);
+       }
+
+       @Override
+       public Future<RpcResult<ContrailRouteTopologyOperationOutput>> contrailRouteTopologyOperation(
+                       ContrailRouteTopologyOperationInput input) {
+
+               final String SVC_OPERATION = "contrail-route-topology-operation";
+               ServiceData serviceData = null;
+               ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+               Properties parms = new Properties();
+
+               log.info( SVC_OPERATION +" called." );
+               // create a new response object
+               ContrailRouteTopologyOperationOutputBuilder responseBuilder = new ContrailRouteTopologyOperationOutputBuilder();
+
+               if(input == null ||
+            input.getServiceInformation() == null ||
+                input.getServiceInformation().getServiceInstanceId() == null ||
+                    input.getServiceInformation().getServiceInstanceId().length() == 0)
+        {
+                       log.debug("exiting " +SVC_OPERATION+ " because of null or empty service-instance-id");
+                       responseBuilder.setResponseCode("404");
+                       responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
+                       responseBuilder.setAckFinalIndicator("Y");
+                       RpcResult<ContrailRouteTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<ContrailRouteTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        // Get the service-instance service data from MD-SAL
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid,serviceDataBuilder);
+
+               if (input.getSdncRequestHeader() != null) {
+                       responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+               }
+
+        ServiceData sd = serviceDataBuilder.build();
+        if (sd == null || sd.getServiceLevelOperStatus() == null)
+        {
+                       log.debug("exiting " +SVC_OPERATION+ " because the service-instance does not have any service data in SDNC");
+                       responseBuilder.setResponseCode("404");
+                       responseBuilder.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
+                       responseBuilder.setAckFinalIndicator("Y");
+                       RpcResult<ContrailRouteTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<ContrailRouteTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               log.info("Adding INPUT data for "+SVC_OPERATION+" ["+siid+"] input: " + input);
+               ContrailRouteTopologyOperationInputBuilder inputBuilder = new ContrailRouteTopologyOperationInputBuilder(input);
+               GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+               // Call SLI sync method
+               // Get SvcLogicService reference
+
+               GenericResourceApiSvcLogicServiceClient svcLogicClient = new GenericResourceApiSvcLogicServiceClient();
+               Properties respProps = null;
+
+               String errorCode = "200";
+               String errorMessage = null;
+               String ackFinal = "Y";
+               String allottedResourceId = "error";
+        String serviceObjectPath = null;
+        String contrailRouteObjectPath = null;
+
+               try
+               {
+                       if (svcLogicClient.hasGraph(appName, SVC_OPERATION , null, "sync"))
+                       {
+
+                               try
+                               {
+                                       respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
+                               }
+                               catch (Exception e)
+                               {
+                                       log.error("Caught exception executing service logic for "+ SVC_OPERATION, e);
+                                       errorMessage = e.getMessage();
+                                       errorCode = "500";
+                               }
+                       } else {
+                               errorMessage = "No service logic active for "+ appName +": '" + SVC_OPERATION + "'";
+                               errorCode = "503";
+                       }
+               }
+               catch (Exception e)
+               {
+                       errorCode = "500";
+                       errorMessage = e.getMessage();
+                       log.error("Caught exception looking for service logic", e);
+               }
+
+
+               if (respProps != null)
+               {
+                       errorCode = respProps.getProperty("error-code");
+                       errorMessage = respProps.getProperty("error-message");
+                       ackFinal = respProps.getProperty("ack-final", "Y");
+                       allottedResourceId = respProps.getProperty("allotted-resource-id");
+                       serviceObjectPath = respProps.getProperty("service-object-path");
+                       contrailRouteObjectPath = respProps.getProperty("contrail-route-object-path");
+               }
+
+               if ( errorCode != null && errorCode.length() != 0 && !( errorCode.equals("0")|| errorCode.equals("200"))) {
+                       responseBuilder.setResponseCode(errorCode);
+                       responseBuilder.setResponseMessage(errorMessage);
+                       responseBuilder.setAckFinalIndicator(ackFinal);
+
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+
+                       RpcResult<ContrailRouteTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<ContrailRouteTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Got success from SLI
+               try {
+
+                       serviceData = serviceDataBuilder.build();
+                       log.info("Updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] ServiceData: " + serviceData);
+
+                       // service object
+                       ServiceBuilder serviceBuilder = new ServiceBuilder();
+                       serviceBuilder.setServiceData(serviceData);
+                       serviceBuilder.setServiceInstanceId(siid);
+                       serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+                       SaveService (serviceBuilder.build(), false,LogicalDatastoreType.CONFIGURATION);
+
+                       if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null)
+                       {
+                               // Only update operational tree on activate or delete
+                               if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign) ||
+                                               input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))
+                               {
+                                       log.info("Updating OPERATIONAL tree.");
+                                       SaveService (serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+                               }
+                       }
+
+                       ContrailRouteResponseInformationBuilder contrailRouteResponseInformationBuilder = new ContrailRouteResponseInformationBuilder();
+                       contrailRouteResponseInformationBuilder.setInstanceId(allottedResourceId);
+                       contrailRouteResponseInformationBuilder.setObjectPath(contrailRouteObjectPath);
+                       responseBuilder.setContrailRouteResponseInformation(contrailRouteResponseInformationBuilder.build());
+
+                       ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+                       serviceResponseInformationBuilder.setInstanceId(siid);
+                       serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+                       responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+               } catch (IllegalStateException e) {
+                       log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] \n",e);
+                       responseBuilder.setResponseCode("500");
+                       responseBuilder.setResponseMessage(e.toString());
+                       responseBuilder.setAckFinalIndicator("Y");
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+                       RpcResult<ContrailRouteTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<ContrailRouteTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Update succeeded
+               responseBuilder.setResponseCode(errorCode);
+               responseBuilder.setAckFinalIndicator(ackFinal);
+               if (errorMessage != null)
+               {
+                       responseBuilder.setResponseMessage(errorMessage);
+               }
+               log.info("Updated MD-SAL for "+SVC_OPERATION+" ["+siid+"] ");
+               log.info("Returned SUCCESS for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+
+               RpcResult<ContrailRouteTopologyOperationOutput> rpcResult =
+            RpcResultBuilder.<ContrailRouteTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+               return Futures.immediateFuture(rpcResult);
+       }
+
+       @Override
+       public Future<RpcResult<SecurityZoneTopologyOperationOutput>> securityZoneTopologyOperation(
+                       SecurityZoneTopologyOperationInput input) {
+
+               final String SVC_OPERATION = "security-zone-topology-operation";
+               ServiceData serviceData = null;
+               ServiceStatusBuilder serviceStatusBuilder = new ServiceStatusBuilder();
+               Properties parms = new Properties();
+
+               log.info( SVC_OPERATION +" called." );
+               // create a new response object
+               SecurityZoneTopologyOperationOutputBuilder responseBuilder = new SecurityZoneTopologyOperationOutputBuilder();
+
+               if(input == null ||
+            input.getServiceInformation() == null ||
+                input.getServiceInformation().getServiceInstanceId() == null ||
+                    input.getServiceInformation().getServiceInstanceId().length() == 0)
+        {
+                       log.debug("exiting " +SVC_OPERATION+ " because of null or empty service-instance-id");
+                       responseBuilder.setResponseCode("404");
+                       responseBuilder.setResponseMessage("invalid input, null or empty service-instance-id");
+                       responseBuilder.setAckFinalIndicator("Y");
+                       RpcResult<SecurityZoneTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<SecurityZoneTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+        String siid = input.getServiceInformation().getServiceInstanceId();
+
+        // Get the service-instance service data from MD-SAL
+        ServiceDataBuilder serviceDataBuilder = new ServiceDataBuilder();
+        getServiceData(siid,serviceDataBuilder);
+
+               if (input.getSdncRequestHeader() != null) {
+                       responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+               }
+
+        ServiceData sd = serviceDataBuilder.build();
+        if (sd == null || sd.getServiceLevelOperStatus() == null)
+        {
+                       log.debug("exiting " +SVC_OPERATION+ " because the service-instance does not have any service data in SDNC");
+                       responseBuilder.setResponseCode("404");
+                       responseBuilder.setResponseMessage("invalid input: the service-instance does not have any service data in SDNC");
+                       responseBuilder.setAckFinalIndicator("Y");
+                       RpcResult<SecurityZoneTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<SecurityZoneTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               log.info("Adding INPUT data for "+SVC_OPERATION+" ["+siid+"] input: " + input);
+               SecurityZoneTopologyOperationInputBuilder inputBuilder = new SecurityZoneTopologyOperationInputBuilder(input);
+               GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+
+               // Call SLI sync method
+               // Get SvcLogicService reference
+
+               GenericResourceApiSvcLogicServiceClient svcLogicClient = new GenericResourceApiSvcLogicServiceClient();
+               Properties respProps = null;
+
+               String errorCode = "200";
+               String errorMessage = null;
+               String ackFinal = "Y";
+               String allottedResourceId = "error";
+        String serviceObjectPath = null;
+        String securityZoneObjectPath = null;
+
+               try
+               {
+                       if (svcLogicClient.hasGraph(appName, SVC_OPERATION , null, "sync"))
+                       {
+
+                               try
+                               {
+                                       respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", serviceDataBuilder, parms);
+                               }
+                               catch (Exception e)
+                               {
+                                       log.error("Caught exception executing service logic for "+ SVC_OPERATION, e);
+                                       errorMessage = e.getMessage();
+                                       errorCode = "500";
+                               }
+                       } else {
+                               errorMessage = "No service logic active for "+ appName +": '" + SVC_OPERATION + "'";
+                               errorCode = "503";
+                       }
+               }
+               catch (Exception e)
+               {
+                       errorCode = "500";
+                       errorMessage = e.getMessage();
+                       log.error("Caught exception looking for service logic", e);
+               }
+
+
+               if (respProps != null)
+               {
+                       errorCode = respProps.getProperty("error-code");
+                       errorMessage = respProps.getProperty("error-message");
+                       ackFinal = respProps.getProperty("ack-final", "Y");
+                       allottedResourceId = respProps.getProperty("allotted-resource-id");
+                       serviceObjectPath = respProps.getProperty("service-object-path");
+                       securityZoneObjectPath = respProps.getProperty("security-zone-object-path");
+               }
+
+               if ( errorCode != null && errorCode.length() != 0 && !( errorCode.equals("0")|| errorCode.equals("200"))) {
+                       responseBuilder.setResponseCode(errorCode);
+                       responseBuilder.setResponseMessage(errorMessage);
+                       responseBuilder.setAckFinalIndicator(ackFinal);
+
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+
+                       RpcResult<SecurityZoneTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<SecurityZoneTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Got success from SLI
+               try {
+
+                       serviceData = serviceDataBuilder.build();
+                       log.info("Updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] ServiceData: " + serviceData);
+
+                       // service object
+                       ServiceBuilder serviceBuilder = new ServiceBuilder();
+                       serviceBuilder.setServiceData(serviceData);
+                       serviceBuilder.setServiceInstanceId(siid);
+                       serviceBuilder.setServiceStatus(serviceStatusBuilder.build());
+                       SaveService (serviceBuilder.build(), false,LogicalDatastoreType.CONFIGURATION);
+
+                       if (input.getSdncRequestHeader() != null && input.getSdncRequestHeader().getSvcAction() != null)
+                       {
+                               // Only update operational tree on activate or delete
+                               if (input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Unassign) ||
+                                               input.getSdncRequestHeader().getSvcAction().equals(SvcAction.Activate))
+                               {
+                                       log.info("Updating OPERATIONAL tree.");
+                                       SaveService (serviceBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+                               }
+                       }
+
+                       SecurityZoneResponseInformationBuilder securityZoneResponseInformationBuilder = new SecurityZoneResponseInformationBuilder();
+                       securityZoneResponseInformationBuilder.setInstanceId(allottedResourceId);
+                       securityZoneResponseInformationBuilder.setObjectPath(securityZoneObjectPath);
+                       responseBuilder.setSecurityZoneResponseInformation(securityZoneResponseInformationBuilder.build());
+
+                       ServiceResponseInformationBuilder serviceResponseInformationBuilder = new ServiceResponseInformationBuilder();
+                       serviceResponseInformationBuilder.setInstanceId(siid);
+                       serviceResponseInformationBuilder.setObjectPath(serviceObjectPath);
+                       responseBuilder.setServiceResponseInformation(serviceResponseInformationBuilder.build());
+
+               } catch (IllegalStateException e) {
+                       log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+siid+"] \n",e);
+                       responseBuilder.setResponseCode("500");
+                       responseBuilder.setResponseMessage(e.toString());
+                       responseBuilder.setAckFinalIndicator("Y");
+                       log.error("Returned FAILED for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+                       RpcResult<SecurityZoneTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<SecurityZoneTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                       return Futures.immediateFuture(rpcResult);
+               }
+
+               // Update succeeded
+               responseBuilder.setResponseCode(errorCode);
+               responseBuilder.setAckFinalIndicator(ackFinal);
+               if (errorMessage != null)
+               {
+                       responseBuilder.setResponseMessage(errorMessage);
+               }
+               log.info("Updated MD-SAL for "+SVC_OPERATION+" ["+siid+"] ");
+               log.info("Returned SUCCESS for "+SVC_OPERATION+" ["+siid+"] " + responseBuilder.build());
+
+               RpcResult<SecurityZoneTopologyOperationOutput> rpcResult =
+            RpcResultBuilder.<SecurityZoneTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+               return Futures.immediateFuture(rpcResult);
+       }
+
+    @Override
+    public Future<RpcResult<PreloadVnfTopologyOperationOutput>> preloadVnfTopologyOperation(
+            PreloadVnfTopologyOperationInput input) {
+
+        final String SVC_OPERATION = "preload-vnf-topology-operation";
+        PreloadData preloadData = null;
+        Properties parms = new Properties();
+
+        log.info( SVC_OPERATION +" called." );
+        // create a new response object
+        PreloadVnfTopologyOperationOutputBuilder responseBuilder = new PreloadVnfTopologyOperationOutputBuilder();
+
+        // Result from savePreloadData
+        final SettableFuture<RpcResult<Void>> futureResult = SettableFuture.create();
+
+        if(input == null || input.getVnfTopologyInformation() == null ||
+            input.getVnfTopologyInformation().getVnfTopologyIdentifier() == null) {
+                log.debug("exiting " +SVC_OPERATION+ " because of null input");
+                responseBuilder.setResponseCode("403");
+                responseBuilder.setResponseMessage("invalid input: input is null");
+                responseBuilder.setAckFinalIndicator("Y");
+                RpcResult<PreloadVnfTopologyOperationOutput> rpcResult =
+                    RpcResultBuilder.<PreloadVnfTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+                return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the name and type from the input buffer
+        String preload_name = input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfName();
+        String preload_type = input.getVnfTopologyInformation().getVnfTopologyIdentifier().getVnfType();
+
+        // Make sure we have a preload_name and preload_type
+        if(preload_name == null || preload_name.length() == 0 || preload_type == null || preload_type.length() == 0 ) {
+            log.debug("exiting "+ SVC_OPERATION + " vnf-name or vnf-type is null or empty");
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage("invalid input: vnf-name or vnf-type is null or empty");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<PreloadVnfTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<PreloadVnfTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+
+        PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
+        getPreloadData(preload_name, preload_type, preloadDataBuilder);
+
+        PreloadDataBuilder operDataBuilder = new PreloadDataBuilder();
+        getPreloadData(preload_name, preload_type, operDataBuilder, LogicalDatastoreType.OPERATIONAL );
+
+        // setup a preload-data object builder
+        // ACTION preload-vnf-topology-operation
+        // INPUT:
+        //  USES sdnc-request-header;
+        //  USES request-information;
+        //  uses vnf-topology-information;
+        // OUTPUT:
+        //  USES vnf-topology-response-body;
+        //
+        // container preload-data
+        //   uses vnf-topology-information;
+        //   uses network-topology-information;
+        //   uses oper-status;
+
+        log.info("Adding INPUT data for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] input: " + input);
+        PreloadVnfTopologyOperationInputBuilder inputBuilder = new PreloadVnfTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+        log.info("Adding OPERATIONAL data for "+SVC_OPERATION+" ["+preload_name+","+preload_type +"] operational-data: " + operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
+
+        // Call SLI sync method
+        // Get SvcLogicService reference
+
+        GenericResourceApiSvcLogicServiceClient svcLogicClient = new GenericResourceApiSvcLogicServiceClient();
+        Properties respProps = null;
+
+        String errorCode = "200";
+        String errorMessage = null;
+        String ackFinal = "Y";
+
+
+        try
+        {
+            if (svcLogicClient.hasGraph(appName, SVC_OPERATION , null, "sync"))
+            {
+
+                try
+                {
+                    respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", preloadDataBuilder, parms);
+                }
+                catch (Exception e)
+                {
+                    log.error("Caught exception executing service logic for "+ SVC_OPERATION, e);
+                    errorMessage = e.getMessage();
+                    errorCode = "500";
+                }
+            } else {
+                errorMessage = "No service logic active for "+ appName + ": '" + SVC_OPERATION + "'";
+                errorCode = "503";
+            }
+        }
+        catch (Exception e)
+        {
+            errorCode = "500";
+            errorMessage = e.getMessage();
+            log.error("Caught exception looking for service logic", e);
+        }
+
+
+        if (respProps != null)
+        {
+            errorCode = respProps.getProperty("error-code");
+            errorMessage = respProps.getProperty("error-message");
+            ackFinal = respProps.getProperty("ack-final", "Y");
+            // internalError = respProps.getProperty("internal-error", "false");
+        }
+
+        if ( errorCode != null && errorCode.length() != 0 && !( errorCode.equals("0")|| errorCode.equals("200"))) {
+
+            responseBuilder.setResponseCode(errorCode);
+            responseBuilder.setResponseMessage(errorMessage);
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
+            preloadVnfListBuilder.setVnfName(preload_name);
+            preloadVnfListBuilder.setVnfType(preload_type);
+            preloadVnfListBuilder.setPreloadData(preloadDataBuilder.build());
+            log.error("Returned FAILED for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] error code: '" + errorCode + "', Reason: '" + errorMessage + "'");
+            try {
+                SavePreloadList (preloadVnfListBuilder.build(), true,LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] \n",e);
+            }
+            log.debug("Sending Success rpc result due to external error");
+            RpcResult<PreloadVnfTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<PreloadVnfTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            preloadData = preloadDataBuilder.build();
+            log.info("Updating MD-SAL for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] preloadData: " + preloadData);
+            // svc-configuration-list
+            VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
+            preloadVnfListBuilder.setVnfName(preload_name);
+            preloadVnfListBuilder.setVnfType(preload_type);
+            preloadVnfListBuilder.setPreloadData(preloadData);
+
+            // merge flag sets to false to allow it to be overwritten (not appended)
+            SavePreloadList (preloadVnfListBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+            log.info("Updating OPERATIONAL tree.");
+            SavePreloadList (preloadVnfListBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+        } catch (Exception e) {
+            log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] \n",e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.toString());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error("Returned FAILED for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] " + responseBuilder.build());
+            RpcResult<PreloadVnfTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<PreloadVnfTopologyOperationOutput> status(false).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(errorCode);
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        if (errorMessage != null)
+        {
+            responseBuilder.setResponseMessage(errorMessage);
+        }
+        log.info("Updated MD-SAL for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] ");
+        log.info("Returned SUCCESS for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] " + responseBuilder.build());
+
+        RpcResult<PreloadVnfTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<PreloadVnfTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+        return Futures.immediateFuture(rpcResult);
+    }
+
+
+    @Override
+    public Future<RpcResult<PreloadNetworkTopologyOperationOutput>> preloadNetworkTopologyOperation(
+            PreloadNetworkTopologyOperationInput input) {
+
+        final String SVC_OPERATION = "preload-network-topology-operation";
+        PreloadData preloadData = null;
+        Properties parms = new Properties();
+
+        log.info( SVC_OPERATION +" called." );
+        // create a new response object
+        PreloadNetworkTopologyOperationOutputBuilder responseBuilder = new PreloadNetworkTopologyOperationOutputBuilder();
+
+        // Result from savePreloadData
+        final SettableFuture<RpcResult<Void>> futureResult = SettableFuture.create();
+
+        if(input == null || input.getNetworkTopologyInformation() == null ||
+            input.getNetworkTopologyInformation().getNetworkTopologyIdentifier() == null) {
+
+            log.debug("exiting " +SVC_OPERATION+ " because of null input");
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage("input is null");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<PreloadNetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Grab the name and type from the input buffer
+        String preload_name = input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkName();
+        String preload_type = input.getNetworkTopologyInformation().getNetworkTopologyIdentifier().getNetworkType();
+
+        // Make sure we have a preload_name and preload_type
+        if(preload_name == null || preload_name.length() == 0 || preload_type == null || preload_type.length() == 0 ) {
+            log.debug("exiting "+SVC_OPERATION+" because of invalid preload-name");
+            responseBuilder.setResponseCode("403");
+            responseBuilder.setResponseMessage("input, invalid preload-name");
+            responseBuilder.setAckFinalIndicator("Y");
+            RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<PreloadNetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        if (input.getSdncRequestHeader() != null) {
+            responseBuilder.setSvcRequestId(input.getSdncRequestHeader().getSvcRequestId());
+        }
+
+        PreloadDataBuilder preloadDataBuilder = new PreloadDataBuilder();
+        getPreloadData(preload_name, preload_type, preloadDataBuilder);
+
+        PreloadDataBuilder operDataBuilder = new PreloadDataBuilder();
+        getPreloadData(preload_name, preload_type, operDataBuilder, LogicalDatastoreType.OPERATIONAL );
+
+        //
+        // setup a preload-data object builder
+        // ACTION preload-network-topology-operation
+        // INPUT:
+        //  USES sdnc-request-header;
+        //  USES request-information;
+        //  uses network-topology-information;
+        // OUTPUT:
+        //  USES vnf-topology-response-body;
+        //
+        // container preload-data
+        //   uses vnf-topology-information;
+        //   uses network-topology-information;
+        //   uses oper-status;
+
+
+        log.info("Adding INPUT data for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] input: " + input);
+        PreloadNetworkTopologyOperationInputBuilder inputBuilder = new PreloadNetworkTopologyOperationInputBuilder(input);
+        GenericResourceApiUtil.toProperties(parms, inputBuilder.build());
+        log.info("Adding OPERATIONAL data for "+SVC_OPERATION+" ["+preload_name+","+preload_type +"] operational-data: " + operDataBuilder.build());
+        GenericResourceApiUtil.toProperties(parms, "operational-data", operDataBuilder);
+
+        // Call SLI sync method
+        // Get SvcLogicService reference
+
+        GenericResourceApiSvcLogicServiceClient svcLogicClient = new GenericResourceApiSvcLogicServiceClient();
+        Properties respProps = null;
+
+        String errorCode = "200";
+        String errorMessage = null;
+        String ackFinal = "Y";
+
+
+        try
+        {
+            if (svcLogicClient.hasGraph(appName, SVC_OPERATION , null, "sync"))
+            {
+
+                try
+                {
+                    respProps = svcLogicClient.execute(appName, SVC_OPERATION, null, "sync", preloadDataBuilder, parms);
+                }
+                catch (Exception e)
+                {
+                    log.error("Caught exception executing service logic for "+ SVC_OPERATION, e);
+                    errorMessage = e.getMessage();
+                    errorCode = "500";
+                }
+            } else {
+                errorMessage = "No service logic active for "+ appName +": '" + SVC_OPERATION + "'";
+                errorCode = "503";
+            }
+        }
+        catch (Exception e)
+        {
+            errorCode = "500";
+            errorMessage = e.getMessage();
+            log.error("Caught exception looking for service logic", e);
+        }
+
+
+        if (respProps != null)
+        {
+            errorCode = respProps.getProperty("error-code");
+            errorMessage = respProps.getProperty("error-message");
+            ackFinal = respProps.getProperty("ack-final", "Y");
+            // internalError = respProps.getProperty("internal-error", "false");
+        }
+
+        if ( errorCode != null && errorCode.length() != 0 && !( errorCode.equals("0")|| errorCode.equals("200"))) {
+
+            responseBuilder.setResponseCode(errorCode);
+            responseBuilder.setResponseMessage(errorMessage);
+            responseBuilder.setAckFinalIndicator(ackFinal);
+
+            VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
+            preloadVnfListBuilder.setVnfName(preload_name);
+            preloadVnfListBuilder.setVnfType(preload_type);
+            preloadVnfListBuilder.setPreloadData(preloadDataBuilder.build());
+            log.error("Returned FAILED for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] error code: '" + errorCode + "', Reason: '" + errorMessage + "'");
+            try {
+                SavePreloadList (preloadVnfListBuilder.build(),true,LogicalDatastoreType.CONFIGURATION);
+            } catch (Exception e) {
+                log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] \n",e);
+
+            }
+            log.debug("Sending Success rpc result due to external error");
+            RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<PreloadNetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Got success from SLI
+        try {
+            preloadData = preloadDataBuilder.build();
+            log.info("Updating MD-SAL for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] preloadData: " + preloadData);
+            // svc-configuration-list
+            VnfPreloadListBuilder preloadVnfListBuilder = new VnfPreloadListBuilder();
+            preloadVnfListBuilder.setVnfName(preload_name);
+            preloadVnfListBuilder.setVnfType(preload_type);
+            preloadVnfListBuilder.setPreloadData(preloadData);
+
+            // merge flag sets to false to allow it to be overwritten (not appended)
+            SavePreloadList (preloadVnfListBuilder.build(), false, LogicalDatastoreType.CONFIGURATION);
+            log.info("Updating OPERATIONAL tree.");
+            SavePreloadList (preloadVnfListBuilder.build(), false, LogicalDatastoreType.OPERATIONAL);
+        } catch (Exception e) {
+            log.error("Caught Exception updating MD-SAL for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] \n",e);
+            responseBuilder.setResponseCode("500");
+            responseBuilder.setResponseMessage(e.toString());
+            responseBuilder.setAckFinalIndicator("Y");
+            log.error("Returned FAILED for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] " + responseBuilder.build());
+            RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<PreloadNetworkTopologyOperationOutput> status(false).withResult(responseBuilder.build()).build();
+            return Futures.immediateFuture(rpcResult);
+        }
+
+        // Update succeeded
+        responseBuilder.setResponseCode(errorCode);
+        responseBuilder.setAckFinalIndicator(ackFinal);
+        if (errorMessage != null)
+        {
+            responseBuilder.setResponseMessage(errorMessage);
+        }
+        log.info("Updated MD-SAL for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] ");
+        log.info("Returned SUCCESS for "+SVC_OPERATION+" ["+preload_name+","+preload_type+"] " + responseBuilder.build());
+
+        RpcResult<PreloadNetworkTopologyOperationOutput> rpcResult =
+                RpcResultBuilder.<PreloadNetworkTopologyOperationOutput> status(true).withResult(responseBuilder.build()).build();
+        return Futures.immediateFuture(rpcResult);
+    }
+}
diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiSvcLogicServiceClient.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiSvcLogicServiceClient.java
new file mode 100644 (file)
index 0000000..04b71e7
--- /dev/null
@@ -0,0 +1,144 @@
+package org.onap.sdnc.northbound;
+
+import java.util.Properties;
+
+import org.onap.ccsdk.sli.core.sli.SvcLogicException;
+import org.onap.ccsdk.sli.core.sli.provider.SvcLogicService;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.data.PreloadDataBuilder;
+import org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.ServiceDataBuilder;
+import org.osgi.framework.BundleContext;
+import org.osgi.framework.FrameworkUtil;
+import org.osgi.framework.ServiceReference;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GenericResourceApiSvcLogicServiceClient {
+
+       private static final Logger LOG = LoggerFactory
+                       .getLogger(GenericResourceApiSvcLogicServiceClient.class);
+
+       private SvcLogicService svcLogic = null;
+
+       public GenericResourceApiSvcLogicServiceClient()
+       {
+               BundleContext bctx = FrameworkUtil.getBundle(SvcLogicService.class).getBundleContext();
+
+       // Get SvcLogicService reference
+               ServiceReference sref = bctx.getServiceReference(SvcLogicService.NAME);
+               if (sref  != null)
+               {
+                       svcLogic =  (SvcLogicService) bctx.getService(sref);
+
+               }
+               else
+               {
+                       LOG.warn("Cannot find service reference for "+SvcLogicService.NAME);
+
+               }
+       }
+
+       public boolean hasGraph(String module, String rpc, String version, String mode) throws SvcLogicException
+       {
+               return(svcLogic.hasGraph(module, rpc, version, mode));
+       }
+
+       public Properties execute(String module, String rpc, String version, String mode, ServiceDataBuilder serviceData)
+                       throws SvcLogicException {
+
+               Properties parms = new Properties();
+
+               return execute(module,rpc,version, mode,serviceData,parms);
+       }
+
+       public Properties execute(String module, String rpc, String version, String mode, PreloadDataBuilder serviceData)
+                       throws SvcLogicException {
+
+               Properties parms = new Properties();
+
+               return execute(module,rpc,version, mode,serviceData,parms);
+       }
+
+
+       public Properties execute(String module, String rpc, String version, String mode, ServiceDataBuilder serviceData, Properties parms)
+                               throws SvcLogicException {
+
+               parms = GenericResourceApiUtil.toProperties(parms, serviceData);
+
+               if (LOG.isDebugEnabled())
+               {
+                       LOG.debug("Parameters passed to SLI");
+
+                       for (Object key : parms.keySet()) {
+                               String parmName = (String) key;
+                               String parmValue = parms.getProperty(parmName);
+
+                               LOG.debug(parmName+" = "+parmValue);
+
+                       }
+               }
+
+               Properties respProps = svcLogic.execute(module, rpc, version, mode, parms);
+
+               if (LOG.isDebugEnabled())
+               {
+                       LOG.debug("Parameters returned by SLI");
+
+                       for (Object key : respProps.keySet()) {
+                               String parmName = (String) key;
+                               String parmValue = respProps.getProperty(parmName);
+
+                               LOG.debug(parmName+" = "+parmValue);
+
+                       }
+               }
+               if ("failure".equalsIgnoreCase(respProps.getProperty("SvcLogic.status"))) {
+                       return (respProps);
+               }
+
+               GenericResourceApiUtil.toBuilder(respProps, serviceData);
+
+               return (respProps);
+       }
+
+
+       public Properties execute(String module, String rpc, String version, String mode, PreloadDataBuilder serviceData, Properties parms)
+                               throws SvcLogicException {
+
+               parms = GenericResourceApiUtil.toProperties(parms, serviceData);
+
+               if (LOG.isDebugEnabled())
+               {
+                       LOG.debug("Parameters passed to SLI");
+
+                       for (Object key : parms.keySet()) {
+                               String parmName = (String) key;
+                               String parmValue = parms.getProperty(parmName);
+
+                               LOG.debug(parmName+" = "+parmValue);
+
+                       }
+               }
+
+               Properties respProps = svcLogic.execute(module, rpc, version, mode, parms);
+
+               if (LOG.isDebugEnabled())
+               {
+                       LOG.debug("Parameters returned by SLI");
+
+                       for (Object key : respProps.keySet()) {
+                               String parmName = (String) key;
+                               String parmValue = respProps.getProperty(parmName);
+
+                               LOG.debug(parmName+" = "+parmValue);
+
+                       }
+               }
+               if ("failure".equalsIgnoreCase(respProps.getProperty("SvcLogic.status"))) {
+                       return (respProps);
+               }
+
+               GenericResourceApiUtil.toBuilder(respProps, serviceData);
+
+               return (respProps);
+       }
+}
diff --git a/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java b/generic-resource-api/provider/src/main/java/org/onap/sdnc/northbound/GenericResourceApiUtil.java
new file mode 100644 (file)
index 0000000..56a2fae
--- /dev/null
@@ -0,0 +1,280 @@
+package org.onap.sdnc.northbound;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+public class GenericResourceApiUtil extends MdsalHelper {
+
+       private static final Logger LOG = LoggerFactory.getLogger(GenericResourceApiUtil.class);
+
+       public static final String PROPERTIES_FILE="/opt/bvc/controller/configuration/generic-resource-api.properties";
+       private static Properties properties;
+
+
+       public static void loadProperties() {
+
+               File file = new File(PROPERTIES_FILE);
+               properties = new Properties();
+               InputStream input = null;
+               if (file.isFile() && file.canRead()) {
+                       try     {
+                               input = new FileInputStream(file);
+                               properties.load(input);
+                               LOG.info("Loaded properties from " + PROPERTIES_FILE );
+                               setProperties(properties);
+                       } catch (Exception e) {
+                               LOG.error("Failed to load properties " + PROPERTIES_FILE +"\n",e);
+                       } finally {
+                               if (input != null) {
+                                       try {
+                                               input.close();
+                                       } catch (IOException e) {
+                                               LOG.error("Failed to close properties file " + PROPERTIES_FILE +"\n",e);
+                                       }
+                               }
+                       }
+               }
+       }
+
+       static {
+
+               // Trick class loader into loading builders. Some of
+               // these will be needed later by Reflection classes, but need
+               // to explicitly "new" them here to get class loader to load them.
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ecomp.model.information.EcompModelInformationBuilder u1 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ecomp.model.information.EcompModelInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.assignments.NetworkAssignmentsBuilder u2 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.assignments.NetworkAssignmentsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.information.NetworkInformationBuilder u3 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.information.NetworkInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.level.oper.status.NetworkLevelOperStatusBuilder u4 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.level.oper.status.NetworkLevelOperStatusBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.parameters.NetworkParametersBuilder u5 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.parameters.NetworkParametersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.parameters.network.parameters.NetworkParameterBuilder u6 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.parameters.network.parameters.NetworkParameterBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.policy.NetworkPolicyBuilder u7 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.policy.NetworkPolicyBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.request.input.NetworkRequestInputBuilder u8 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.request.input.NetworkRequestInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.request.input.network.request.input.NetworkInputParametersBuilder u9 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.request.input.network.request.input.NetworkInputParametersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.response.information.NetworkResponseInformationBuilder u10 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.response.information.NetworkResponseInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.topology.identifier.NetworkTopologyIdentifierBuilder u11 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.topology.identifier.NetworkTopologyIdentifierBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.topology.identifier.structure.NetworkTopologyIdentifierStructureBuilder u12 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.topology.identifier.structure.NetworkTopologyIdentifierStructureBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.topology.information.NetworkTopologyInformationBuilder u13 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.topology.information.NetworkTopologyInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.topology.NetworkTopologyBuilder u14 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.network.topology.NetworkTopologyBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationInputBuilder u15 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationOutputBuilder u16 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.NetworkTopologyOperationOutputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.oper.status.OperStatusBuilder u17 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.oper.status.OperStatusBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.param.ParamBuilder u18 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.param.ParamBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.data.PreloadDataBuilder u19 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.data.PreloadDataBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadListBuilder u20 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.preload.model.information.VnfPreloadListBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationInputBuilder u21 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationOutputBuilder u22 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadNetworkTopologyOperationOutputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfsBuilder u23 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationInputBuilder u24 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationOutputBuilder u25 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.PreloadVnfTopologyOperationOutputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.request.information.RequestInformationBuilder u26 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.request.information.RequestInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.route.table.reference.RouteTableReferenceBuilder u27 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.route.table.reference.RouteTableReferenceBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeaderBuilder u28 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sdnc.request.header.SdncRequestHeaderBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.assignments.ServiceAssignmentsBuilder u29 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.assignments.ServiceAssignmentsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.ServiceDataBuilder u30 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.ServiceDataBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.NetworksBuilder u31 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.NetworksBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.networks.NetworkBuilder u32 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.networks.NetworkBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.networks.network.NetworkDataBuilder u33 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.networks.network.NetworkDataBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.VnfsBuilder u34 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.VnfsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.VnfBuilder u35 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.VnfBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.vnf.VnfDataBuilder u36 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.vnf.VnfDataBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.vnf.vnf.data.VfModulesBuilder u37 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.vnf.vnf.data.VfModulesBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.vnf.vnf.data.vf.modules.VfModuleBuilder u38 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.vnf.vnf.data.vf.modules.VfModuleBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.vnf.vnf.data.vf.modules.vf.module.VfModuleDataBuilder u39 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.data.service.data.vnfs.vnf.vnf.data.vf.modules.vf.module.VfModuleDataBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.information.ServiceInformationBuilder u40 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.information.ServiceInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.level.oper.status.ServiceLevelOperStatusBuilder u41 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.level.oper.status.ServiceLevelOperStatusBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.model.infrastructure.ServiceBuilder u42 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.model.infrastructure.ServiceBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.parameters.ServiceParametersBuilder u43 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.parameters.ServiceParametersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.parameters.service.parameters.ServiceParameterBuilder u44 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.parameters.service.parameters.ServiceParameterBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.request.input.ServiceRequestInputBuilder u45 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.request.input.ServiceRequestInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.request.input.service.request.input.ServiceInputParametersBuilder u46 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.request.input.service.request.input.ServiceInputParametersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.response.information.ServiceResponseInformationBuilder u47 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.response.information.ServiceResponseInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServicesBuilder u48 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServicesBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatusBuilder u49 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.status.ServiceStatusBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.topology.identifier.ServiceTopologyIdentifierBuilder u50 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.topology.identifier.ServiceTopologyIdentifierBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationInputBuilder u51 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationOutputBuilder u52 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.ServiceTopologyOperationOutputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.topology.ServiceTopologyBuilder u53 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.service.topology.ServiceTopologyBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sriov.vlan.filter.list.SriovVlanFilterListBuilder u54 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.sriov.vlan.filter.list.SriovVlanFilterListBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.subnets.SubnetsBuilder u55 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.subnets.SubnetsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.assignments.VfModuleAssignmentsBuilder u56 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.assignments.VfModuleAssignmentsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.assignments.vf.module.assignments.VmsBuilder u57 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.assignments.vf.module.assignments.VmsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.assignments.vf.module.assignments.vms.VmBuilder u58 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.assignments.vf.module.assignments.vms.VmBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.information.VfModuleInformationBuilder u59 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.information.VfModuleInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.level.oper.status.VfModuleLevelOperStatusBuilder u60 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.level.oper.status.VfModuleLevelOperStatusBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.request.input.VfModuleRequestInputBuilder u61 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.request.input.VfModuleRequestInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.request.input.vf.module.request.input.VfModuleInputParametersBuilder u62 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.request.input.vf.module.request.input.VfModuleInputParametersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.response.information.VfModuleResponseInformationBuilder u63 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.response.information.VfModuleResponseInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.topology.identifier.VfModuleTopologyIdentifierBuilder u64 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.topology.identifier.VfModuleTopologyIdentifierBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationInputBuilder u65 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationOutputBuilder u66 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VfModuleTopologyOperationOutputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.topology.VfModuleTopologyBuilder u67 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.topology.VfModuleTopologyBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.topology.vf.module.topology.VfModuleParametersBuilder u68 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vf.module.topology.vf.module.topology.VfModuleParametersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.FloatingIpsBuilder u69 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.FloatingIpsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.InterfaceRoutePrefixesBuilder u70 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.InterfaceRoutePrefixesBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.MacAddressesBuilder u71 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.MacAddressesBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.NetworkInformationItemsBuilder u72 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.NetworkInformationItemsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.network.information.items.NetworkInformationItemBuilder u73 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.network.information.items.NetworkInformationItemBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.network.information.items.network.information.item.NetworkIpsBuilder u74 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.network.information.items.network.information.item.NetworkIpsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.sriov.parameters.ApplicationTagsBuilder u75 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.sriov.parameters.ApplicationTagsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.sriov.parameters.application.tags.CTagsBuilder u76 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.sriov.parameters.application.tags.CTagsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.sriov.parameters.application.tags.STagsBuilder u77 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.sriov.parameters.application.tags.STagsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.SriovParametersBuilder u78 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.SriovParametersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.sriov.parameters.HeatVlanFiltersBuilder u79 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.data.sriov.parameters.HeatVlanFiltersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.InterfaceRoutePrefixesBuilder u80 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.InterfaceRoutePrefixesBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.NetworkIpsBuilder u81 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.NetworkIpsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.NetworkIpsV6Builder u82 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.NetworkIpsV6Builder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.NetworkMacsBuilder u83 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.network.NetworkMacsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.data.VmNamesBuilder u84 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.data.VmNamesBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.data.VmNetworksBuilder u85 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.data.VmNetworksBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.data.vm.networks.VmNetworkBuilder u86 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.data.vm.networks.VmNetworkBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.VnfVmsBuilder u87 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.VnfVmsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.vnf.vms.VmNamesBuilder u88 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.vnf.vms.VmNamesBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.vnf.vms.VmNetworksBuilder u89 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vm.topology.vnf.vms.VmNetworksBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.assignments.vnf.assignments.AvailabilityZonesBuilder u90 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.assignments.vnf.assignments.AvailabilityZonesBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.assignments.VnfAssignmentsBuilder u91 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.assignments.VnfAssignmentsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.assignments.vnf.assignments.VnfNetworksBuilder u92 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.assignments.vnf.assignments.VnfNetworksBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.information.VnfInformationBuilder u93 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.information.VnfInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.level.oper.status.VnfLevelOperStatusBuilder u94 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.level.oper.status.VnfLevelOperStatusBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.network.data.SubnetsDataBuilder u95 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.network.data.SubnetsDataBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.network.data.subnets.data.SubnetDataBuilder u96 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.network.data.subnets.data.SubnetDataBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.parameters.VnfParametersBuilder u97 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.parameters.VnfParametersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.request.input.VnfRequestInputBuilder u98 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.request.input.VnfRequestInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.request.input.vnf.request.input.VnfInputParametersBuilder u99 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.request.input.vnf.request.input.VnfInputParametersBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.request.input.vnf.request.input.VnfNetworksBuilder u100 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.request.input.vnf.request.input.VnfNetworksBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.request.input.vnf.request.input.vnf.networks.VnfNetworkBuilder u101 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.request.input.vnf.request.input.vnf.networks.VnfNetworkBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.resource.assignments.vnf.resource.assignments.AvailabilityZonesBuilder u102 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.resource.assignments.vnf.resource.assignments.AvailabilityZonesBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.resource.assignments.VnfResourceAssignmentsBuilder u103 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.resource.assignments.VnfResourceAssignmentsBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.resource.assignments.vnf.resource.assignments.VnfNetworksBuilder u104 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.resource.assignments.vnf.resource.assignments.VnfNetworksBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.resource.assignments.vnf.resource.assignments.vnf.networks.VnfNetworkBuilder u105 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.resource.assignments.vnf.resource.assignments.vnf.networks.VnfNetworkBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.response.information.VnfResponseInformationBuilder u106 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.response.information.VnfResponseInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.identifier.structure.VnfTopologyIdentifierStructureBuilder u107 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.identifier.structure.VnfTopologyIdentifierStructureBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.identifier.VnfTopologyIdentifierBuilder u108 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.identifier.VnfTopologyIdentifierBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.information.VnfTopologyInformationBuilder u109 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.information.VnfTopologyInformationBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationInputBuilder u110 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationInputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationOutputBuilder u111 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.VnfTopologyOperationOutputBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.VnfTopologyBuilder u112 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.VnfTopologyBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.vnf.topology.VnfParametersDataBuilder u113 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vnf.topology.vnf.topology.VnfParametersDataBuilder();
+               org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vpn.bindings.VpnBindingsBuilder u114 =
+                       new org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.rev170824.vpn.bindings.VpnBindingsBuilder();
+    }
+}
diff --git a/generic-resource-api/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/sdnc/northbound/generic/resource/api/provider/impl/rev140523/GENERICRESOURCEAPIProviderModule.java b/generic-resource-api/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/sdnc/northbound/generic/resource/api/provider/impl/rev140523/GENERICRESOURCEAPIProviderModule.java
new file mode 100644 (file)
index 0000000..ff2775d
--- /dev/null
@@ -0,0 +1,35 @@
+package org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.api.provider.impl.rev140523;
+
+import org.onap.sdnc.northbound.GenericResourceApiProvider;
+
+public class GENERICRESOURCEAPIProviderModule extends org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.api.provider.impl.rev140523.AbstractGENERICRESOURCEAPIProviderModule {
+    public GENERICRESOURCEAPIProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) {
+        super(identifier, dependencyResolver);
+    }
+
+    public GENERICRESOURCEAPIProviderModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.api.provider.impl.rev140523.GENERICRESOURCEAPIProviderModule oldModule, java.lang.AutoCloseable oldInstance) {
+        super(identifier, dependencyResolver, oldModule, oldInstance);
+    }
+
+    @Override
+    public void customValidation() {
+        // add custom validation form module attributes here.
+    }
+
+    @Override
+    public java.lang.AutoCloseable createInstance() {
+        final GenericResourceApiProvider provider = new GenericResourceApiProvider(getDataBrokerDependency()
+                , getNotificationServiceDependency()
+                , getRpcRegistryDependency());
+
+        return new AutoCloseable() {
+
+           @Override
+           public void close() throws Exception {
+               provider.close();
+           }
+       };
+    }
+
+
+}
diff --git a/generic-resource-api/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/sdnc/northbound/generic/resource/api/provider/impl/rev140523/GENERICRESOURCEAPIProviderModuleFactory.java b/generic-resource-api/provider/src/main/java/org/opendaylight/yang/gen/v1/org/onap/sdnc/northbound/generic/resource/api/provider/impl/rev140523/GENERICRESOURCEAPIProviderModuleFactory.java
new file mode 100644 (file)
index 0000000..abad535
--- /dev/null
@@ -0,0 +1,13 @@
+/*
+* Generated file
+*
+* Generated from: yang module name: GENERIC-RESOURCE-API-provider-impl yang module local name: GENERIC-RESOURCE-API-provider-impl
+* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator
+* Generated at: Tue Sep 05 14:01:41 EDT 2017
+*
+* Do not modify this file unless it is present under src/main directory
+*/
+package org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.api.provider.impl.rev140523;
+public class GENERICRESOURCEAPIProviderModuleFactory extends org.opendaylight.yang.gen.v1.org.onap.sdnc.northbound.generic.resource.api.provider.impl.rev140523.AbstractGENERICRESOURCEAPIProviderModuleFactory {
+
+}
diff --git a/generic-resource-api/provider/src/main/resources/initial/generic-resource-api-provider.xml b/generic-resource-api/provider/src/main/resources/initial/generic-resource-api-provider.xml
new file mode 100644 (file)
index 0000000..2ba353c
--- /dev/null
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- vi: set et smarttab sw=4 tabstop=4: -->
+<snapshot>
+    <configuration>
+        <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
+            <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
+                <module>
+
+                    <!-- This xmlns:prefix should match the namespace in the *-provider-impl.yang file
+                         The prefix: inside type should match the prefix of the yang file. -->
+                    <type xmlns:prefix="org:onap:sdnc:northbound:GENERIC-RESOURCE-API:provider:impl">
+                        prefix:GENERIC-RESOURCE-API-provider-impl
+                    </type>
+                    <name>GENERIC-RESOURCE-API-provider-impl</name>
+
+                    <!--  The following sections contain bindings to services defined in the
+                          *-provider-impl yang file. For example the rpc-registry is required
+                          because we have a dependency (or augmentation) named "rpc-registry"
+                          and which binds to the md-sa-binding-registry. If you remove those
+                          dependencies from the yang file then you can remove them from here. -->
+                    <rpc-registry>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-rpc-registry</type>
+                        <name>binding-rpc-broker</name>
+                    </rpc-registry>
+
+                    <data-broker>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-async-data-broker</type>
+                        <name>binding-data-broker</name>
+                    </data-broker>
+
+                     <notification-service>
+                        <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">
+                            binding:binding-notification-service
+                        </type>
+                        <name>binding-notification-broker</name>
+                    </notification-service>
+                </module>
+
+            </modules>
+        </data>
+
+    </configuration>
+
+    <!--  Required capabilities are basically a listing of all modules that need to be imported before
+          our service can be resolved. Capabilities for dependencies defined above are implied which is
+          why we do not have define a required capability for the data broker, for example. -->
+    <required-capabilities>
+        <capability>org:onap:sdnc:northbound:GENERIC-RESOURCE-API:provider:impl?module=GENERIC-RESOURCE-API-provider-impl&amp;revision=2014-05-23</capability>
+    </required-capabilities>
+
+</snapshot>
diff --git a/generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang b/generic-resource-api/provider/src/main/yang/GENERIC-RESOURCE-API-provider-impl.yang
new file mode 100644 (file)
index 0000000..f6f49ee
--- /dev/null
@@ -0,0 +1,61 @@
+module GENERIC-RESOURCE-API-provider-impl {
+
+    yang-version 1;
+    namespace "org:onap:sdnc:northbound:GENERIC-RESOURCE-API:provider:impl";
+    prefix "GENERIC-RESOURCE-API-provider-impl";
+
+    import config { prefix config; revision-date 2013-04-05; }
+    import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; }
+
+     description
+        "This module contains the base YANG definitions for
+        GENERIC-RESOURCE-API-provider impl implementation.";
+
+    revision "2014-05-23" {
+        description
+            "Initial revision.";
+    }
+
+    // This is the definition of the service implementation as a module identity.
+    identity GENERIC-RESOURCE-API-provider-impl {
+            base config:module-type;
+
+            // Specifies the prefix for generated java classes.
+            config:java-name-prefix GENERIC-RESOURCE-APIProvider;
+    }
+
+    // Augments the 'configuration' choice node under modules/module.
+    // We consume the three main services, RPCs, DataStore, and Notifications
+    augment "/config:modules/config:module/config:configuration" {
+        case GENERIC-RESOURCE-API-provider-impl {
+            when "/config:modules/config:module/config:type = 'GENERIC-RESOURCE-API-provider-impl'";
+
+            container rpc-registry {
+                uses config:service-ref {
+                    refine type {
+                        mandatory true;
+                        config:required-identity mdsal:binding-rpc-registry;
+                    }
+                }
+            }
+
+            container notification-service {
+                uses config:service-ref {
+                    refine type {
+                        mandatory true;
+                        config:required-identity mdsal:binding-notification-service;
+                    }
+                }
+            }
+
+            container data-broker {
+                uses config:service-ref {
+                    refine type {
+                        mandatory false;
+                        config:required-identity mdsal:binding-async-data-broker;
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/pom.xml b/pom.xml
index 9827b82..fb001ec 100644 (file)
--- a/pom.xml
+++ b/pom.xml
 
        </build>
        <modules>
+               <module>generic-resource-api</module>
                <module>vnfapi</module>
                <module>vnftools</module>
        </modules>