Migrate sli-core files

Migrate sli-core repo files into new
directory "core".

Signed-off-by: Jessica Wagantall <jwagantall@linuxfoundation.org>

9 files changed, 0 insertions, 1831 deletions

diff --git a/sliapi/model/pom.xml b/sliapi/model/pom.xml
deleted file mode 100755
index f23ad8da7..000000000
--- a/sliapi/model/pom.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?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.ccsdk.parent</groupId>
-		<artifactId>odlparent-lite</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>org.onap.ccsdk.sli.core</groupId>
-	<artifactId>sliapi-model</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
-	<packaging>pom</packaging>
-
-	<name>ccsdk-sli-core :: sliapi</name>
-
-	<modules>
-		<module>yang</module>
-		<module>swagger</module>
-	</modules>
-
-</project>
diff --git a/sliapi/model/src/main/resources/sli-api.20161110.yaml b/sliapi/model/src/main/resources/sli-api.20161110.yaml
deleted file mode 100644
index 3420c66b5..000000000
--- a/sliapi/model/src/main/resources/sli-api.20161110.yaml
+++ /dev/null
@@ -1,254 +0,0 @@
----
-swagger: '2.0'
-info:
-  version: 1.0.0
-  title: "SLI API"
-basePath: '/restconf'
-schemes:
-  - http
-  - https
-paths:
-  '/restconf/config/SLI-API:test-results':
-    delete:
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-      description: Test results
-      operationId: delete-test-results
-    get:
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-results'
-      description: Test results
-      operationId: get-test-results
-    post:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: body
-          name: testResults
-          required: false
-          schema:
-            $ref: '#/definitions/test-results'
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-results'
-      description: Test results
-      operationId: post-test-results
-    put:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: body
-          name: testResults
-          required: false
-          schema:
-            $ref: '#/definitions/test-results'
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-results'
-      description: Test results
-      operationId: put-test-results
-
-  '/restconf/config/SLI-API:test-results/test-result/{test-identifier}':
-    delete:
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: path
-          name: test-identifier
-          required: true
-          type: string
-      responses:
-        '200':
-          description: No response was specified
-      operationId: delete-test-result
-    get:
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: path
-          name: test-identifier
-          required: true
-          type: string
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-result'
-      operationId: get-test-result
-    put:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: path
-          name: test-identifier
-          required: true
-          type: string
-        - in: body
-          name: testResult
-          required: false
-          schema:
-            $ref: '#/definitions/test-result'
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-result'
-      operationId: PUT-test-result
-
-  '/restconf/operational/SLI-API:test-results':
-    get:
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-results'
-      description: Test results
-      operationId: GET-test-results
-  '/restconf/operations/SLI-API:execute-graph':
-    post:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: body
-          name: executeGraphInput
-          required: false
-          schema:
-            $ref: '#/definitions/execute-graph-input'
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/response-fields'
-      description: ' Method to add a new parameter.'
-      operationId: execute-graph
-  '/restconf/operations/SLI-API:healthcheck':
-    post:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/response-fields'
-      operationId: healthcheck
-  '/restconf/operations/SLI-API:vlbcheck':
-    post:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/response-fields'
-      operationId: vlbcheck
-
-definitions:
-  parameter-setting:
-    type: object
-    properties:
-      parameter-name:
-        type: string
-      int-value:
-        type: integer
-      string-value:
-        type: string
-      boolean-value:
-        type: boolean
-
-  response-fields:
-    type: object
-    properties:
-      response-code:
-        type: string
-      ack-final-indicator:
-        type: string
-      response-message:
-        type: string
-      context-memory-json:
-        type: string
-
-  test-results:
-    type: object
-    properties:
-      test-results:
-        type: array
-        items:
-          $ref: '#/definitions/test-result'
-
-  test-result:
-    type: object
-    properties:
-      test-identifier:
-        type: string
-      results:
-        type: array
-        items:
-          type: string
-
-  execute-graph-input:
-    properties:
-      'input':
-        type: object
-        properties:
-          'mode':
-             type: string
-          'module-name':
-            type: string
-          'rpc-name':
-            type: string
-          'sli-parameter':
-            items:
-              $ref: '#/definitions/parameter-setting'
-            type: array
-    type: object
-
-
-
-
-
-
-  unique_empty_identifier: {}
-
diff --git a/sliapi/model/swagger/pom.xml b/sliapi/model/swagger/pom.xml
deleted file mode 100644
index db9ddbc42..000000000
--- a/sliapi/model/swagger/pom.xml
+++ /dev/null
@@ -1,222 +0,0 @@
-<?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.ccsdk.parent</groupId>
-        <artifactId>oparent</artifactId>
-        <version>2.1.0-SNAPSHOT</version>
-    </parent>
-
-    <groupId>org.onap.ccsdk.sli.core</groupId>
-    <artifactId>sliapi-model-swagger</artifactId>
-    <version>1.1.1-SNAPSHOT</version>
-    <packaging>jar</packaging>
-
-    <name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
-    <description>Generates swagger model from yang model</description>
-    <url>http://wiki.onap.org</url>
-
-    <properties>
-        <api.name>sliapi</api.name>
-        <jackson.version>2.9.5</jackson.version>
-    </properties>
-
-    <dependencies>
-        <!-- This is where the yang comes from -->
-        <dependency>
-            <groupId>${project.groupId}</groupId>
-            <artifactId>sliapi-model-yang</artifactId>
-            <version>${project.version}</version>
-        </dependency>
-        <!-- End this is where the yang comes from -->        
-    </dependencies>
-
-    <repositories>
-        <repository>
-            <id>&gt;bintray-yang2swagger-yang2swagge</id>
-            <name>bintray</name>
-            <url>https://dl.bintray.com/yang2swagger/yang2swagger</url>
-            <snapshots>
-                <enabled>false</enabled>
-            </snapshots>
-        </repository>
-    </repositories>
-
-    <build>
-        <plugins>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-dependency-plugin</artifactId>
-                <version>2.10</version>
-                <configuration>
-                    <outputDirectory>${project.build.directory}/dependency</outputDirectory>
-                    <includes>**\/*.yang</includes>
-                    <includeGroupIds>org.opendaylight.mdsal.model,org.opendaylight.mdsal.binding.model.ietf,org.onap.ccsdk.sli.core</includeGroupIds>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>unpack-shared-resources</id>
-                        <goals>
-                            <goal>unpack-dependencies</goal>
-                        </goals>
-                        <phase>initialize</phase>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <artifactId>maven-antrun-plugin</artifactId>
-                <version>1.8</version>
-                <executions>
-                    <execution>
-                        <phase>initialize</phase>
-                        <goals>
-                            <goal>run</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <tasks>
-                        <!-- flatten out structure -->
-                        <move todir="${project.build.directory}/dependency" failonerror="false">
-                            <fileset dir="${project.build.directory}/dependency"/>
-                            <mapper type="flatten"/>
-                        </move>
-                        <!-- move to yang folder -->
-                        <copy todir="${project.build.directory}/yang" failonerror="false">
-                            <fileset dir="${project.build.directory}/dependency" includes="**/*.yang"/>
-                            <mapper type="flatten"/>
-                        </copy>
-                    </tasks>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.opendaylight.yangtools</groupId>
-                <artifactId>yang-maven-plugin</artifactId>
-                <version>1.2.3</version>
-                <dependencies>
-                    <dependency>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-core</artifactId>
-                        <version>${jackson.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-databind</artifactId>
-                        <version>${jackson.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.fasterxml.jackson.core</groupId>
-                        <artifactId>jackson-annotations</artifactId>
-                        <version>${jackson.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.fasterxml.jackson.module</groupId>
-                        <artifactId>jackson-module-jaxb-annotations</artifactId>
-                        <version>${jackson.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                        <artifactId>jackson-jaxrs-base</artifactId>
-                        <version>${jackson.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.fasterxml.jackson.jaxrs</groupId>
-                        <artifactId>jackson-jaxrs-json-provider</artifactId>
-                        <version>${jackson.version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.mrv.yangtools</groupId>
-                        <artifactId>swagger-maven-plugin</artifactId>
-                        <version>1.1.12</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>com.github.romix</groupId>
-                        <artifactId>java-concurrent-hash-trie-map</artifactId>
-                        <version>0.2.23</version>
-                    </dependency>
-                </dependencies>
-                <executions>
-                    <execution>
-                        <id>yang2swagger-json</id>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
-                                    <outputBaseDir>${project.basedir}/src/main/json</outputBaseDir>
-                                    <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
-                                    <additionalConfiguration>
-                                        <api-version>${project.version}</api-version>
-                                        <base-module>${api.name}</base-module>
-                                        <swagger-format>json</swagger-format>
-                                        <path-format>odl</path-format>
-                                        <use-namespaces>true</use-namespaces>
-                                    </additionalConfiguration>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>false</inspectDependencies>
-                            <yangFilesRootDir>${project.build.directory}/yang</yangFilesRootDir>
-                        </configuration>
-                    </execution>
-                    <execution>
-                        <id>yang2swagger-yaml</id>
-                        <goals>
-                            <goal>generate-sources</goal>
-                        </goals>
-                        <configuration>
-                            <codeGenerators>
-                                <generator>
-                                    <codeGeneratorClass>com.mrv.yangtools.maven.gen.swagger.MavenSwaggerGenerator</codeGeneratorClass>
-                                    <outputBaseDir>${project.basedir}/src/main/yaml</outputBaseDir>
-                                    <resourceBaseDir>${project.build.directory}/yang</resourceBaseDir>
-                                    <additionalConfiguration>
-                                        <api-version>${project.version}</api-version>
-                                        <base-module>${api.name}</base-module>
-                                        <swagger-format>yaml</swagger-format>
-                                        <path-format>odl</path-format>
-                                        <use-namespaces>true</use-namespaces>
-                                    </additionalConfiguration>
-                                </generator>
-                            </codeGenerators>
-                            <inspectDependencies>false</inspectDependencies>
-                            <yangFilesRootDir>${project.build.directory}/yang</yangFilesRootDir>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-source-plugin</artifactId>
-            </plugin>
-             <plugin>
-                <groupId>org.codehaus.mojo</groupId>
-                <artifactId>build-helper-maven-plugin</artifactId>
-                <version>1.10</version>
-                <executions>
-                    <execution>
-                        <id>attach-artifacts</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>attach-artifact</goal>
-                        </goals>
-                        <configuration>
-                            <artifacts>
-                                <artifact>
-                                    <file>src/main/json/${api.name}.json</file>
-                                    <type>json</type>
-                                </artifact>
-                                <artifact>
-                                    <file>src/main/yaml/${api.name}.yaml</file>
-                                    <type>yaml</type>
-                                </artifact>
-                            </artifacts>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/sliapi/model/swagger/src/main/json/sliapi.json b/sliapi/model/swagger/src/main/json/sliapi.json
deleted file mode 100644
index b53663201..000000000
--- a/sliapi/model/swagger/src/main/json/sliapi.json
+++ /dev/null
@@ -1 +0,0 @@
-{"swagger":"2.0","info":{"description":"Defines API to service logic interpreter,This module contains a collection of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code.  All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.,This module contains a collection of generally useful derived\nYANG data types for Internet addresses and related things.\n\nCopyright (c) 2013 IETF Trust and the persons identified as\nauthors of the code.  All rights reserved.\n\nRedistribution and use in source and binary forms, with or\nwithout modification, is permitted pursuant to, and subject\nto the license terms contained in, the Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\nRelating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal notices.","version":"1.1.0-SNAPSHOT","title":"SLI-API,ietf-yang-types,ietf-inet-types API"},"consumes":["application/json","application/xml"],"produces":["application/json","application/xml"],"paths":{"/config/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.TestResults","parameters":[{"in":"body","name":"sli.api.TestResults.body-param","description":"sli.api.TestResults to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/config/SLI-API:test-results/SLI-API:test-result/":{"post":{"description":"creates sli.api.testresults.TestResult","parameters":[{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}}},"/config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"post":{"tags":["SLI-API"],"description":"creates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added to list","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"409":{"description":"Object already exists"}}},"put":{"tags":["SLI-API"],"description":"creates or updates sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"},{"in":"body","name":"sli.api.testresults.TestResult.body-param","description":"sli.api.testresults.TestResult to be added or updated","required":false,"schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}],"responses":{"400":{"description":"Internal error"},"201":{"description":"Object created"},"204":{"description":"Object modified"}}},"delete":{"tags":["SLI-API"],"description":"removes sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"204":{"description":"Object deleted"}}}},"/operational/SLI-API:test-results/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.TestResults","parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.TestResults","schema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"},"responseSchema":{"originalRef":"#/definitions/sli.api.TestResults","$ref":"#/definitions/sli.api.TestResults"}}}}},"/operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/":{"get":{"tags":["SLI-API"],"description":"returns sli.api.testresults.TestResult","parameters":[{"name":"test-identifier","in":"path","description":"Id of test-result","required":true,"type":"string"}],"responses":{"400":{"description":"Internal error"},"200":{"description":"sli.api.testresults.TestResult","schema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"},"responseSchema":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}}},"/operations/SLI-API:execute-graph/":{"post":{"tags":["SLI-API"],"parameters":[{"in":"body","name":"sli.api.executegraph.Input.body-param","required":false,"schema":{"properties":{"input":{"originalRef":"#/definitions/sli.api.executegraph.Input","$ref":"#/definitions/sli.api.executegraph.Input"}}}}],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"},"responseSchema":{"originalRef":"#/definitions/sli.api.ExecuteGraph","$ref":"#/definitions/sli.api.ExecuteGraph"}},"201":{"description":"No response"}}}},"/operations/SLI-API:healthcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"},"responseSchema":{"originalRef":"#/definitions/sli.api.Healthcheck","$ref":"#/definitions/sli.api.Healthcheck"}},"201":{"description":"No response"}}}},"/operations/SLI-API:vlbcheck/":{"post":{"tags":["SLI-API"],"parameters":[],"responses":{"400":{"description":"Internal error"},"200":{"description":"Correct response","schema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"},"responseSchema":{"originalRef":"#/definitions/sli.api.Vlbcheck","$ref":"#/definitions/sli.api.Vlbcheck"}},"201":{"description":"No response"}}}}},"definitions":{"sli.api.ExecuteGraph":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.Healthcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.ModeEnumeration":{"type":"string","enum":["sync","async"]},"sli.api.ParameterSetting":{"type":"object","properties":{"string-value":{"type":"string"},"boolean-value":{"type":"boolean"},"parameter-name":{"type":"string","description":"Parameter name"},"int-value":{"type":"integer","format":"int32"}}},"sli.api.ResponseFields":{"type":"object","properties":{"response-code":{"type":"string"},"response-message":{"type":"string"},"context-memory-json":{"type":"string"},"ack-final-indicator":{"type":"string"}}},"sli.api.TestResults":{"type":"object","properties":{"test-result":{"type":"array","items":{"originalRef":"#/definitions/sli.api.testresults.TestResult","$ref":"#/definitions/sli.api.testresults.TestResult"}}}},"sli.api.Vlbcheck":{"type":"object","properties":{"output":{"originalRef":"#/definitions/sli.api.ResponseFields","$ref":"#/definitions/sli.api.ResponseFields"}}},"sli.api.executegraph.Input":{"type":"object","properties":{"mode":{"originalRef":"#/definitions/sli.api.ModeEnumeration","$ref":"#/definitions/sli.api.ModeEnumeration"},"module-name":{"type":"string"},"sli-parameter":{"type":"array","items":{"originalRef":"#/definitions/sli.api.ParameterSetting","$ref":"#/definitions/sli.api.ParameterSetting"}},"rpc-name":{"type":"string"}}},"sli.api.testresults.TestResult":{"type":"object","properties":{"results":{"type":"array","items":{"type":"string"}},"test-identifier":{"type":"string"}}}}}
\ No newline at end of file
diff --git a/sliapi/model/swagger/src/main/yaml/sliapi.yaml b/sliapi/model/swagger/src/main/yaml/sliapi.yaml
deleted file mode 100644
index b1a63be5d..000000000
--- a/sliapi/model/swagger/src/main/yaml/sliapi.yaml
+++ /dev/null
@@ -1,378 +0,0 @@
----
-swagger: "2.0"
-info:
-  description: "Defines API to service logic interpreter,This module contains a collection\
-    \ of generally useful derived\nYANG data types.\n\nCopyright (c) 2013 IETF Trust\
-    \ and the persons identified as\nauthors of the code.  All rights reserved.\n\n\
-    Redistribution and use in source and binary forms, with or\nwithout modification,\
-    \ is permitted pursuant to, and subject\nto the license terms contained in, the\
-    \ Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\n\
-    Relating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version\
-    \ of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal\
-    \ notices.,This module contains a collection of generally useful derived\nYANG\
-    \ data types for Internet addresses and related things.\n\nCopyright (c) 2013\
-    \ IETF Trust and the persons identified as\nauthors of the code.  All rights reserved.\n\
-    \nRedistribution and use in source and binary forms, with or\nwithout modification,\
-    \ is permitted pursuant to, and subject\nto the license terms contained in, the\
-    \ Simplified BSD License\nset forth in Section 4.c of the IETF Trust's Legal Provisions\n\
-    Relating to IETF Documents\n(http://trustee.ietf.org/license-info).\n\nThis version\
-    \ of this YANG module is part of RFC 6991; see\nthe RFC itself for full legal\
-    \ notices."
-  version: "1.1.0-SNAPSHOT"
-  title: "SLI-API,ietf-yang-types,ietf-inet-types API"
-consumes:
-- "application/json"
-- "application/xml"
-produces:
-- "application/json"
-- "application/xml"
-paths:
-  /config/SLI-API:test-results/:
-    get:
-      tags:
-      - "SLI-API"
-      description: "returns sli.api.TestResults"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        200:
-          description: "sli.api.TestResults"
-          schema:
-            originalRef: "#/definitions/sli.api.TestResults"
-            $ref: "#/definitions/sli.api.TestResults"
-          responseSchema:
-            originalRef: "#/definitions/sli.api.TestResults"
-            $ref: "#/definitions/sli.api.TestResults"
-    post:
-      tags:
-      - "SLI-API"
-      description: "creates sli.api.TestResults"
-      parameters:
-      - in: "body"
-        name: "sli.api.TestResults.body-param"
-        description: "sli.api.TestResults to be added to list"
-        required: false
-        schema:
-          originalRef: "#/definitions/sli.api.TestResults"
-          $ref: "#/definitions/sli.api.TestResults"
-      responses:
-        400:
-          description: "Internal error"
-        201:
-          description: "Object created"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "SLI-API"
-      description: "creates or updates sli.api.TestResults"
-      parameters:
-      - in: "body"
-        name: "sli.api.TestResults.body-param"
-        description: "sli.api.TestResults to be added or updated"
-        required: false
-        schema:
-          originalRef: "#/definitions/sli.api.TestResults"
-          $ref: "#/definitions/sli.api.TestResults"
-      responses:
-        400:
-          description: "Internal error"
-        201:
-          description: "Object created"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "SLI-API"
-      description: "removes sli.api.TestResults"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /config/SLI-API:test-results/SLI-API:test-result/:
-    post:
-      description: "creates sli.api.testresults.TestResult"
-      parameters:
-      - in: "body"
-        name: "sli.api.testresults.TestResult.body-param"
-        description: "sli.api.testresults.TestResult to be added to list"
-        required: false
-        schema:
-          originalRef: "#/definitions/sli.api.testresults.TestResult"
-          $ref: "#/definitions/sli.api.testresults.TestResult"
-      responses:
-        400:
-          description: "Internal error"
-        201:
-          description: "Object created"
-        409:
-          description: "Object already exists"
-  /config/SLI-API:test-results/SLI-API:test-result/{test-identifier}/:
-    get:
-      tags:
-      - "SLI-API"
-      description: "returns sli.api.testresults.TestResult"
-      parameters:
-      - name: "test-identifier"
-        in: "path"
-        description: "Id of test-result"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        200:
-          description: "sli.api.testresults.TestResult"
-          schema:
-            originalRef: "#/definitions/sli.api.testresults.TestResult"
-            $ref: "#/definitions/sli.api.testresults.TestResult"
-          responseSchema:
-            originalRef: "#/definitions/sli.api.testresults.TestResult"
-            $ref: "#/definitions/sli.api.testresults.TestResult"
-    post:
-      tags:
-      - "SLI-API"
-      description: "creates sli.api.testresults.TestResult"
-      parameters:
-      - name: "test-identifier"
-        in: "path"
-        description: "Id of test-result"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "sli.api.testresults.TestResult.body-param"
-        description: "sli.api.testresults.TestResult to be added to list"
-        required: false
-        schema:
-          originalRef: "#/definitions/sli.api.testresults.TestResult"
-          $ref: "#/definitions/sli.api.testresults.TestResult"
-      responses:
-        400:
-          description: "Internal error"
-        201:
-          description: "Object created"
-        409:
-          description: "Object already exists"
-    put:
-      tags:
-      - "SLI-API"
-      description: "creates or updates sli.api.testresults.TestResult"
-      parameters:
-      - name: "test-identifier"
-        in: "path"
-        description: "Id of test-result"
-        required: true
-        type: "string"
-      - in: "body"
-        name: "sli.api.testresults.TestResult.body-param"
-        description: "sli.api.testresults.TestResult to be added or updated"
-        required: false
-        schema:
-          originalRef: "#/definitions/sli.api.testresults.TestResult"
-          $ref: "#/definitions/sli.api.testresults.TestResult"
-      responses:
-        400:
-          description: "Internal error"
-        201:
-          description: "Object created"
-        204:
-          description: "Object modified"
-    delete:
-      tags:
-      - "SLI-API"
-      description: "removes sli.api.testresults.TestResult"
-      parameters:
-      - name: "test-identifier"
-        in: "path"
-        description: "Id of test-result"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        204:
-          description: "Object deleted"
-  /operational/SLI-API:test-results/:
-    get:
-      tags:
-      - "SLI-API"
-      description: "returns sli.api.TestResults"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        200:
-          description: "sli.api.TestResults"
-          schema:
-            originalRef: "#/definitions/sli.api.TestResults"
-            $ref: "#/definitions/sli.api.TestResults"
-          responseSchema:
-            originalRef: "#/definitions/sli.api.TestResults"
-            $ref: "#/definitions/sli.api.TestResults"
-  /operational/SLI-API:test-results/SLI-API:test-result/{test-identifier}/:
-    get:
-      tags:
-      - "SLI-API"
-      description: "returns sli.api.testresults.TestResult"
-      parameters:
-      - name: "test-identifier"
-        in: "path"
-        description: "Id of test-result"
-        required: true
-        type: "string"
-      responses:
-        400:
-          description: "Internal error"
-        200:
-          description: "sli.api.testresults.TestResult"
-          schema:
-            originalRef: "#/definitions/sli.api.testresults.TestResult"
-            $ref: "#/definitions/sli.api.testresults.TestResult"
-          responseSchema:
-            originalRef: "#/definitions/sli.api.testresults.TestResult"
-            $ref: "#/definitions/sli.api.testresults.TestResult"
-  /operations/SLI-API:execute-graph/:
-    post:
-      tags:
-      - "SLI-API"
-      parameters:
-      - in: "body"
-        name: "sli.api.executegraph.Input.body-param"
-        required: false
-        schema:
-          properties:
-            input:
-              originalRef: "#/definitions/sli.api.executegraph.Input"
-              $ref: "#/definitions/sli.api.executegraph.Input"
-      responses:
-        400:
-          description: "Internal error"
-        200:
-          description: "Correct response"
-          schema:
-            originalRef: "#/definitions/sli.api.ExecuteGraph"
-            $ref: "#/definitions/sli.api.ExecuteGraph"
-          responseSchema:
-            originalRef: "#/definitions/sli.api.ExecuteGraph"
-            $ref: "#/definitions/sli.api.ExecuteGraph"
-        201:
-          description: "No response"
-  /operations/SLI-API:healthcheck/:
-    post:
-      tags:
-      - "SLI-API"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        200:
-          description: "Correct response"
-          schema:
-            originalRef: "#/definitions/sli.api.Healthcheck"
-            $ref: "#/definitions/sli.api.Healthcheck"
-          responseSchema:
-            originalRef: "#/definitions/sli.api.Healthcheck"
-            $ref: "#/definitions/sli.api.Healthcheck"
-        201:
-          description: "No response"
-  /operations/SLI-API:vlbcheck/:
-    post:
-      tags:
-      - "SLI-API"
-      parameters: []
-      responses:
-        400:
-          description: "Internal error"
-        200:
-          description: "Correct response"
-          schema:
-            originalRef: "#/definitions/sli.api.Vlbcheck"
-            $ref: "#/definitions/sli.api.Vlbcheck"
-          responseSchema:
-            originalRef: "#/definitions/sli.api.Vlbcheck"
-            $ref: "#/definitions/sli.api.Vlbcheck"
-        201:
-          description: "No response"
-definitions:
-  sli.api.ExecuteGraph:
-    type: "object"
-    properties:
-      output:
-        originalRef: "#/definitions/sli.api.ResponseFields"
-        $ref: "#/definitions/sli.api.ResponseFields"
-  sli.api.Healthcheck:
-    type: "object"
-    properties:
-      output:
-        originalRef: "#/definitions/sli.api.ResponseFields"
-        $ref: "#/definitions/sli.api.ResponseFields"
-  sli.api.ModeEnumeration:
-    type: "string"
-    enum:
-    - "sync"
-    - "async"
-  sli.api.ParameterSetting:
-    type: "object"
-    properties:
-      string-value:
-        type: "string"
-      boolean-value:
-        type: "boolean"
-      parameter-name:
-        type: "string"
-        description: "Parameter name"
-      int-value:
-        type: "integer"
-        format: "int32"
-  sli.api.ResponseFields:
-    type: "object"
-    properties:
-      response-code:
-        type: "string"
-      response-message:
-        type: "string"
-      context-memory-json:
-        type: "string"
-      ack-final-indicator:
-        type: "string"
-  sli.api.TestResults:
-    type: "object"
-    properties:
-      test-result:
-        type: "array"
-        items:
-          originalRef: "#/definitions/sli.api.testresults.TestResult"
-          $ref: "#/definitions/sli.api.testresults.TestResult"
-  sli.api.Vlbcheck:
-    type: "object"
-    properties:
-      output:
-        originalRef: "#/definitions/sli.api.ResponseFields"
-        $ref: "#/definitions/sli.api.ResponseFields"
-  sli.api.executegraph.Input:
-    type: "object"
-    properties:
-      mode:
-        originalRef: "#/definitions/sli.api.ModeEnumeration"
-        $ref: "#/definitions/sli.api.ModeEnumeration"
-      module-name:
-        type: "string"
-      sli-parameter:
-        type: "array"
-        items:
-          originalRef: "#/definitions/sli.api.ParameterSetting"
-          $ref: "#/definitions/sli.api.ParameterSetting"
-      rpc-name:
-        type: "string"
-  sli.api.testresults.TestResult:
-    type: "object"
-    properties:
-      results:
-        type: "array"
-        items:
-          type: "string"
-      test-identifier:
-        type: "string"
diff --git a/sliapi/model/yang/pom.xml b/sliapi/model/yang/pom.xml
deleted file mode 100755
index 4d35f025c..000000000
--- a/sliapi/model/yang/pom.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?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.ccsdk.parent</groupId>
-		<artifactId>binding-parent</artifactId>
-		<version>2.1.0-SNAPSHOT</version>
-		<relativePath/>
-	</parent>
-
-	<groupId>org.onap.ccsdk.sli.core</groupId>
-	<artifactId>sliapi-model-yang</artifactId>
-	<version>1.1.1-SNAPSHOT</version>
-	<packaging>bundle</packaging>
-
-	<name>ccsdk-sli-core :: sliapi :: ${project.artifactId}</name>
-
-	<dependencies>
-		<dependency>
-            <groupId>org.opendaylight.mdsal.binding.model.ietf</groupId>
-            <artifactId>rfc6991</artifactId>
-        </dependency>
-
-		
-	</dependencies>
-</project>
diff --git a/sliapi/model/yang/src/main/resources/sli-api.20161110.json b/sliapi/model/yang/src/main/resources/sli-api.20161110.json
deleted file mode 100644
index 1c6cdabfe..000000000
--- a/sliapi/model/yang/src/main/resources/sli-api.20161110.json
+++ /dev/null
@@ -1,554 +0,0 @@
-{
-  "swagger": "2.0",
-  "info": {
-    "version": "1.0.0"
-  },
-  "basePath": "/restconf",
-  "paths": {
-    "/config": {
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "body",
-            "name": "**(config)test-results",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/SLI-API(config)test-results-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)SLI-API_modulePOST"
-            }
-          }
-        },
-        "description": "Defines API to service logic interpreter",
-        "operationId": "POST-SLI-API_module"
-      }
-    },
-    "/config/SLI-API:test-results": {
-      "delete": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "description": "Test results",
-        "operationId": "DELETE-test-results"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)test-results"
-            }
-          }
-        },
-        "description": "Test results",
-        "operationId": "GET-test-results"
-      },
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "body",
-            "name": "**(config)test-result",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/SLI-API/test-results(config)test-result-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)test-resultsPOST"
-            }
-          }
-        },
-        "description": "Test results",
-        "operationId": "POST-test-results"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "body",
-            "name": "(config)test-results",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/SLI-API(config)test-results-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/SLI-API(config)test-results-TOP"
-            }
-          }
-        },
-        "description": "Test results",
-        "operationId": "PUT-test-results"
-      }
-    },
-    "/config/SLI-API:test-results/test-result/{test-identifier}": {
-      "delete": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "path",
-            "name": "test-identifier",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified"
-          }
-        },
-        "operationId": "DELETE-test-result"
-      },
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "path",
-            "name": "test-identifier",
-            "required": true,
-            "type": "string"
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(config)test-result"
-            }
-          }
-        },
-        "operationId": "GET-test-result"
-      },
-      "put": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "path",
-            "name": "test-identifier",
-            "required": true,
-            "type": "string"
-          },
-          {
-            "in": "body",
-            "name": "(config)test-result",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/SLI-API/test-results(config)test-result-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/SLI-API/test-results(config)test-result-TOP"
-            }
-          }
-        },
-        "operationId": "PUT-test-result"
-      }
-    },
-    "/operational/SLI-API:test-results": {
-      "get": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(operational)test-results"
-            }
-          }
-        },
-        "description": "Test results",
-        "operationId": "GET-test-results"
-      }
-    },
-    "/operations/SLI-API:execute-graph": {
-      "post": {
-        "consumes": [
-          "application/json",
-          "application/xml"
-        ],
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "parameters": [
-          {
-            "in": "body",
-            "name": "body",
-            "required": false,
-            "schema": {
-              "$ref": "#/definitions/(execute-graph)input-TOP"
-            }
-          }
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(execute-graph)output-TOP"
-            }
-          }
-        },
-        "description": " Method to add a new parameter.",
-        "operationId": "execute-graph"
-      }
-    },
-    "/operations/SLI-API:healthcheck": {
-      "post": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(healthcheck)output-TOP"
-            }
-          }
-        },
-        "operationId": "healthcheck"
-      }
-    },
-    "/operations/SLI-API:vlbcheck": {
-      "post": {
-        "produces": [
-          "application/json",
-          "application/xml"
-        ],
-        "responses": {
-          "200": {
-            "description": "No response was specified",
-            "schema": {
-              "$ref": "#/definitions/(vlbcheck)output-TOP"
-            }
-          }
-        },
-        "operationId": "vlbcheck"
-      }
-    }
-  },
-  "definitions": {
-    "(config)SLI-API_modulePOST": {
-      "properties": {
-        "test-results": {
-          "items": {
-            "$ref": "#/definitions/SLI-API(config)test-results"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "(config)sli-parameterPOST": {
-      "properties": {
-        "boolean-value": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "int-value": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "parameter-name": {
-          "$ref": "#/definitions/Optional.empty",
-          "description": "Parameter name"
-        },
-        "string-value": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "(config)test-resultPOST": {
-      "properties": {
-        "test-identifier": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "(config)test-resultsPOST": {
-      "properties": {
-        "test-result": {
-          "items": {
-            "$ref": "#/definitions/SLI-API/test-results(config)test-result"
-          },
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "(execute-graph)input": {
-      "properties": {
-        "SLI-API:mode": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:module-name": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:rpc-name": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:sli-parameter": {
-          "items": {
-            "$ref": "#/definitions/SLI-API(config)sli-parameter"
-          },
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "(execute-graph)input-TOP": {
-      "properties": {
-        "SLI-API:input": {
-          "items": {
-            "$ref": "#/definitions/(execute-graph)input"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "(execute-graph)output": {
-      "properties": {
-        "SLI-API:ack-final-indicator": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:context-memory-json": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:response-code": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:response-message": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "(execute-graph)output-TOP": {
-      "properties": {
-        "SLI-API:output": {
-          "items": {
-            "$ref": "#/definitions/(execute-graph)output"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "(healthcheck)output": {
-      "properties": {
-        "SLI-API:ack-final-indicator": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:context-memory-json": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:response-code": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:response-message": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "(healthcheck)output-TOP": {
-      "properties": {
-        "SLI-API:output": {
-          "items": {
-            "$ref": "#/definitions/(healthcheck)output"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "(vlbcheck)output": {
-      "properties": {
-        "SLI-API:ack-final-indicator": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:context-memory-json": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:response-code": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:response-message": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "(vlbcheck)output-TOP": {
-      "properties": {
-        "SLI-API:output": {
-          "items": {
-            "$ref": "#/definitions/(vlbcheck)output"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "SLI-API(config)sli-parameter": {
-      "properties": {
-        "SLI-API:boolean-value": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:int-value": {
-          "$ref": "#/definitions/Optional.empty"
-        },
-        "SLI-API:parameter-name": {
-          "$ref": "#/definitions/Optional.empty",
-          "description": "Parameter name"
-        },
-        "SLI-API:string-value": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "SLI-API(config)sli-parameter-TOP": {
-      "properties": {
-        "SLI-API:sli-parameter": {
-          "items": {
-            "$ref": "#/definitions/SLI-API(config)sli-parameter"
-          },
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "SLI-API(config)test-results": {
-      "properties": {
-        "SLI-API:test-result": {
-          "items": {
-            "$ref": "#/definitions/SLI-API/test-results(config)test-result"
-          },
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "SLI-API(config)test-results-TOP": {
-      "properties": {
-        "SLI-API:test-results": {
-          "description": "Test results",
-          "items": {
-            "$ref": "#/definitions/SLI-API(config)test-results"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "SLI-API(operational)test-results": {
-      "type": "object"
-    },
-    "SLI-API(operational)test-results-TOP": {
-      "properties": {
-        "SLI-API:test-results": {
-          "description": "Test results",
-          "items": {
-            "$ref": "#/definitions/SLI-API(operational)test-results"
-          },
-          "type": "object"
-        }
-      },
-      "type": "object"
-    },
-    "SLI-API/test-results(config)test-result": {
-      "properties": {
-        "SLI-API:results": {
-          "items": {
-            "$ref": "#/definitions/Optional.empty"
-          },
-          "type": "array"
-        },
-        "SLI-API:test-identifier": {
-          "$ref": "#/definitions/Optional.empty"
-        }
-      },
-      "type": "object"
-    },
-    "SLI-API/test-results(config)test-result-TOP": {
-      "properties": {
-        "SLI-API:test-result": {
-          "items": {
-            "$ref": "#/definitions/SLI-API/test-results(config)test-result"
-          },
-          "type": "array"
-        }
-      },
-      "type": "object"
-    },
-    "unique_empty_identifier": {}
-  }
-}
diff --git a/sliapi/model/yang/src/main/resources/sli-api.20161110.yaml b/sliapi/model/yang/src/main/resources/sli-api.20161110.yaml
deleted file mode 100644
index 3420c66b5..000000000
--- a/sliapi/model/yang/src/main/resources/sli-api.20161110.yaml
+++ /dev/null
@@ -1,254 +0,0 @@
----
-swagger: '2.0'
-info:
-  version: 1.0.0
-  title: "SLI API"
-basePath: '/restconf'
-schemes:
-  - http
-  - https
-paths:
-  '/restconf/config/SLI-API:test-results':
-    delete:
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-      description: Test results
-      operationId: delete-test-results
-    get:
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-results'
-      description: Test results
-      operationId: get-test-results
-    post:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: body
-          name: testResults
-          required: false
-          schema:
-            $ref: '#/definitions/test-results'
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-results'
-      description: Test results
-      operationId: post-test-results
-    put:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: body
-          name: testResults
-          required: false
-          schema:
-            $ref: '#/definitions/test-results'
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-results'
-      description: Test results
-      operationId: put-test-results
-
-  '/restconf/config/SLI-API:test-results/test-result/{test-identifier}':
-    delete:
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: path
-          name: test-identifier
-          required: true
-          type: string
-      responses:
-        '200':
-          description: No response was specified
-      operationId: delete-test-result
-    get:
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: path
-          name: test-identifier
-          required: true
-          type: string
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-result'
-      operationId: get-test-result
-    put:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: path
-          name: test-identifier
-          required: true
-          type: string
-        - in: body
-          name: testResult
-          required: false
-          schema:
-            $ref: '#/definitions/test-result'
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-result'
-      operationId: PUT-test-result
-
-  '/restconf/operational/SLI-API:test-results':
-    get:
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/test-results'
-      description: Test results
-      operationId: GET-test-results
-  '/restconf/operations/SLI-API:execute-graph':
-    post:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      parameters:
-        - in: body
-          name: executeGraphInput
-          required: false
-          schema:
-            $ref: '#/definitions/execute-graph-input'
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/response-fields'
-      description: ' Method to add a new parameter.'
-      operationId: execute-graph
-  '/restconf/operations/SLI-API:healthcheck':
-    post:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/response-fields'
-      operationId: healthcheck
-  '/restconf/operations/SLI-API:vlbcheck':
-    post:
-      consumes:
-        - application/json
-        - application/xml
-      produces:
-        - application/json
-        - application/xml
-      responses:
-        '200':
-          description: No response was specified
-          schema:
-            $ref: '#/definitions/response-fields'
-      operationId: vlbcheck
-
-definitions:
-  parameter-setting:
-    type: object
-    properties:
-      parameter-name:
-        type: string
-      int-value:
-        type: integer
-      string-value:
-        type: string
-      boolean-value:
-        type: boolean
-
-  response-fields:
-    type: object
-    properties:
-      response-code:
-        type: string
-      ack-final-indicator:
-        type: string
-      response-message:
-        type: string
-      context-memory-json:
-        type: string
-
-  test-results:
-    type: object
-    properties:
-      test-results:
-        type: array
-        items:
-          $ref: '#/definitions/test-result'
-
-  test-result:
-    type: object
-    properties:
-      test-identifier:
-        type: string
-      results:
-        type: array
-        items:
-          type: string
-
-  execute-graph-input:
-    properties:
-      'input':
-        type: object
-        properties:
-          'mode':
-             type: string
-          'module-name':
-            type: string
-          'rpc-name':
-            type: string
-          'sli-parameter':
-            items:
-              $ref: '#/definitions/parameter-setting'
-            type: array
-    type: object
-
-
-
-
-
-
-  unique_empty_identifier: {}
-
diff --git a/sliapi/model/yang/src/main/yang/sliapi.yang b/sliapi/model/yang/src/main/yang/sliapi.yang
deleted file mode 100755
index 98cbb2aa7..000000000
--- a/sliapi/model/yang/src/main/yang/sliapi.yang
+++ /dev/null
@@ -1,117 +0,0 @@
-module SLI-API {
-
-    yang-version 1;
-
-    namespace "org:onap:ccsdk:sli:core:sliapi";
-
-    prefix sample;
-
-    import ietf-inet-types { prefix "inet"; revision-date 2013-07-15; }
-
-    organization "ONAP";
-
-    contact
-        "Dan Timoney";
-
-    description
-        "Defines API to service logic interpreter";
-
-    revision "2016-11-10" {
-        description
-                "REST API to Service Logic Interpreter";
-    }
-
-    grouping parameter-setting {
-        description
-                "Parameter setting";
-
-        leaf parameter-name {
-            type string;
-            description "Parameter name";
-        }
-
-        leaf int-value {
-            type int32;
-        }
-        leaf string-value {
-            type string;
-        }
-        leaf boolean-value {
-            type boolean;
-        }
-    }
-
-    grouping response-fields {
-        leaf response-code {
-            type string;
-        }
-        leaf ack-final-indicator {
-            type string;
-        }
-        leaf response-message {
-            type string;
-        }
-        leaf context-memory-json {
-            type string;
-        }
-    }
-
-    container test-results {
-        description "Test results";
-
-            list test-result {
-                key "test-identifier";
-
-                leaf test-identifier {
-                    type string;
-                }
-
-                leaf-list results {
-                    type string;
-                }
-            }
-    }
-
-    rpc execute-graph {
-        description " Method to add a new parameter.";
-        input {
-
-            leaf module-name {
-                type string;
-            }
-
-            leaf rpc-name {
-                type string;
-            }
-
-            leaf mode {
-                type enumeration {
-                    enum sync;
-                    enum async;
-                }
-            }
-
-            list sli-parameter {
-                key "parameter-name";
-                uses parameter-setting;
-            }
-        }
-
-        output {
-           uses response-fields;
-        }
-    }
-
-    rpc healthcheck {
-        output {
-            uses response-fields;
-        }
-    }
-
-    rpc vlbcheck {
-        output {
-            uses response-fields;
-        }
-    }
-
-}