Update ASDC References to SDC 1/2

This patch changes ASDC to SDC in APPC code, bundle 
names and other pertinent places. This change
sanitizes SDC for Open Source. It 
is the first in a two part change, the first
updates code mentions and artifacts. The second will 
update database references.

Change-Id: Iffd73480cc325172b5d8969fe839728f1c88ef78
Issue-ID:APPC-179
Signed-off-by: mojahidi <mojahidul.islam@amdocs.com>

5 files changed, 0 insertions, 1553 deletions

diff --git a/appc-asdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java b/appc-asdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java
deleted file mode 100644
index a4487ac52..000000000
--- a/appc-asdc-listener/appc-yang-generator/src/test/java/org/openecomp/appc/TestYANGGenerator.java
+++ /dev/null
@@ -1,197 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-package org.openecomp.appc;
-
-import org.junit.*;
-import org.junit.rules.TemporaryFolder;
-import org.openecomp.appc.yang.YANGGenerator;
-import org.openecomp.appc.yang.exception.YANGGenerationException;
-import org.openecomp.appc.yang.impl.YANGGeneratorFactory;
-
-import java.io.*;
-
-/**
- * The Class TestYANGGenerator - Junit Test Class for all related test cases.
- */
-@Ignore
-public class TestYANGGenerator {
-
-	private YANGGenerator yangGenerator = YANGGeneratorFactory.getYANGGenerator();
-	private static String tosca;
-	private static String toscaWithSyntaxError;
-	private static String expectedYang;
-
-	@Rule
-	public TemporaryFolder temporaryFolder = new TemporaryFolder();
-
-	/**
-	 * Run before test method.
-	 *
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 */
-	@Before
-	public void runBeforeTestMethod() throws IOException {
-		tosca= getFileContent("tosca/toscaFile.yml");
-		toscaWithSyntaxError = getFileContent("tosca/toscaFileWithSyntaxError.yml");
-		expectedYang = getFileContent("yang/expectedYang.yang");
-	}
-
-	/**
-	 * Test YANG generator for success.
-	 *
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 * @throws YANGGenerationException the YANG generation exception
-	 */
-	@Test
-	public void TestYANGGeneratorForSuccess() throws IOException, YANGGenerationException {
-		File tempFile = temporaryFolder.newFile("generatedYang.yang");
-		OutputStream out = new FileOutputStream(tempFile);
-		Assert.assertNotNull(tosca);
-		Assert.assertFalse("tosca file is emply or blank", tosca.equals(""));
-		yangGenerator.generateYANG("ATD456", tosca, out);
-		out.flush();
-		out.close();
-		String generatedYang = getFileContent(tempFile);
-		Assert.assertEquals(expectedYang,generatedYang);
-	}
-
-	@Test(expected = YANGGenerationException.class)
-	public void testYangGenerationForSyntaxError() throws IOException, YANGGenerationException {
-		File tempFile = temporaryFolder.newFile("generatedYang.yang");
-		OutputStream out = new FileOutputStream(tempFile);
-		yangGenerator.generateYANG("ATD456",toscaWithSyntaxError,out);
-	}
-
-
-	/**
-	 * Test for Yang Generator which generates YANG that is not matching with expected YANG.
-	 *
-	 * @throws IOException Signals that an I/O exception has occurred.
-	 * @throws YANGGenerationException - the YANG generation exception
-	 */
-	@Test
-	public void unmatchedYangGenerationTest() throws IOException, YANGGenerationException {
-		File tempFile = temporaryFolder.newFile("generatedYang.yang");
-		OutputStream out = new FileOutputStream(tempFile);
-		yangGenerator.generateYANG("112476", tosca, out);
-		out.flush();
-		out.close();
-		String generatedYang = getFileContent(tempFile);
-		Assert.assertNotSame(expectedYang, generatedYang);
-
-	}
-
-    /**
-     * Yang generation test for empty tosca input.
-     *
-     * @throws YANGGenerationException the YANG generation exception
-     */
-    @Test(expected = YANGGenerationException.class)
-    public void YangGenerationTestForEmptyUniqueIDInput() throws IOException, YANGGenerationException {
-//        OutputStream out = new FileOutputStream(classLoader.getResource("yang/generatedYang.yang").getFile());
-		File tempFile = temporaryFolder.newFile("generatedYang.yang");
-		OutputStream out = new FileOutputStream(tempFile);
-        yangGenerator.generateYANG("", tosca, out);
-    }
-
-    /**
-     * Yang generation test for empty tosca input.
-     *
-     * @throws YANGGenerationException the YANG generation exception
-     */
-    @Test(expected = YANGGenerationException.class)
-    public void YangGenerationTestForUnSupportedType() throws IOException, YANGGenerationException {
-        tosca= getFileContent("tosca/toscaFileWithUnsupportedTypes.yml");
-		File tempFile = temporaryFolder.newFile("generatedYang.yang");
-		OutputStream out = new FileOutputStream(tempFile);
-        yangGenerator.generateYANG("", tosca, out);
-    }
-
-	/**
-	 * Yang generation test for empty tosca input.
-	 *
-	 * @throws YANGGenerationException the YANG generation exception
-	 */
-	@Test(expected = YANGGenerationException.class)
-	public void YangGenerationTestForEmptyToscaInput() throws IOException, YANGGenerationException {
-		File tempFile = temporaryFolder.newFile("generatedYang.yang");
-		OutputStream out = new FileOutputStream(tempFile);
-		yangGenerator.generateYANG("1111", "", out);
-	}
-
-	/**
-	 * YANG generation test with invalid method arguments.
-	 *
-	 * @throws YANGGenerationException the YANG generation exception
-	 */
-	@Test(expected = YANGGenerationException.class)
-	public void YANGGenerationTestWithInvalidMethodArguments() throws YANGGenerationException {	
-		yangGenerator.generateYANG("112476", "ToscaSAMPLE", null);
-	}
-
-	@Test(expected = YANGGenerationException.class)
-	public void YANGGenerationTestWithIOException() throws IOException, YANGGenerationException {
-		File tempFile = temporaryFolder.newFile("generatedYang.yang");
-		OutputStream out = new FileOutputStream(tempFile);
-		out.flush();
-		out.close();
-		yangGenerator.generateYANG("1111", tosca, out);
-	}
-
-
-	private String getFileContent(String fileName) throws IOException
-	{
-		ClassLoader classLoader = new TestYANGGenerator().getClass().getClassLoader();
-		InputStream is = new FileInputStream(classLoader.getResource(fileName).getFile());
-		BufferedReader buf = new BufferedReader(new InputStreamReader(is));
-		String line = buf.readLine();
-		StringBuilder sb = new StringBuilder();
-
-		while (line != null) {
-			sb.append(line).append("\n");
-			line = buf.readLine();
-		}
-		String fileString = sb.toString();
-		is.close();
-		return fileString;
-	}
-
-	private String getFileContent(File file) throws IOException
-	{
-		InputStream is = new FileInputStream(file);
-		BufferedReader buf = new BufferedReader(new InputStreamReader(is));
-		String line = buf.readLine();
-		StringBuilder sb = new StringBuilder();
-
-		while (line != null) {
-			sb.append(line).append("\n");
-			line = buf.readLine();
-		}
-		String fileString = sb.toString();
-		is.close();
-		return fileString;
-	}
-
-}
diff --git a/appc-asdc-listener/appc-yang-generator/src/test/resources/tosca/toscaFile.yml b/appc-asdc-listener/appc-yang-generator/src/test/resources/tosca/toscaFile.yml
deleted file mode 100644
index 0356678d1..000000000
--- a/appc-asdc-listener/appc-yang-generator/src/test/resources/tosca/toscaFile.yml
+++ /dev/null
@@ -1,319 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-# 
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
-
-node_types:
-  Property Definition:
-    derived_from: org.openecomp.genericvnf
-    version: V1
-    description: ''
-    properties:
-        param1:
-          type: domain-name
-          description: param1 desc
-          required: true
-          default: param1 def val
-          status: SUPPORTED
-        param2:
-          type: ipv4-address-no-zone
-          description: param2 desc
-          required: true
-          default: param2 def val
-          status: SUPPORTED
-        param3:
-          type: instance-identifier
-          description: param3 desc
-          required: true
-          default: param3 def val
-          status: SUPPORTED
-        param4:
-          type: uuid
-          description: param4 desc
-          required: true
-          default: param4 def val
-          status: SUPPORTED
-        param5:
-          type: empty
-          description: param5 desc
-          required: true
-          default: param5 def val
-          status: SUPPORTED
-        param6:
-          type: object-identifier-128
-          description: param6 desc
-          required: true
-          default: param6 def val
-          status: SUPPORTED
-        param7:
-          type: dscp
-          description: param7 desc
-          required: true
-          default: param7 def val
-          status: SUPPORTED
-        param8:
-          type: int64
-          description: param8 desc
-          required: true
-          default: param8 def val
-          status: SUPPORTED
-        param9:
-          type: zero-based-counter64
-          description: param9 desc
-          required: true
-          default: param9 def val
-          status: SUPPORTED
-        param10:
-          type: int8
-          description: param10 desc
-          required: true
-          default: param10 def val
-          status: SUPPORTED
-        param11:
-          type: host
-          description: param11 desc
-          required: true
-          default: param11 def val
-          status: SUPPORTED
-        param12:
-          type: uint32
-          description: param12 desc
-          required: true
-          default: param12 def val
-          status: SUPPORTED
-        param13:
-          type: timeticks
-          description: param13 desc
-          required: true
-          default: param13 def val
-          status: SUPPORTED
-        param15:
-          type: mac-address
-          description: param15 desc
-          required: true
-          default: param15 def val
-          status: SUPPORTED
-        param16:
-          type: as-number
-          description: param16 desc
-          required: true
-          default: param16 def val
-          status: SUPPORTED
-        param17:
-          type: counter64
-          description: param17 desc
-          required: true
-          default: param17 def val
-          status: SUPPORTED
-        param19:
-          type: xpath1.0
-          description: param19 desc
-          required: true
-          default: param19 def val
-          status: SUPPORTED
-        param20:
-          type: ip-version
-          description: param20 desc
-          required: true
-          default: param20 def val
-          status: SUPPORTED
-        param21:
-          type: port-number
-          description: param21 desc
-          required: true
-          default: param21 def val
-          status: SUPPORTED
-        param22:
-          type: int16
-          description: param22 desc
-          required: true
-          default: param22 def val
-          status: SUPPORTED
-        param23:
-          type: ipv6-address-no-zone
-          description: param23 desc
-          required: true
-          default: param23 def val
-          status: SUPPORTED
-        param24:
-          type: hex-string
-          description: param24 desc
-          required: true
-          default: param24 def val
-          status: SUPPORTED
-        param26:
-          type: uint64
-          description: param26 desc
-          required: true
-          default: param26 def val
-          status: SUPPORTED
-        param27:
-          type: uint8
-          description: param27 desc
-          required: true
-          default: param27 def val
-          status: SUPPORTED
-        param28:
-          type: ipv4-prefix
-          description: param28 desc
-          required: true
-          default: param28 def val
-          status: SUPPORTED
-        param29:
-          type: ipv6-prefix
-          description: param29 desc
-          required: true
-          default: param29 def val
-          status: SUPPORTED
-        param30:
-          type: gauge64
-          description: param30 desc
-          required: true
-          default: param30 def val
-          status: SUPPORTED
-        param31:
-          type: counter32
-          description: param31 desc
-          required: true
-          default: param31 def val
-          status: SUPPORTED
-        param32:
-          type: string
-          description: param32 desc
-          required: true
-          default: param32 def val
-          status: SUPPORTED
-        param33:
-          type: object-identifier
-          description: param33 desc
-          required: true
-          default: param33 def val
-          status: SUPPORTED
-        param34:
-          type: ip-address-no-zone
-          description: param34 desc
-          required: true
-          default: param34 def val
-          status: SUPPORTED
-        param36:
-          type: gauge32
-          description: param36 desc
-          required: true
-          default: param36 def val
-          status: SUPPORTED
-        param37:
-          type: ipv4-address
-          description: param37 desc
-          required: true
-          default: param37 def val
-          status: SUPPORTED
-        param38:
-          type: ip-prefix
-          description: param38 desc
-          required: true
-          default: param38 def val
-          status: SUPPORTED
-        param39:
-          type: uint16
-          description: param39 desc
-          required: true
-          default: param39 def val
-          status: SUPPORTED
-        param40:
-          type: timestamp
-          description: param40 desc
-          required: true
-          default: param40 def val
-          status: SUPPORTED
-        param42:
-          type: dotted-quad
-          description: param42 desc
-          required: true
-          default: param42 def val
-          status: SUPPORTED
-        param43:
-          type: uri
-          description: param43 desc
-          required: true
-          default: param43 def val
-          status: SUPPORTED
-        param44:
-          type: ipv6-address
-          description: param44 desc
-          required: true
-          default: param44 def val
-          status: SUPPORTED
-        param45:
-          type: ipv6-flow-label
-          description: param45 desc
-          required: true
-          default: param45 def val
-          status: SUPPORTED
-        param46:
-          type: zero-based-counter32
-          description: param46 desc
-          required: true
-          default: param46 def val
-          status: SUPPORTED
-        param47:
-          type: ip-address
-          description: param47 desc
-          required: true
-          default: param47 def val
-          status: SUPPORTED
-        param48:
-          type: boolean
-          description: param48 desc
-          required: true
-          default: param48 def val
-          status: SUPPORTED
-        param50:
-          type: yang-identifier
-          description: param50 desc
-          required: true
-          default: param50 def val
-          status: SUPPORTED
-        param51:
-          type: int32
-          description: param51 desc
-          required: true
-          default: param51 def val
-          status: SUPPORTED
-        param52:
-          type: date-and-time
-          description: param52 desc
-          required: true
-          default: param52 def val
-          status: SUPPORTED
-        param53:
-          type: phys-address
-          description: param53 desc
-          required: true
-          default: param53 def val
-          status: SUPPORTED
-topology_template:
-  node_templates:
-    Property Definition_Template:
-      type: Property Definition
-      properties:
-        param 1: <rule-type:rule1> <resk1:resk2 , resk2:resv2 , resk3:resv3> param1 source <reqk1:reqv1 , reqk2:reqv2 , reqk3:reqv3>
-        param 2: <rule-type:rule2> <resk1:resk2 , resk2:resv2> param2 source <reqk1:reqv1 , reqk2:reqv2 , reqk3:reqv3>
diff --git a/appc-asdc-listener/appc-yang-generator/src/test/resources/tosca/toscaFileWithSyntaxError.yml b/appc-asdc-listener/appc-yang-generator/src/test/resources/tosca/toscaFileWithSyntaxError.yml
deleted file mode 100644
index 8ef1729a9..000000000
--- a/appc-asdc-listener/appc-yang-generator/src/test/resources/tosca/toscaFileWithSyntaxError.yml
+++ /dev/null
@@ -1,319 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-# 
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
-
-node_types:
-  Property Definition:
-    derived_from: org.openecomp.genericvnf
-    version: V1
-    description: ''
-    properties:
-        param 1:
-          type: domain-name
-          description: param1 desc
-          required: true
-          default: param1 def val
-          status: SUPPORTED
-        param2:
-          type: ipv4-address-no-zone
-          description: param2 desc
-          required: true
-          default: param2 def val
-          status: SUPPORTED
-        param3:
-          type: instance-identifier
-          description: param3 desc
-          required: true
-          default: param3 def val
-          status: SUPPORTED
-        param4:
-          type: uuid
-          description: param4 desc
-          required: true
-          default: param4 def val
-          status: SUPPORTED
-        param5:
-          type: empty
-          description: param5 desc
-          required: true
-          default: param5 def val
-          status: SUPPORTED
-        param6:
-          type: object-identifier-128
-          description: param6 desc
-          required: true
-          default: param6 def val
-          status: SUPPORTED
-        param7:
-          type: dscp
-          description: param7 desc
-          required: true
-          default: param7 def val
-          status: SUPPORTED
-        param8:
-          type: int64
-          description: param8 desc
-          required: true
-          default: param8 def val
-          status: SUPPORTED
-        param9:
-          type: zero-based-counter64
-          description: param9 desc
-          required: true
-          default: param9 def val
-          status: SUPPORTED
-        param10:
-          type: int8
-          description: param10 desc
-          required: true
-          default: param10 def val
-          status: SUPPORTED
-        param11:
-          type: host
-          description: param11 desc
-          required: true
-          default: param11 def val
-          status: SUPPORTED
-        param12:
-          type: uint32
-          description: param12 desc
-          required: true
-          default: param12 def val
-          status: SUPPORTED
-        param13:
-          type: timeticks
-          description: param13 desc
-          required: true
-          default: param13 def val
-          status: SUPPORTED
-        param15:
-          type: mac-address
-          description: param15 desc
-          required: true
-          default: param15 def val
-          status: SUPPORTED
-        param16:
-          type: as-number
-          description: param16 desc
-          required: true
-          default: param16 def val
-          status: SUPPORTED
-        param17:
-          type: counter64
-          description: param17 desc
-          required: true
-          default: param17 def val
-          status: SUPPORTED
-        param19:
-          type: xpath1.0
-          description: param19 desc
-          required: true
-          default: param19 def val
-          status: SUPPORTED
-        param20:
-          type: ip-version
-          description: param20 desc
-          required: true
-          default: param20 def val
-          status: SUPPORTED
-        param21:
-          type: port-number
-          description: param21 desc
-          required: true
-          default: param21 def val
-          status: SUPPORTED
-        param22:
-          type: int16
-          description: param22 desc
-          required: true
-          default: param22 def val
-          status: SUPPORTED
-        param23:
-          type: ipv6-address-no-zone
-          description: param23 desc
-          required: true
-          default: param23 def val
-          status: SUPPORTED
-        param24:
-          type: hex-string
-          description: param24 desc
-          required: true
-          default: param24 def val
-          status: SUPPORTED
-        param26:
-          type: uint64
-          description: param26 desc
-          required: true
-          default: param26 def val
-          status: SUPPORTED
-        param27:
-          type: uint8
-          description: param27 desc
-          required: true
-          default: param27 def val
-          status: SUPPORTED
-        param28:
-          type: ipv4-prefix
-          description: param28 desc
-          required: true
-          default: param28 def val
-          status: SUPPORTED
-        param29:
-          type: ipv6-prefix
-          description: param29 desc
-          required: true
-          default: param29 def val
-          status: SUPPORTED
-        param30:
-          type: gauge64
-          description: param30 desc
-          required: true
-          default: param30 def val
-          status: SUPPORTED
-        param31:
-          type: counter32
-          description: param31 desc
-          required: true
-          default: param31 def val
-          status: SUPPORTED
-        param32:
-          type: string
-          description: param32 desc
-          required: true
-          default: param32 def val
-          status: SUPPORTED
-        param33:
-          type: object-identifier
-          description: param33 desc
-          required: true
-          default: param33 def val
-          status: SUPPORTED
-        param34:
-          type: ip-address-no-zone
-          description: param34 desc
-          required: true
-          default: param34 def val
-          status: SUPPORTED
-        param36:
-          type: gauge32
-          description: param36 desc
-          required: true
-          default: param36 def val
-          status: SUPPORTED
-        param37:
-          type: ipv4-address
-          description: param37 desc
-          required: true
-          default: param37 def val
-          status: SUPPORTED
-        param38:
-          type: ip-prefix
-          description: param38 desc
-          required: true
-          default: param38 def val
-          status: SUPPORTED
-        param39:
-          type: uint16
-          description: param39 desc
-          required: true
-          default: param39 def val
-          status: SUPPORTED
-        param40:
-          type: timestamp
-          description: param40 desc
-          required: true
-          default: param40 def val
-          status: SUPPORTED
-        param42:
-          type: dotted-quad
-          description: param42 desc
-          required: true
-          default: param42 def val
-          status: SUPPORTED
-        param43:
-          type: uri
-          description: param43 desc
-          required: true
-          default: param43 def val
-          status: SUPPORTED
-        param44:
-          type: ipv6-address
-          description: param44 desc
-          required: true
-          default: param44 def val
-          status: SUPPORTED
-        param45:
-          type: ipv6-flow-label
-          description: param45 desc
-          required: true
-          default: param45 def val
-          status: SUPPORTED
-        param46:
-          type: zero-based-counter32
-          description: param46 desc
-          required: true
-          default: param46 def val
-          status: SUPPORTED
-        param47:
-          type: ip-address
-          description: param47 desc
-          required: true
-          default: param47 def val
-          status: SUPPORTED
-        param48:
-          type: boolean
-          description: param48 desc
-          required: true
-          default: param48 def val
-          status: SUPPORTED
-        param50:
-          type: yang-identifier
-          description: param50 desc
-          required: true
-          default: param50 def val
-          status: SUPPORTED
-        param51:
-          type: int32
-          description: param51 desc
-          required: true
-          default: param51 def val
-          status: SUPPORTED
-        param52:
-          type: date-and-time
-          description: param52 desc
-          required: true
-          default: param52 def val
-          status: SUPPORTED
-        param53:
-          type: phys-address
-          description: param53 desc
-          required: true
-          default: param53 def val
-          status: SUPPORTED
-topology_template:
-  node_templates:
-    Property Definition_Template:
-      type: Property Definition
-      properties:
-        param 1: <rule-type:rule1> <resk1:resk2 , resk2:resv2 , resk3:resv3> param1 source <reqk1:reqv1 , reqk2:reqv2 , reqk3:reqv3>
-        param 2: <rule-type:rule2> <resk1:resk2 , resk2:resv2> param2 source <reqk1:reqv1 , reqk2:reqv2 , reqk3:reqv3>
diff --git a/appc-asdc-listener/appc-yang-generator/src/test/resources/tosca/toscaFileWithUnsupportedTypes.yml b/appc-asdc-listener/appc-yang-generator/src/test/resources/tosca/toscaFileWithUnsupportedTypes.yml
deleted file mode 100644
index e2102e134..000000000
--- a/appc-asdc-listener/appc-yang-generator/src/test/resources/tosca/toscaFileWithUnsupportedTypes.yml
+++ /dev/null
@@ -1,373 +0,0 @@
-###
-# ============LICENSE_START=======================================================
-# ONAP : APPC
-# ================================================================================
-# Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
-# ================================================================================
-# Copyright (C) 2017 Amdocs
-# =============================================================================
-# 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.
-# 
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
-# ============LICENSE_END=========================================================
-###
-
-node_types:
-  Property Definition:
-    derived_from: org.openecomp.genericvnf
-    version: V1
-    description: ''
-    properties:
-        param1:
-          type: domain-name
-          description: param1 desc
-          required: true
-          default: param1 def val
-          status: SUPPORTED
-        param2:
-          type: ipv4-address-no-zone
-          description: param2 desc
-          required: true
-          default: param2 def val
-          status: SUPPORTED
-        param3:
-          type: instance-identifier
-          description: param3 desc
-          required: true
-          default: param3 def val
-          status: SUPPORTED
-        param4:
-          type: uuid
-          description: param4 desc
-          required: true
-          default: param4 def val
-          status: SUPPORTED
-        param5:
-          type: empty
-          description: param5 desc
-          required: true
-          default: param5 def val
-          status: SUPPORTED
-        param6:
-          type: object-identifier-128
-          description: param6 desc
-          required: true
-          default: param6 def val
-          status: SUPPORTED
-        param7:
-          type: dscp
-          description: param7 desc
-          required: true
-          default: param7 def val
-          status: SUPPORTED
-        param8:
-          type: int64
-          description: param8 desc
-          required: true
-          default: param8 def val
-          status: SUPPORTED
-        param9:
-          type: zero-based-counter64
-          description: param9 desc
-          required: true
-          default: param9 def val
-          status: SUPPORTED
-        param10:
-          type: int8
-          description: param10 desc
-          required: true
-          default: param10 def val
-          status: SUPPORTED
-        param11:
-          type: host
-          description: param11 desc
-          required: true
-          default: param11 def val
-          status: SUPPORTED
-        param12:
-          type: uint32
-          description: param12 desc
-          required: true
-          default: param12 def val
-          status: SUPPORTED
-        param13:
-          type: timeticks
-          description: param13 desc
-          required: true
-          default: param13 def val
-          status: SUPPORTED
-        param14:
-          type: enumeration
-          description: param14 desc
-          required: true
-          default: param14 def val
-          status: SUPPORTED
-        param15:
-          type: mac-address
-          description: param15 desc
-          required: true
-          default: param15 def val
-          status: SUPPORTED
-        param16:
-          type: as-number
-          description: param16 desc
-          required: true
-          default: param16 def val
-          status: SUPPORTED
-        param17:
-          type: counter64
-          description: param17 desc
-          required: true
-          default: param17 def val
-          status: SUPPORTED
-        param18:
-          type: bits
-          description: param18 desc
-          required: true
-          default: param18 def val
-          status: SUPPORTED
-        param19:
-          type: xpath1.0
-          description: param19 desc
-          required: true
-          default: param19 def val
-          status: SUPPORTED
-        param20:
-          type: ip-version
-          description: param20 desc
-          required: true
-          default: param20 def val
-          status: SUPPORTED
-        param21:
-          type: port-number
-          description: param21 desc
-          required: true
-          default: param21 def val
-          status: SUPPORTED
-        param22:
-          type: int16
-          description: param22 desc
-          required: true
-          default: param22 def val
-          status: SUPPORTED
-        param23:
-          type: ipv6-address-no-zone
-          description: param23 desc
-          required: true
-          default: param23 def val
-          status: SUPPORTED
-        param24:
-          type: hex-string
-          description: param24 desc
-          required: true
-          default: param24 def val
-          status: SUPPORTED
-        param25:
-          type: decimal64
-          description: param25 desc
-          required: true
-          default: param25 def val
-          status: SUPPORTED
-        param26:
-          type: uint64
-          description: param26 desc
-          required: true
-          default: param26 def val
-          status: SUPPORTED
-        param27:
-          type: uint8
-          description: param27 desc
-          required: true
-          default: param27 def val
-          status: SUPPORTED
-        param28:
-          type: ipv4-prefix
-          description: param28 desc
-          required: true
-          default: param28 def val
-          status: SUPPORTED
-        param29:
-          type: ipv6-prefix
-          description: param29 desc
-          required: true
-          default: param29 def val
-          status: SUPPORTED
-        param30:
-          type: gauge64
-          description: param30 desc
-          required: true
-          default: param30 def val
-          status: SUPPORTED
-        param31:
-          type: counter32
-          description: param31 desc
-          required: true
-          default: param31 def val
-          status: SUPPORTED
-        param32:
-          type: string
-          description: param32 desc
-          required: true
-          default: param32 def val
-          status: SUPPORTED
-        param33:
-          type: object-identifier
-          description: param33 desc
-          required: true
-          default: param33 def val
-          status: SUPPORTED
-        param34:
-          type: ip-address-no-zone
-          description: param34 desc
-          required: true
-          default: param34 def val
-          status: SUPPORTED
-        param35:
-          type: identityref
-          description: param35 desc
-          required: true
-          default: param35 def val
-          status: SUPPORTED
-        param36:
-          type: gauge32
-          description: param36 desc
-          required: true
-          default: param36 def val
-          status: SUPPORTED
-        param37:
-          type: ipv4-address
-          description: param37 desc
-          required: true
-          default: param37 def val
-          status: SUPPORTED
-        param38:
-          type: ip-prefix
-          description: param38 desc
-          required: true
-          default: param38 def val
-          status: SUPPORTED
-        param39:
-          type: uint16
-          description: param39 desc
-          required: true
-          default: param39 def val
-          status: SUPPORTED
-        param40:
-          type: timestamp
-          description: param40 desc
-          required: true
-          default: param40 def val
-          status: SUPPORTED
-        param41:
-          type: union
-          description: param41 desc
-          required: true
-          default: param41 def val
-          status: SUPPORTED
-        param42:
-          type: dotted-quad
-          description: param42 desc
-          required: true
-          default: param42 def val
-          status: SUPPORTED
-        param43:
-          type: uri
-          description: param43 desc
-          required: true
-          default: param43 def val
-          status: SUPPORTED
-        param44:
-          type: ipv6-address
-          description: param44 desc
-          required: true
-          default: param44 def val
-          status: SUPPORTED
-        param45:
-          type: ipv6-flow-label
-          description: param45 desc
-          required: true
-          default: param45 def val
-          status: SUPPORTED
-        param46:
-          type: zero-based-counter32
-          description: param46 desc
-          required: true
-          default: param46 def val
-          status: SUPPORTED
-        param47:
-          type: ip-address
-          description: param47 desc
-          required: true
-          default: param47 def val
-          status: SUPPORTED
-        param48:
-          type: boolean
-          description: param48 desc
-          required: true
-          default: param48 def val
-          status: SUPPORTED
-        param49:
-          type: leafref
-          description: param49 desc
-          required: true
-          default: param49 def val
-          status: SUPPORTED
-        param50:
-          type: yang-identifier
-          description: param50 desc
-          required: true
-          default: param50 def val
-          status: SUPPORTED
-        param51:
-          type: int32
-          description: param51 desc
-          required: true
-          default: param51 def val
-          status: SUPPORTED
-        param52:
-          type: date-and-time
-          description: param52 desc
-          required: true
-          default: param52 def val
-          status: SUPPORTED
-        param53:
-          type: phys-address
-          description: param53 desc
-          required: true
-          default: param53 def val
-          status: SUPPORTED
-        param54:
-          type: phys-add
-          description: param54 desc
-          required: true
-          default: param54 def val
-          status: SUPPORTED
-        param55:
-          type: null
-          description: param55 desc
-          required: true
-          default: param55 def val
-          status: SUPPORTED
-        param56:
-          type: 
-          description: param56 desc
-          required: true
-          default: param56 def val
-          status: SUPPORTED
-topology_template:
-  node_templates:
-    Property Definition_Template:
-      type: Property Definition
-      properties:
-        param 1: <rule-type:rule1> <resk1:resk2 , resk2:resv2 , resk3:resv3> param1 source <reqk1:reqv1 , reqk2:reqv2 , reqk3:reqv3>
-        param 2: <rule-type:rule2> <resk1:resk2 , resk2:resv2> param2 source <reqk1:reqv1 , reqk2:reqv2 , reqk3:reqv3>
diff --git a/appc-asdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang b/appc-asdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang
deleted file mode 100644
index 29c89182b..000000000
--- a/appc-asdc-listener/appc-yang-generator/src/test/resources/yang/expectedYang.yang
+++ /dev/null
@@ -1,345 +0,0 @@
-/*-
- * ============LICENSE_START=======================================================
- * ONAP : APPC
- * ================================================================================
- * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
- * ================================================================================
- * Copyright (C) 2017 Amdocs
- * =============================================================================
- * 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.
- * 
- * ECOMP is a trademark and service mark of AT&T Intellectual Property.
- * ============LICENSE_END=========================================================
- */
-
-module ATD456 {
-	yang-version 1;
-	namespace "org:openecomp:appc:vnf:ATD456";
-    prefix appc-vnf;
-    organization "Copyright 2017 AT&T Intellectual Property.";
-
-    description
-        "Property Definition description";
-	
-	revision "2017-01-01" {
-        description
-                "ATD456 Configuration";
-    	}
-
-    import ietf-inet-types {
-           prefix inet;
-        }
-
-    import ietf-yang-types {
-    		prefix yang;
-        }
-
-	grouping vnf-config-grp {
-		container vnf-config  {
-				leaf param1 {	
-					type inet:domain-name;
-					description "param1 desc";
-					mandatory true;
-					default "param1 def val"; 
-				}
-				leaf param2 {	
-					type inet:ipv4-address-no-zone;
-					description "param2 desc";
-					mandatory true;
-					default "param2 def val"; 
-				}
-				leaf param3 {	
-					type instance-identifier;
-					description "param3 desc";
-					mandatory true;
-					default "param3 def val"; 
-				}
-				leaf param4 {	
-					type yang:uuid;
-					description "param4 desc";
-					mandatory true;
-					default "param4 def val"; 
-				}
-				leaf param5 {	
-					type empty;
-					description "param5 desc";
-					mandatory true;
-					default "param5 def val"; 
-				}
-				leaf param6 {	
-					type yang:object-identifier-128;
-					description "param6 desc";
-					mandatory true;
-					default "param6 def val"; 
-				}
-				leaf param7 {	
-					type inet:dscp;
-					description "param7 desc";
-					mandatory true;
-					default "param7 def val"; 
-				}
-				leaf param8 {	
-					type int64;
-					description "param8 desc";
-					mandatory true;
-					default "param8 def val"; 
-				}
-				leaf param9 {	
-					type yang:zero-based-counter64;
-					description "param9 desc";
-					mandatory true;
-					default "param9 def val"; 
-				}
-				leaf param10 {	
-					type int8;
-					description "param10 desc";
-					mandatory true;
-					default "param10 def val"; 
-				}
-				leaf param11 {	
-					type inet:host;
-					description "param11 desc";
-					mandatory true;
-					default "param11 def val"; 
-				}
-				leaf param12 {	
-					type uint32;
-					description "param12 desc";
-					mandatory true;
-					default "param12 def val"; 
-				}
-				leaf param13 {	
-					type yang:timeticks;
-					description "param13 desc";
-					mandatory true;
-					default "param13 def val"; 
-				}
-				leaf param15 {	
-					type yang:mac-address;
-					description "param15 desc";
-					mandatory true;
-					default "param15 def val"; 
-				}
-				leaf param16 {	
-					type inet:as-number;
-					description "param16 desc";
-					mandatory true;
-					default "param16 def val"; 
-				}
-				leaf param17 {	
-					type yang:counter64;
-					description "param17 desc";
-					mandatory true;
-					default "param17 def val"; 
-				}
-				leaf param19 {	
-					type yang:xpath1.0;
-					description "param19 desc";
-					mandatory true;
-					default "param19 def val"; 
-				}
-				leaf param20 {	
-					type inet:ip-version;
-					description "param20 desc";
-					mandatory true;
-					default "param20 def val"; 
-				}
-				leaf param21 {	
-					type inet:port-number;
-					description "param21 desc";
-					mandatory true;
-					default "param21 def val"; 
-				}
-				leaf param22 {	
-					type int16;
-					description "param22 desc";
-					mandatory true;
-					default "param22 def val"; 
-				}
-				leaf param23 {	
-					type inet:ipv6-address-no-zone;
-					description "param23 desc";
-					mandatory true;
-					default "param23 def val"; 
-				}
-				leaf param24 {	
-					type yang:hex-string;
-					description "param24 desc";
-					mandatory true;
-					default "param24 def val"; 
-				}
-				leaf param26 {	
-					type uint64;
-					description "param26 desc";
-					mandatory true;
-					default "param26 def val"; 
-				}
-				leaf param27 {	
-					type uint8;
-					description "param27 desc";
-					mandatory true;
-					default "param27 def val"; 
-				}
-				leaf param28 {	
-					type inet:ipv4-prefix;
-					description "param28 desc";
-					mandatory true;
-					default "param28 def val"; 
-				}
-				leaf param29 {	
-					type inet:ipv6-prefix;
-					description "param29 desc";
-					mandatory true;
-					default "param29 def val"; 
-				}
-				leaf param30 {	
-					type yang:gauge64;
-					description "param30 desc";
-					mandatory true;
-					default "param30 def val"; 
-				}
-				leaf param31 {	
-					type yang:counter32;
-					description "param31 desc";
-					mandatory true;
-					default "param31 def val"; 
-				}
-				leaf param32 {	
-					type string;
-					description "param32 desc";
-					mandatory true;
-					default "param32 def val"; 
-				}
-				leaf param33 {	
-					type yang:object-identifier;
-					description "param33 desc";
-					mandatory true;
-					default "param33 def val"; 
-				}
-				leaf param34 {	
-					type inet:ip-address-no-zone;
-					description "param34 desc";
-					mandatory true;
-					default "param34 def val"; 
-				}
-				leaf param36 {	
-					type yang:gauge32;
-					description "param36 desc";
-					mandatory true;
-					default "param36 def val"; 
-				}
-				leaf param37 {	
-					type inet:ipv4-address;
-					description "param37 desc";
-					mandatory true;
-					default "param37 def val"; 
-				}
-				leaf param38 {	
-					type inet:ip-prefix;
-					description "param38 desc";
-					mandatory true;
-					default "param38 def val"; 
-				}
-				leaf param39 {	
-					type uint16;
-					description "param39 desc";
-					mandatory true;
-					default "param39 def val"; 
-				}
-				leaf param40 {	
-					type yang:timestamp;
-					description "param40 desc";
-					mandatory true;
-					default "param40 def val"; 
-				}
-				leaf param42 {	
-					type yang:dotted-quad;
-					description "param42 desc";
-					mandatory true;
-					default "param42 def val"; 
-				}
-				leaf param43 {	
-					type inet:uri;
-					description "param43 desc";
-					mandatory true;
-					default "param43 def val"; 
-				}
-				leaf param44 {	
-					type inet:ipv6-address;
-					description "param44 desc";
-					mandatory true;
-					default "param44 def val"; 
-				}
-				leaf param45 {	
-					type inet:ipv6-flow-label;
-					description "param45 desc";
-					mandatory true;
-					default "param45 def val"; 
-				}
-				leaf param46 {	
-					type yang:zero-based-counter32;
-					description "param46 desc";
-					mandatory true;
-					default "param46 def val"; 
-				}
-				leaf param47 {	
-					type inet:ip-address;
-					description "param47 desc";
-					mandatory true;
-					default "param47 def val"; 
-				}
-				leaf param48 {	
-					type boolean;
-					description "param48 desc";
-					mandatory true;
-					default "param48 def val"; 
-				}
-				leaf param50 {	
-					type yang:yang-identifier;
-					description "param50 desc";
-					mandatory true;
-					default "param50 def val"; 
-				}
-				leaf param51 {	
-					type int32;
-					description "param51 desc";
-					mandatory true;
-					default "param51 def val"; 
-				}
-				leaf param52 {	
-					type yang:date-and-time;
-					description "param52 desc";
-					mandatory true;
-					default "param52 def val"; 
-				}
-				leaf param53 {	
-					type yang:phys-address;
-					description "param53 desc";
-					mandatory true;
-					default "param53 def val"; 
-				}
-			}
-	}
-	
-	container vnf-config-repo {
-		list vnf-config-list {
-			key "vnf-identifier";
-			leaf vnf-identifier {
-				type string;
-			}
-			uses vnf-config-grp;
-		}
-		
-	}	
-		
-}