diff options
Diffstat (limited to 'sli/provider')
| -rw-r--r-- | sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java | 21 | ||||
| -rw-r--r-- | sli/provider/src/test/resources/l3sdn.properties | 66 |
2 files changed, 85 insertions, 2 deletions
diff --git a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java index 5ba0eb96..c00da68c 100644 --- a/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java +++ b/sli/provider/src/test/java/org/onap/ccsdk/sli/core/sli/provider/MdsalHelperTest.java @@ -21,6 +21,7 @@ package org.onap.ccsdk.sli.core.sli.provider; +import java.io.File; import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -32,6 +33,7 @@ import org.onap.ccsdk.sli.core.sli.SvcLogicGraph; 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.SliParameterBuilder; +import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddressBuilder; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -41,9 +43,10 @@ import junit.framework.TestCase; 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 static final String pathToSdnPropertiesFile = "src/test/resources/l3sdn.properties"; public void testSdnProperties() { + MdsalHelperTesterUtil.loadProperties(pathToSdnPropertiesFile); assertEquals("synccomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "synccomplete")); assertEquals("asynccomplete", MdsalHelperTesterUtil.mapEnumeratedValue("request-status", "asynccomplete")); @@ -67,13 +70,24 @@ public class MdsalHelperTest extends TestCase { params.add(parmBuilder.build()); parmBuilder.setParameterName("int-parm"); + parmBuilder.setBooleanValue(null); parmBuilder.setIntValue(1); params.add(parmBuilder.build()); parmBuilder.setParameterName("str-parm"); + parmBuilder.setIntValue(null); parmBuilder.setStringValue("hello"); params.add(parmBuilder.build()); + parmBuilder.setParameterName("ipaddress4-parm"); + parmBuilder.setStringValue(null); + parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("127.0.0.1")); + params.add(parmBuilder.build()); + + parmBuilder.setParameterName("ipaddress6-parm"); + parmBuilder.setIpaddressValue(IpAddressBuilder.getDefaultInstance("ef::1")); + params.add(parmBuilder.build()); + execBuilder.setMode(Mode.Sync); execBuilder.setModuleName("my-module"); @@ -107,7 +121,10 @@ public class MdsalHelperTest extends TestCase { 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"); - + props.setProperty("execute-graph-input.sli-parameter[3].parameter-name", "ipv4address-param"); + props.setProperty("execute-graph-input.sli-parameter[3].ipaddress-value", "127.0.0.1"); + props.setProperty("execute-graph-input.sli-parameter[4].parameter-name", "ipv6address-param"); + props.setProperty("execute-graph-input.sli-parameter[4].ipaddress-value", "ef::1"); ExecuteGraphInputBuilder execBuilder = new ExecuteGraphInputBuilder(); MdsalHelperTesterUtil.toBuilder(props, execBuilder); diff --git a/sli/provider/src/test/resources/l3sdn.properties b/sli/provider/src/test/resources/l3sdn.properties new file mode 100644 index 00000000..6f40ebca --- /dev/null +++ b/sli/provider/src/test/resources/l3sdn.properties @@ -0,0 +1,66 @@ +# yang conversion properties +# used to convert Enum back to the original yang value +yang.request-status.Synccomplete=synccomplete +yang.request-status.Asynccomplete=asynccomplete +yang.request-status.Notifycomplete=notifycomplete +yang.rpc-name.ServiceConfigurationOperation=service-configuration-operation +yang.rpc-name.SvcTopologyOperation=svc-topology-operation +yang.rpc-name.ServiceConfigurationNotification=service-configuration-notification +yang.rpc-action.Reserve=reserve +yang.rpc-action.Activate=activate +yang.rpc-action.Assign=assign +yang.rpc-action.Turnup=turnup +yang.rpc-action.Delete=delete +yang.rpc-action.Changereserve=changereserve +yang.rpc-action.Changeactivate=changeactivate +yang.rpc-action.Changedelete=changedelete +yang.rpc-action.Changeassign=changeassign +yang.svc-vnf-type.Vce=vce +yang.vnf-type.Vce=vce +yang.vnf-status.PendingCreate=pending-create +yang.vnf-status.Created=created +yang.vnf-status.Active=active +yang.vnf-status.PendingDelete=pending-delete +yang.connection-type.Customer=customer +yang.connection-type.Internet=internet +yang.net-status.PendingCreate=pending-create +yang.net-status.Created=created +yang.net-status.Active=active +yang.net-status.PendingDelete=pending-delete +yang.svc-action.Reserve=reserve +yang.svc-action.Activate=activate +yang.svc-action.Assign=assign +yang.svc-action.Turnup=turnup +yang.svc-action.Delete=delete +yang.svc-action.Changereserve=changereserve +yang.svc-action.Changeactivate=changeactivate +yang.svc-action.Changedelete=changedelete +yang.svc-action.Changeassign=changeassign +yang.service-type.SDNETHERNETINTERNET=SDN-ETHERNET-INTERNET +yang.internet-evc-speed-value._2=2 +yang.internet-evc-speed-value._4=4 +yang.internet-evc-speed-value._5=5 +yang.internet-evc-speed-value._8=8 +yang.internet-evc-speed-value._10=10 +yang.internet-evc-speed-value._20=20 +yang.internet-evc-speed-value._50=50 +yang.internet-evc-speed-value._100=100 +yang.internet-evc-speed-value._150=150 +yang.internet-evc-speed-value._250=250 +yang.internet-evc-speed-value._400=400 +yang.internet-evc-speed-value._500=500 +yang.internet-evc-speed-value._600=600 +yang.internet-evc-speed-value._1000=1000 +yang.ip-version.Ds=ds +yang.ip-version.V6=v6 +yang.routing-protocol.None=none +yang.routing-protocol.Bgp=bgp +yang.routing-protocol.Ospf=ospf +yang.routing-protocol.Igrp=igrp +yang.routing-protocol.Eigrp=eigrp +yang.routing-protocol.Rip=rip +yang.routing-protocol.IsIs=is-is +yang.vr-designation.Primary=primary +yang.feature-type.FIREWALLLITE=FIREWALL-LITE +yang.equipment-role.VPLSPE=VPLS-PE +yang.interface-role.CUSTOMERUPLINK=CUSTOMER-UPLINK |