Change some code in roadm application.
1. Change inputPowerRange to powerRange in the port view page.
2. Replace the update Frequency methods in roadmUtil.
Change-Id: I19a840156d8cdcb9c142bd88a6b5a667bb135f77
diff --git a/apps/roadm/src/main/java/org/onosproject/roadm/RoadmPortViewMessageHandler.java b/apps/roadm/src/main/java/org/onosproject/roadm/RoadmPortViewMessageHandler.java
index 2aa80f7..97e2fee 100644
--- a/apps/roadm/src/main/java/org/onosproject/roadm/RoadmPortViewMessageHandler.java
+++ b/apps/roadm/src/main/java/org/onosproject/roadm/RoadmPortViewMessageHandler.java
@@ -64,14 +64,14 @@
private static final String MIN_FREQ = "minFreq";
private static final String MAX_FREQ = "maxFreq";
private static final String GRID = "grid";
- private static final String INPUT_POWER_RANGE = "inputPowerRange";
+ private static final String POWER_RANGE = "powerRange";
private static final String CURRENT_POWER = "currentPower";
private static final String TARGET_POWER = "targetPower";
private static final String HAS_TARGET_POWER = "hasTargetPower";
private static final String SERVICE_STATE = "serviceState";
private static final String[] COLUMN_IDS = {
- ID, TYPE, NAME, ENABLED, MIN_FREQ, MAX_FREQ, GRID, INPUT_POWER_RANGE,
+ ID, TYPE, NAME, ENABLED, MIN_FREQ, MAX_FREQ, GRID, POWER_RANGE,
CURRENT_POWER, SERVICE_STATE, TARGET_POWER, HAS_TARGET_POWER
};
@@ -134,7 +134,7 @@
.cell(MIN_FREQ, RoadmUtil.asTHz(minFreq))
.cell(MAX_FREQ, RoadmUtil.asTHz(maxFreq))
.cell(GRID, RoadmUtil.asGHz(channelSpacing))
- .cell(INPUT_POWER_RANGE, getInputPowerRange(deviceId, portNum))
+ .cell(POWER_RANGE, getPowerRange(deviceId, portNum))
.cell(CURRENT_POWER, getCurrentPower(deviceId, portNum))
.cell(SERVICE_STATE, getPortServiceState(deviceId, portNum))
.cell(TARGET_POWER, getTargetPower(deviceId, portNum))
@@ -163,10 +163,15 @@
channelSpacing = minOch.channelSpacing().frequency();
}
- // Returns the input power range as a string, N/A if the port is not an
- // input port
- private String getInputPowerRange(DeviceId deviceId, PortNumber portNumber) {
+ // Returns the power range as a string, N/A if the power range not exists.
+ // The power range would be input power range or target power range determined by port property.
+ // If the port is RX direction then acquire the input power range from driver.
+ // Otherwise there will be a TX direction port, thus acquire the target power range.
+ private String getPowerRange(DeviceId deviceId, PortNumber portNumber) {
Range<Long> range = roadmService.inputPortPowerRange(deviceId, portNumber);
+ if (range == null) {
+ range = roadmService.targetPortPowerRange(deviceId, portNumber);
+ }
return RoadmUtil.objectToString(range, RoadmUtil.NA);
}
diff --git a/apps/roadm/src/main/java/org/onosproject/roadm/RoadmUtil.java b/apps/roadm/src/main/java/org/onosproject/roadm/RoadmUtil.java
index d125c77..22e1791 100644
--- a/apps/roadm/src/main/java/org/onosproject/roadm/RoadmUtil.java
+++ b/apps/roadm/src/main/java/org/onosproject/roadm/RoadmUtil.java
@@ -30,12 +30,8 @@
public static final String MESSAGE = "message";
public static final String NA = "N/A";
public static final String UNKNOWN = "Unknown";
- public static final String NONE = "(none)";
public static final String NO_ROWS_MESSAGE = "No items found";
- public static final long GHZ = 1_000_000_000L;
- public static final long THZ = 1_000_000_000_000L;
-
private RoadmUtil() {
}
@@ -46,7 +42,7 @@
* @return GHz in string format
*/
public static String asGHz(Frequency value) {
- return value == null ? UNKNOWN : String.valueOf((double) value.asHz() / GHZ);
+ return value == null ? UNKNOWN : String.valueOf(value.asGHz());
}
/**
@@ -56,7 +52,7 @@
* @return THz in string format
*/
public static String asTHz(Frequency value) {
- return value == null ? UNKNOWN : String.valueOf((double) value.asHz() / THZ);
+ return value == null ? UNKNOWN : String.valueOf(value.asTHz());
}
/**
diff --git a/apps/roadm/src/main/resources/app/view/roadmPort/roadmPort.html b/apps/roadm/src/main/resources/app/view/roadmPort/roadmPort.html
index 9ef475b..43aeb93 100644
--- a/apps/roadm/src/main/resources/app/view/roadmPort/roadmPort.html
+++ b/apps/roadm/src/main/resources/app/view/roadmPort/roadmPort.html
@@ -37,7 +37,7 @@
<td colId="minFreq" sortable>Min Freq <span class="units">(THz)</span> </td>
<td colId="maxFreq" sortable>Max Freq <span class="units">(THz)</span> </td>
<td colId="grid" sortable>Grid <span class="units">(GHz)</span> </td>
- <td colId="portMac" sortable>Input Power Range </td>
+ <td colId="powerRange" sortable>Power Range </td>
<td colId="currentPower">Current Power <span class="units">(0.01dBm)</span> </td>
<td colId="serviceState" ng-show="showServiceState">Protection Status </td>
<td colId="targetPower" col-width="200px" ng-show="showTargetPower">Target Power <span class="units">(0.01dBm)</span> </td>
@@ -62,7 +62,7 @@
<td>{{item.minFreq}}</td>
<td>{{item.maxFreq}}</td>
<td>{{item.grid}}</td>
- <td>{{item.inputPowerRange}}</td>
+ <td>{{item.powerRange}}</td>
<td>{{item.currentPower}}</td>
<td ng-show="showServiceState">{{item.serviceState}}</td>
<td ng-show="showTargetPower" class="editable" roadm-power="item" roadm-set-power="setPortPower(port, targetVal, cb)"></td>