commit d271fbc05ad1f6df78f8ac19027768c4b7ead3ef
author wei wang <wwang2017@gmail.com> Mon Dec 04 15:36:31 2017 -0800
committer Yuta HIGUCHI <y-higuchi@opennetworking.org> Tue Dec 05 18:10:19 2017 +0000
tree 388bd68cc4118d53bfcf78d2c467f7995e3f15ba
parent 8ca2bc044702473261394e8329149cdc46601539

Update netconfig xml for Oplink device

Change-Id: Idaab45c053bd65e37e2bc4065a617af4ae7510fe

drivers/oplink/src/main/java/org/onosproject/drivers/oplink/OplinkOpticalPowerConfig.java

diff --git a/drivers/oplink/src/main/java/org/onosproject/drivers/oplink/OplinkOpticalPowerConfig.java b/drivers/oplink/src/main/java/org/onosproject/drivers/oplink/OplinkOpticalPowerConfig.java
index ced0b08..110096c 100644
--- a/drivers/oplink/src/main/java/org/onosproject/drivers/oplink/OplinkOpticalPowerConfig.java
+++ b/drivers/oplink/src/main/java/org/onosproject/drivers/oplink/OplinkOpticalPowerConfig.java
@@ -64,6 +64,7 @@
     public static final String KEY_PORTPWRCAPMAXTX = "port-power-capability-max-tx";
     public static final String KEY_PORTS_PORT = String.format("%s.%s", KEY_DATA_PORTS, KEY_PORT);
     public static final String KEY_PORTS_PORT_PROPERTY = String.format("%s.%s", KEY_PORTS_PORT, KEY_PORTPROPERTY);
+    public static final String KEY_OCMS = "ocms";
     // log
     private static final Logger log = getLogger(OplinkOpticalPowerConfig.class);
 
@@ -110,15 +111,13 @@
 
     private String getChannelPowerFilter(PortNumber port, OchSignal channel) {
         return new StringBuilder(xmlOpen(KEY_OPENOPTICALDEV_XMLNS))
-                .append(xmlOpen(KEY_PORTS))
+                .append(xmlOpen(KEY_OCMS))
                 .append(xml(KEY_PORTID, Long.toString(port.toLong())))
-                .append(xmlOpen(KEY_PORT))
                 .append(xmlOpen(KEY_OCMSTATS))
                 .append(xml(KEY_CHNUM, Integer.toString(channel.spacingMultiplier())))
                 .append(xmlEmpty(KEY_CHSTATS))
                 .append(xmlClose(KEY_OCMSTATS))
-                .append(xmlClose(KEY_PORT))
-                .append(xmlClose(KEY_PORTS))
+                .append(xmlClose(KEY_OCMS))
                 .append(xmlClose(KEY_OPENOPTICALDEV))
                 .toString();
     }