mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-11-06 19:22:07 +01:00
Code Issues Projects Releases Wiki Activity

Bug fix for unit test with yang-tools-2.2b2

Browse Source 
Change-Id: If52e3e3460665a1bfc4b26ec641b07592077735b
This commit is contained in:
Sean Condon 2017-07-29 17:38:56 +01:00
parent 29718e6904
commit 57c4ff7c09
2 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
drivers/microsemi/src/main/java/org/onosproject/drivers/microsemi/yang/impl/MseaUniEvcServiceManager.java
View File

@ -119,14 +119,13 @@ public class MseaUniEvcServiceManager extends AbstractYangServiceImpl
ArrayList anis = new ArrayList<AnnotatedNodeInfo>(); ArrayList anis = new ArrayList<AnnotatedNodeInfo>();
for (BwpGroup bwpGrp:mseaUniEvcService.mefServices().profiles().bwpGroup()) { for (BwpGroup bwpGrp:mseaUniEvcService.mefServices().profiles().bwpGroup()) {
String bwpGroupIndex = String.valueOf(bwpGrp.groupIndex());
ResourceId.Builder ridBuilder = ResourceId.builder() ResourceId.Builder ridBuilder = ResourceId.builder()
.addBranchPointSchema("/", null) .addBranchPointSchema("/", null)
.addBranchPointSchema("mef-services", MSEA_UNI_EVC_SVC_NS) .addBranchPointSchema("mef-services", MSEA_UNI_EVC_SVC_NS)
.addBranchPointSchema("profiles", MSEA_UNI_EVC_SVC_NS) .addBranchPointSchema("profiles", MSEA_UNI_EVC_SVC_NS)
.addBranchPointSchema("bwp-group", MSEA_UNI_EVC_SVC_NS) .addBranchPointSchema("bwp-group", MSEA_UNI_EVC_SVC_NS)
.addKeyLeaf("group-index", MSEA_UNI_EVC_SVC_NS, bwpGroupIndex); .addKeyLeaf("group-index", MSEA_UNI_EVC_SVC_NS, bwpGrp.groupIndex());
AnnotatedNodeInfo ani = DefaultAnnotatedNodeInfo.builder() AnnotatedNodeInfo ani = DefaultAnnotatedNodeInfo.builder()
.resourceId(ridBuilder.build()) .resourceId(ridBuilder.build())

2
drivers/microsemi/src/test/java/org/onosproject/drivers/microsemi/EA1000MeterProviderTest.java
View File

@ -19,7 +19,6 @@ import java.util.HashSet;
import org.junit.After; import org.junit.After;
import org.junit.Before; import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test; import org.junit.Test;
import org.onosproject.core.DefaultApplicationId; import org.onosproject.core.DefaultApplicationId;
import org.onosproject.drivers.microsemi.yang.MockMseaUniEvcServiceManager; import org.onosproject.drivers.microsemi.yang.MockMseaUniEvcServiceManager;
@ -93,7 +92,6 @@ public class EA1000MeterProviderTest {
} }
@Test @Test
@Ignore("fixme: failing with onos-yang-tools-2.2.0-b1")
public void testPerformMeterOperationDeviceIdMeterRemove() { public void testPerformMeterOperationDeviceIdMeterRemove() {
DeviceId mockDeviceId = DeviceId.deviceId("netconf:1.2.3.4:830"); DeviceId mockDeviceId = DeviceId.deviceId("netconf:1.2.3.4:830");