migrate sli to alu-SR1

migrate ODL interfaces and fix code for changes in alu-SR1

Issue-ID: CCSDK-3089
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>
Change-Id: Id48dcfc517585f2ce6b30047113cd1d173c3c9dc
Signed-off-by: Michael DÜrre <michael.duerre@highstreet-technologies.com>

3 files changed, 36 insertions, 38 deletions

diff --git a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
index 93d9931d0..9d2ae2385 100755
--- a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
+++ b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java
@@ -72,6 +72,7 @@ public class MdsalHelperTest extends TestCase {
   private static final Logger LOG = LoggerFactory.getLogger(MdsalHelperTest.class);
   public static final String pathToSdnPropertiesFile = "src/test/resources/l3sdn.properties";
 
+
   public void testSdnProperties() {
 
     MdsalHelperTesterUtil.loadProperties(pathToSdnPropertiesFile);
@@ -156,7 +157,7 @@ public class MdsalHelperTest extends TestCase {
     props.setProperty("execute-graph-input.rpc", "do-it-now");
     props.setProperty("execute-graph-input.sli-parameter[0].parameter-name", "bool-parm");
     props.setProperty("execute-graph-input.sli-parameter[0].boolean-value", "true");
-    props.setProperty("execute-graph-input,sli-parameter[1].parameter-name", "int-param");
+    props.setProperty("execute-graph-input.sli-parameter[1].parameter-name", "int-param");
     props.setProperty("execute-graph-input.sli-parameter[1].int-value", "1");
     props.setProperty("execute-graph-input.sli-parameter[2].parameter-name", "str-param");
     props.setProperty("execute-graph-input.sli-parameter[2].str-value", "hello");
diff --git a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java
index 2167b8101..0e1ae5e83 100644
--- a/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java
+++ b/core/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTesterUtil.java
@@ -8,9 +8,9 @@
  * 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.
@@ -21,14 +21,13 @@
 
 package org.onap.ccsdk.sli.core.sli.provider;
 
-import org.onap.ccsdk.sli.core.sli.provider.MdsalHelper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 public class MdsalHelperTesterUtil extends MdsalHelper {
 
     private static final Logger LOG = LoggerFactory.getLogger(MdsalHelperTesterUtil.class);
-    
+
     //Normally static init of classes goes here for some weird classloader thing
     static {
         String str = "Hello World!";
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);
 
     }