1 files changed, 31 insertions, 33 deletions

diff --git a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java
index 50b7926a0..10bbbd91a 100644
--- a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java
+++ b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/PrintYangToPropTest.java
@@ -26,9 +26,7 @@ import java.util.Enumeration;
 import java.util.LinkedList;
 import java.util.List;
 import java.util.Properties;
-
 import org.junit.Test;
-import org.onap.ccsdk.sli.core.sli.provider.PrintYangToProp;
 import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInput.Mode;
 import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.ExecuteGraphInputBuilder;
 import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.TestResultsBuilder;
@@ -62,31 +60,31 @@ public class PrintYangToPropTest {
 		List<SliParameter> pList = new LinkedList<>();
 
 		SliParameterBuilder pBuilder = new SliParameterBuilder();
-		pBuilder.setParameterName("string-param");
-		pBuilder.setStringValue("hi");
-		pList.add(pBuilder.build());
-		pBuilder.setParameterName("int-param");
-		pBuilder.setIntValue(1);
-		pBuilder.setStringValue(null);
-		pList.add(pBuilder.build());
-		pBuilder.setParameterName("bool-param");
-		pBuilder.setIntValue(null);
-		pBuilder.setBooleanValue(true);
-		pList.add(pBuilder.build());
-		pBuilder.setParameterName("ipaddress-value1");
-		pBuilder.setBooleanValue(null);
-		pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1"));
-		pList.add(pBuilder.build());
-		pBuilder.setParameterName("ipaddress-value1");
-		pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("::1"));
-		pList.add(pBuilder.build());
-		pBuilder.setParameterName("ipprefix-value1");
-		pBuilder.setIpaddressValue(null);
-		pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("192.168.0.0/16"));
-		pList.add(pBuilder.build());
-		pBuilder.setParameterName("ipprefix-value2");
-		pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("2001:db8:3c4d::/48"));
-		pList.add(pBuilder.build());
+        pBuilder.setParameterName("string-param");
+        pBuilder.setStringValue("hi");
+        pList.add(pBuilder.build());
+        pBuilder.setParameterName("int-param");
+        pBuilder.setIntValue(1);
+        pBuilder.setStringValue(null);
+        pList.add(pBuilder.build());
+        pBuilder.setParameterName("bool-param");
+        pBuilder.setIntValue(null);
+        pBuilder.setBooleanValue(true);
+        pList.add(pBuilder.build());
+        pBuilder.setParameterName("ipaddress-value1");
+        pBuilder.setBooleanValue(null);
+        pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1"));
+        pList.add(pBuilder.build());
+        pBuilder.setParameterName("ipaddress-value2");
+        pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("::1"));
+        pList.add(pBuilder.build());
+        pBuilder.setParameterName("ipprefix-value1");
+        pBuilder.setIpaddressValue(null);
+        pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("192.168.0.0/16"));
+        pList.add(pBuilder.build());
+        pBuilder.setParameterName("ipprefix-value2");
+        pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("2001:db8:3c4d::/48"));
+        pList.add(pBuilder.build());
 
 
 
@@ -94,7 +92,7 @@ public class PrintYangToPropTest {
 
 
 		// Generate properties
-		props = PrintYangToProp.toProperties(props, egBuilder);
+		props = MdsalHelper.toProperties(props, egBuilder);
 
 		Enumeration propNames = props.propertyNames();
 
@@ -104,11 +102,11 @@ public class PrintYangToPropTest {
 		}
 
 		// Generate builder from properties just generated
-		PrintYangToProp.toBuilder(props, pBuilder);
-		
+		MdsalHelper.toBuilder(props, pBuilder);
+
 
 	}
-	
+
     @Test
     public void testWithList() {
         TestResultsBuilder resultsBuilder = new TestResultsBuilder();
@@ -125,7 +123,7 @@ public class PrintYangToPropTest {
 
         // Generate properties
         Properties props = new Properties();
-        props = PrintYangToProp.toProperties(props, resultsBuilder);
+        props = MdsalHelper.toProperties(props, resultsBuilder);
 
         Enumeration propNames = props.propertyNames();
 
@@ -135,7 +133,7 @@ public class PrintYangToPropTest {
         }
 
         // Generate builder from properties just generated
-        PrintYangToProp.toBuilder(props, resultsBuilder);
+        MdsalHelper.toBuilder(props, resultsBuilder);
 
     }