diff options
Diffstat (limited to 'core/sli/provider')
5 files changed, 35 insertions, 37 deletions
diff --git a/core/sli/provider/pom.xml b/core/sli/provider/pom.xml index 5544d673a..8f78bed8a 100755 --- a/core/sli/provider/pom.xml +++ b/core/sli/provider/pom.xml @@ -5,7 +5,7 @@ <parent> <groupId>org.onap.ccsdk.parent</groupId> <artifactId>binding-parent</artifactId> - <version>2.5.3</version> + <version>2.5.4</version> <relativePath/> </parent> diff --git a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java index 8ffab7bee..67726ecce 100755 --- a/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java +++ b/core/sli/provider/src/main/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelper.java @@ -488,7 +488,7 @@ public class MdsalHelper { String curValue = props.getProperty(curBase, ""); if ((curValue != null) && (curValue.length() > 0)) { - toObj.add(IpAddressBuilder.getDefaultInstance(curValue)); + toObj.add(IetfInetUtil.ipAddressFor(curValue)); foundValue = true; } } else if (isIpv4Address(elemType)) { @@ -511,7 +511,7 @@ public class MdsalHelper { String curValue = props.getProperty(curBase, ""); if ((curValue != null) && (curValue.length() > 0)) { - toObj.add(IpPrefixBuilder.getDefaultInstance(curValue)); + toObj.add(IetfInetUtil.ipPrefixFor(curValue)); foundValue = true; } } else if (isPortNumber(elemType)) { @@ -719,7 +719,7 @@ public class MdsalHelper { String curValue = props.getProperty(curBase, ""); if ((curValue != null) && (curValue.length() > 0)) { - toObj.add(IpAddressBuilder.getDefaultInstance(curValue)); + toObj.add(IetfInetUtil.ipAddressFor(curValue)); foundValue = true; } } else if (isIpv4Address(elemType)) { @@ -742,7 +742,7 @@ public class MdsalHelper { String curValue = props.getProperty(curBase, ""); if ((curValue != null) && (curValue.length() > 0)) { - toObj.add(IpPrefixBuilder.getDefaultInstance(curValue)); + toObj.add(IetfInetUtil.ipPrefixFor(curValue)); foundValue = true; } } else if (isPortNumber(elemType)) { @@ -916,7 +916,7 @@ public class MdsalHelper { if ((paramValue != null) && (paramValue.length() > 0)) { try { - IpAddress ipAddr = IpAddressBuilder.getDefaultInstance(paramValue); + IpAddress ipAddr = IetfInetUtil.ipAddressFor(paramValue); if (IPV4_ADDRESS.equals(simpleName)) { m.invoke(toObj, ipAddr.getIpv4Address()); @@ -953,7 +953,7 @@ public class MdsalHelper { } else if (IP_PREFIX.equals(simpleName)) { if ((paramValue != null) && (paramValue.length() > 0)) { try { - IpPrefix ipPrefix = IpPrefixBuilder.getDefaultInstance(paramValue); + IpPrefix ipPrefix = IetfInetUtil.ipPrefixFor(paramValue); m.invoke(toObj, ipPrefix); foundValue = true; } catch (Exception e) { @@ -998,7 +998,7 @@ public class MdsalHelper { } else if ("Host".equals(simpleName)) { if ((paramValue != null) && (paramValue.length() > 0)) { try { - Host host = HostBuilder.getDefaultInstance(paramValue); + Host host = IetfInetUtil.hostFor(paramValue); m.invoke(toObj, host); foundValue = true; } catch (Exception e) { 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 1e4b67d8f..676c5fce3 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 @@ -29,6 +29,7 @@ import java.util.*; 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.execute.graph.input.SliParameter; +import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameter; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.execute.graph.input.SliParameterKey; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.testmodel.rev190723.Builtin.SampleBits; @@ -47,12 +48,8 @@ import org.opendaylight.yang.gen.v1.test.WrapperObj; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.AsNumber; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.DomainName; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Dscp; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.HostBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressNoZoneBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpVersion; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4AddressNoZone; @@ -112,18 +109,18 @@ public class MdsalHelperTest extends TestCase { parmBuilder.setParameterName("ipaddress4-parm"); parmBuilder.setStringValue(null); - parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1")); + parmBuilder.setIpaddressValue(IetfInetUtil.ipAddressFor("127.0.0.1")); newParm = parmBuilder.build(); params.put(newParm.key(), newParm); parmBuilder.setParameterName("ipaddress6-parm"); - parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("ef::1")); + parmBuilder.setIpaddressValue(IetfInetUtil.ipAddressFor("ef::1")); newParm = parmBuilder.build(); params.put(newParm.key(), newParm); parmBuilder.setParameterName("ipprefix-parm"); parmBuilder.setIpaddressValue(null); - parmBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("10.0.0.0/24")); + parmBuilder.setIpprefixValue(IetfInetUtil.ipPrefixFor("10.0.0.0/24")); newParm = parmBuilder.build(); params.put(newParm.key(), newParm); @@ -217,10 +214,10 @@ public class MdsalHelperTest extends TestCase { public void testSingleIpAddressToProperties() throws Exception { Properties props = new Properties(); String ipAddress = "11.11.11.11"; - MdsalHelper.toProperties(props, IpAddressBuilder.getDefaultInstance(ipAddress)); + MdsalHelper.toProperties(props, IetfInetUtil.ipAddressFor(ipAddress)); assertEquals(ipAddress, props.getProperty("")); ipAddress = "cafe::8888"; - MdsalHelper.toProperties(props, IpAddressBuilder.getDefaultInstance(ipAddress)); + MdsalHelper.toProperties(props, IetfInetUtil.ipAddressFor(ipAddress)); assertEquals(ipAddress, props.getProperty("")); } @@ -245,7 +242,7 @@ public class MdsalHelperTest extends TestCase { String ipAddress = "11.11.11.11"; TestObjectBuilder b = new TestObjectBuilder(); List<IpAddress> ipAddressList = new ArrayList<IpAddress>(); - ipAddressList.add(IpAddressBuilder.getDefaultInstance(ipAddress)); + ipAddressList.add(IetfInetUtil.ipAddressFor(ipAddress)); b.setFloatingIp(ipAddressList); MdsalHelper.toProperties(props, b.build()); assertEquals(ipAddress, props.getProperty("test-object.floating-ip[0]")); @@ -273,7 +270,7 @@ public class MdsalHelperTest extends TestCase { public void testSingleIpv4AddressToProperties() throws Exception { Properties props = new Properties(); String v4address = "11.11.11.11"; - MdsalHelper.toProperties(props, IpAddressBuilder.getDefaultInstance(v4address).getIpv4Address()); + MdsalHelper.toProperties(props, IetfInetUtil.ipAddressFor(v4address).getIpv4Address()); assertEquals(v4address, props.getProperty("")); } @@ -292,7 +289,7 @@ public class MdsalHelperTest extends TestCase { TestObjectBuilder b = new TestObjectBuilder(); List<Ipv4Address> v4list = new ArrayList<Ipv4Address>(); - v4list.add(IpAddressBuilder.getDefaultInstance(v4address).getIpv4Address()); + v4list.add(IetfInetUtil.ipAddressFor(v4address).getIpv4Address()); b.setFloatingIpV4(v4list); MdsalHelper.toProperties(props, b.build()); assertEquals(v4address, props.getProperty("test-object.floating-ip-v4[0]")); @@ -312,8 +309,8 @@ public class MdsalHelperTest extends TestCase { public void testSingleIpv6AddressToProperties() throws Exception { Properties props = new Properties(); String v6address = "cafe::8888"; - MdsalHelper.toProperties(props, IpAddressBuilder.getDefaultInstance(v6address).getIpv6Address()); - MdsalHelper.toBuilder(props, IpAddressBuilder.getDefaultInstance("cafe::8887")); + MdsalHelper.toProperties(props, IetfInetUtil.ipAddressFor(v6address).getIpv6Address()); + MdsalHelper.toBuilder(props, IetfInetUtil.ipAddressFor("cafe::8887")); assertEquals(v6address, props.getProperty("")); } @@ -332,7 +329,7 @@ public class MdsalHelperTest extends TestCase { TestObjectBuilder b = new TestObjectBuilder(); List<Ipv6Address> v6list = new ArrayList<Ipv6Address>(); - v6list.add(IpAddressBuilder.getDefaultInstance(v6address).getIpv6Address()); + v6list.add(IetfInetUtil.ipAddressFor(v6address).getIpv6Address()); b.setFloatingIpV6(v6list); MdsalHelper.toProperties(props, b.build()); assertEquals(v6address, props.getProperty("test-object.floating-ip-v6[0]")); @@ -396,7 +393,7 @@ public class MdsalHelperTest extends TestCase { public void testIpPrefix() throws Exception { String ipPrefix = "10.0.0.0/24"; Properties props = new Properties(); - MdsalHelper.toProperties(props, IpPrefixBuilder.getDefaultInstance(ipPrefix)); + MdsalHelper.toProperties(props, IetfInetUtil.ipPrefixFor(ipPrefix)); assertEquals(ipPrefix, props.getProperty("")); } @@ -417,7 +414,7 @@ public class MdsalHelperTest extends TestCase { public void testIetfInet() throws Exception { Properties props = new Properties(); Inet6Address address = - IetfInetUtil.INSTANCE.inet6AddressFor(IpAddressBuilder.getDefaultInstance("cafe::8888").getIpv6Address()); + IetfInetUtil.INSTANCE.inet6AddressFor(IetfInetUtil.ipAddressFor("cafe::8888").getIpv6Address()); MdsalHelper.toProperties(props, address); assertEquals("/cafe:0:0:0:0:0:0:8888", props.getProperty("")); } @@ -711,14 +708,14 @@ public class MdsalHelperTest extends TestCase { sampleBuilder.setIpv6FlowLabel(Ipv6FlowLabel.getDefaultInstance("3")); sampleBuilder.setAsNumber(AsNumber.getDefaultInstance("4")); sampleBuilder.setIpv6Address(Ipv6Address.getDefaultInstance("fdda:5cc1:23:4::1f")); - sampleBuilder.setIpAddressNoZone(IpAddressNoZoneBuilder.getDefaultInstance("fdda:5cc1:23:4::1f")); + sampleBuilder.setIpAddressNoZone(IetfInetUtil.ipAddressNoZoneFor("fdda:5cc1:23:4::1f")); sampleBuilder.setIpv4Address(Ipv4Address.getDefaultInstance("192.168.1.2")); sampleBuilder.setIpv4AddressNoZone(Ipv4AddressNoZone.getDefaultInstance("192.168.1.3")); sampleBuilder.setIpv6AddressNoZone(Ipv6AddressNoZone.getDefaultInstance("fdda:5cc1:23:4::1f")); sampleBuilder.setIpv4Prefix(Ipv4Prefix.getDefaultInstance("198.51.100.0/24")); sampleBuilder.setIpv6Prefix(Ipv6Prefix.getDefaultInstance("2001:db8:aaaa:1111::100/64")); sampleBuilder.setDomainName(DomainName.getDefaultInstance("onap.org")); - sampleBuilder.setHost(HostBuilder.getDefaultInstance("machine.onap.org")); + sampleBuilder.setHost(IetfInetUtil.hostFor("machine.onap.org")); sampleBuilder.setUri(Uri.getDefaultInstance("http://wiki.onap.org:8080")); Properties props = new Properties(); @@ -792,7 +789,7 @@ public class MdsalHelperTest extends TestCase { assertEquals(AsNumber.getDefaultInstance("4"), result.getAsNumber()); assertEquals(DomainName.getDefaultInstance("onap.org"), result.getDomainName()); assertEquals(Dscp.getDefaultInstance("1"), result.getDscp()); - // assertEquals(HostBuilder.getDefaultInstance("machine.onap.org").getDomainName(), + // assertEquals(IetfInetUtil.hostFor("machine.onap.org").getDomainName(), // result.getHost().getDomainName()); assertEquals(Ipv6AddressNoZone.getDefaultInstance("fdda:5cc1:23:4::1f").getValue(), result.getIpv6AddressNoZone().getValue()); @@ -801,7 +798,7 @@ public class MdsalHelperTest extends TestCase { assertEquals(Ipv4AddressNoZone.getDefaultInstance("192.168.1.3"), result.getIpv4AddressNoZone()); assertEquals(Ipv4Prefix.getDefaultInstance("198.51.100.0/24"), result.getIpv4Prefix()); assertEquals(Ipv6Address.getDefaultInstance("fdda:5cc1:23:4::1f"), result.getIpv6Address()); - assertEquals(IpAddressNoZoneBuilder.getDefaultInstance("fdda:5cc1:23:4::1f").getIpv6AddressNoZone().getValue(), + assertEquals(IetfInetUtil.ipAddressNoZoneFor("fdda:5cc1:23:4::1f").getIpv6AddressNoZone().getValue(), result.getIpv6AddressNoZone().getValue()); assertEquals(Ipv6FlowLabel.getDefaultInstance("3"), result.getIpv6FlowLabel()); assertEquals(Ipv6Prefix.getDefaultInstance("2001:db8:aaaa:1111::100/64"), result.getIpv6Prefix()); 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 1ccbc90e9..552375c7e 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 @@ -41,8 +41,9 @@ import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.exe import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResult; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultBuilder; import org.opendaylight.yang.gen.v1.org.onap.ccsdk.sli.core.sliapi.rev161110.test.results.TestResultKey; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddressBuilder; -import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpPrefixBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IetfInetUtil; + +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ieee754.rev130819.Ieee754Data; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -80,17 +81,17 @@ public class PrintYangToPropTest { pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipaddress-value1"); pBuilder.setBooleanValue(null); - pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1")); + pBuilder.setIpaddressValue(IetfInetUtil.ipAddressFor("127.0.0.1")); pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipaddress-value2"); - pBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("::1")); + pBuilder.setIpaddressValue(IetfInetUtil.ipAddressFor("::1")); pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipprefix-value1"); pBuilder.setIpaddressValue(null); - pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("192.168.0.0/16")); + pBuilder.setIpprefixValue(IetfInetUtil.ipPrefixFor("192.168.0.0/16")); pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); pBuilder.setParameterName("ipprefix-value2"); - pBuilder.setIpprefixValue(IpPrefixBuilder.getDefaultInstance("2001:db8:3c4d::/48")); + pBuilder.setIpprefixValue(IetfInetUtil.ipPrefixFor("2001:db8:3c4d::/48")); pMap.put(new SliParameterKey(pBuilder.getParameterName()), pBuilder.build()); diff --git a/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java index 63ce63672..aaf8f85c0 100755 --- a/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java +++ b/core/sli/provider/src/test/java/org/opendaylight/yang/gen/v1/test/TestObjectBuilder.java @@ -5,9 +5,9 @@ import java.util.List; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.IpAddress;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv4Address;
import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev130715.Ipv6Address;
-import org.opendaylight.yangtools.concepts.Builder;
-public class TestObjectBuilder implements Builder<TestObject> {
+
+public class TestObjectBuilder {
private List<IpAddress> _floatingIp;
private List<Ipv4Address> _floatingIpV4;
private List<Ipv6Address> _floatingIpV6;
|