[ONOS-5544] Refactor of JUNIT for FUJITSU NETCONF
Change-Id: I1b43ce194afc094ffb04a4c5cf2d2311030fdc4b
diff --git a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltControllerConfig.java b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltControllerConfig.java
index 07edd32..b50da5f 100644
--- a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltControllerConfig.java
+++ b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltControllerConfig.java
@@ -97,7 +97,7 @@
if (mastershipService.isLocalMaster(ncDeviceId)) {
try {
StringBuilder request = new StringBuilder();
- request.append(VOLT_NE_OPEN).append(VOLT_NE_NAMESPACE).append(">\n");
+ request.append(VOLT_NE_OPEN + VOLT_NE_NAMESPACE + ">\n");
request.append(buildEmptyTag(VOLT_OFCONFIG));
request.append(VOLT_NE_CLOSE);
diff --git a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuConfig.java b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuConfig.java
index be16f55..8b2ad63 100644
--- a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuConfig.java
+++ b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltOnuConfig.java
@@ -89,25 +89,25 @@
try {
StringBuilder request = new StringBuilder();
- request.append(VOLT_NE_OPEN).append(VOLT_NE_NAMESPACE);
- request.append(ANGLE_RIGHT).append(NEW_LINE);
+ request.append(VOLT_NE_OPEN + VOLT_NE_NAMESPACE);
+ request.append(ANGLE_RIGHT + NEW_LINE);
if (onuId != null) {
- request.append(buildStartTag(VOLT_ONUS));
- request.append(buildStartTag(ONUS_PERLINK));
- request.append(buildStartTag(PONLINK_ID, false));
- request.append(onuId[FIRST_PART]);
- request.append(buildEndTag(PONLINK_ID));
+ request.append(buildStartTag(VOLT_ONUS))
+ .append(buildStartTag(ONUS_PERLINK))
+ .append(buildStartTag(PONLINK_ID, false))
+ .append(onuId[FIRST_PART])
+ .append(buildEndTag(PONLINK_ID));
if (onuId.length > ONE) {
- request.append(buildStartTag(ONUS_LIST));
- request.append(buildStartTag(ONU_INFO));
- request.append(buildStartTag(ONU_ID, false));
- request.append(onuId[SECOND_PART]);
- request.append(buildEndTag(ONU_ID));
- request.append(buildEndTag(ONU_INFO));
- request.append(buildEndTag(ONUS_LIST));
+ request.append(buildStartTag(ONUS_LIST))
+ .append(buildStartTag(ONU_INFO))
+ .append(buildStartTag(ONU_ID, false))
+ .append(onuId[SECOND_PART])
+ .append(buildEndTag(ONU_ID))
+ .append(buildEndTag(ONU_INFO))
+ .append(buildEndTag(ONUS_LIST));
}
- request.append(buildEndTag(ONUS_PERLINK));
- request.append(buildEndTag(VOLT_ONUS));
+ request.append(buildEndTag(ONUS_PERLINK))
+ .append(buildEndTag(VOLT_ONUS));
} else {
request.append(buildEmptyTag(VOLT_ONUS));
}
@@ -160,20 +160,20 @@
try {
StringBuilder request = new StringBuilder();
- request.append(ANGLE_LEFT).append(ONU_SET_CONFIG).append(SPACE);
- request.append(VOLT_NE_NAMESPACE).append(ANGLE_RIGHT).append(NEW_LINE);
- request.append(buildStartTag(PONLINK_ID, false));
- request.append(onuId[FIRST_PART]);
- request.append(buildEndTag(PONLINK_ID));
- request.append(buildStartTag(ONU_ID, false));
- request.append(onuId[SECOND_PART]);
- request.append(buildEndTag(ONU_ID));
- request.append(buildStartTag(CONFIG_INFO));
- request.append(buildStartTag(data[SECOND_PART], false));
- request.append(data[THIRD_PART]);
- request.append(buildEndTag(data[SECOND_PART]));
- request.append(buildEndTag(CONFIG_INFO));
- request.append(buildEndTag(ONU_SET_CONFIG));
+ request.append(ANGLE_LEFT + ONU_SET_CONFIG + SPACE);
+ request.append(VOLT_NE_NAMESPACE + ANGLE_RIGHT + NEW_LINE);
+ request.append(buildStartTag(PONLINK_ID, false))
+ .append(onuId[FIRST_PART])
+ .append(buildEndTag(PONLINK_ID))
+ .append(buildStartTag(ONU_ID, false))
+ .append(onuId[SECOND_PART])
+ .append(buildEndTag(ONU_ID))
+ .append(buildStartTag(CONFIG_INFO))
+ .append(buildStartTag(data[SECOND_PART], false))
+ .append(data[THIRD_PART])
+ .append(buildEndTag(data[SECOND_PART]))
+ .append(buildEndTag(CONFIG_INFO))
+ .append(buildEndTag(ONU_SET_CONFIG));
reply = controller
.getDevicesMap()
@@ -213,42 +213,42 @@
try {
StringBuilder request = new StringBuilder();
- request.append(VOLT_NE_OPEN).append(VOLT_NE_NAMESPACE);
- request.append(ANGLE_RIGHT).append(NEW_LINE);
+ request.append(VOLT_NE_OPEN + VOLT_NE_NAMESPACE);
+ request.append(ANGLE_RIGHT + NEW_LINE);
request.append(buildStartTag(VOLT_STATISTICS));
if (onuId != null) {
- request.append(buildStartTag(ONU_STATISTICS));
- request.append(buildStartTag(ONU_GEM_STATS));
- request.append(buildStartTag(GEM_STATS));
- request.append(buildStartTag(PONLINK_ID, false));
- request.append(onuId[FIRST_PART]);
- request.append(buildEndTag(PONLINK_ID));
+ request.append(buildStartTag(ONU_STATISTICS))
+ .append(buildStartTag(ONU_GEM_STATS))
+ .append(buildStartTag(GEM_STATS))
+ .append(buildStartTag(PONLINK_ID, false))
+ .append(onuId[FIRST_PART])
+ .append(buildEndTag(PONLINK_ID));
if (onuId.length > ONE) {
- request.append(buildStartTag(ONU_ID, false));
- request.append(onuId[SECOND_PART]);
- request.append(buildEndTag(ONU_ID));
+ request.append(buildStartTag(ONU_ID, false))
+ .append(onuId[SECOND_PART])
+ .append(buildEndTag(ONU_ID));
}
- request.append(buildEndTag(GEM_STATS));
- request.append(buildEndTag(ONU_GEM_STATS));
+ request.append(buildEndTag(GEM_STATS))
+ .append(buildEndTag(ONU_GEM_STATS));
- request.append(buildStartTag(ONU_ETH_STATS));
- request.append(buildStartTag(ETH_STATS));
- request.append(buildStartTag(PONLINK_ID, false));
- request.append(onuId[FIRST_PART]);
- request.append(buildEndTag(PONLINK_ID));
+ request.append(buildStartTag(ONU_ETH_STATS))
+ .append(buildStartTag(ETH_STATS))
+ .append(buildStartTag(PONLINK_ID, false))
+ .append(onuId[FIRST_PART])
+ .append(buildEndTag(PONLINK_ID));
if (onuId.length > ONE) {
- request.append(buildStartTag(ONU_ID, false));
- request.append(onuId[SECOND_PART]);
- request.append(buildEndTag(ONU_ID));
+ request.append(buildStartTag(ONU_ID, false))
+ .append(onuId[SECOND_PART])
+ .append(buildEndTag(ONU_ID));
}
- request.append(buildEndTag(ETH_STATS));
- request.append(buildEndTag(ONU_ETH_STATS));
- request.append(buildEndTag(ONU_STATISTICS));
+ request.append(buildEndTag(ETH_STATS))
+ .append(buildEndTag(ONU_ETH_STATS))
+ .append(buildEndTag(ONU_STATISTICS));
} else {
request.append(buildEmptyTag(ONU_STATISTICS));
}
- request.append(buildEndTag(VOLT_STATISTICS));
- request.append(VOLT_NE_CLOSE);
+ request.append(buildEndTag(VOLT_STATISTICS))
+ .append(VOLT_NE_CLOSE);
reply = controller
.getDevicesMap()
@@ -265,8 +265,7 @@
* Verifies input string for ponlink-id{-onu-id}.
*
* @param target input data in string
- * @return String array
- * @return null if an error condition is detected
+ * @return String array containing IDs; may be null if an error is detected
*/
private String[] checkIdString(String target) {
String[] onuId = target.split(HYPHEN);
@@ -302,8 +301,7 @@
*
* @param name input data in string
* @param value input data in string
- * @return true if the parameter is valid
- * @return false if the parameter is invalid
+ * @return true/false if the parameter is valid/invalid
*/
private boolean checkSetParam(String name, String value) {
if (!ONUCONFIGPARAMS.contains(name)) {
@@ -338,8 +336,7 @@
* @param states input data in string for parameter state
* @param name input data in string for parameter name
* @param value input data in string for parameter value
- * @return true if the param is valid
- * @return false if the param is invalid
+ * @return true/false if the parameter is valid/invalid
*/
private boolean validState(Set<String> states, String name, String value) {
if (!states.contains(value)) {
diff --git a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfig.java b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfig.java
index d8c64c6..1d6e145 100644
--- a/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfig.java
+++ b/drivers/fujitsu/src/main/java/org/onosproject/drivers/fujitsu/FujitsuVoltPonLinkConfig.java
@@ -100,8 +100,8 @@
try {
StringBuilder request = new StringBuilder();
- request.append(VOLT_NE_OPEN).append(VOLT_NE_NAMESPACE);
- request.append(ANGLE_RIGHT).append(NEW_LINE);
+ request.append(VOLT_NE_OPEN + VOLT_NE_NAMESPACE);
+ request.append(ANGLE_RIGHT + NEW_LINE);
request.append(buildStartTag(VOLT_PORTS));
if (target != null) {
int pon;
@@ -115,14 +115,13 @@
log.error("Non-number input for ponlink-id:{}", target);
return null;
}
- request.append(buildStartTag(GPON_PONLINK_PORTS));
- request.append(buildStartTag(GPON_PONLINK_PORT));
- request.append(buildStartTag(PONLINK_ID, false));
- request.append(target);
- request.append(buildEndTag(PONLINK_ID));
-
- request.append(buildEndTag(GPON_PONLINK_PORT));
- request.append(buildEndTag(GPON_PONLINK_PORTS));
+ request.append(buildStartTag(GPON_PONLINK_PORTS))
+ .append(buildStartTag(GPON_PONLINK_PORT))
+ .append(buildStartTag(PONLINK_ID, false))
+ .append(target)
+ .append(buildEndTag(PONLINK_ID))
+ .append(buildEndTag(GPON_PONLINK_PORT))
+ .append(buildEndTag(GPON_PONLINK_PORTS));
} else {
request.append(buildEmptyTag(GPON_PONLINK_PORTS));
}
@@ -164,23 +163,21 @@
boolean result = false;
try {
StringBuilder request = new StringBuilder();
- request.append(VOLT_NE_OPEN).append(VOLT_NE_NAMESPACE);
- request.append(ANGLE_RIGHT).append(NEW_LINE);
- request.append(buildStartTag(VOLT_PORTS));
- request.append(buildStartTag(GPON_PONLINK_PORTS));
- request.append(buildStartTag(GPON_PONLINK_PORT));
- request.append(buildStartTag(PONLINK_ID, false));
- request.append(data[FIRST_PART]);
- request.append(buildEndTag(PONLINK_ID));
-
- request.append(buildStartTag(data[SECOND_PART], false));
- request.append(data[THIRD_PART]);
- request.append(buildEndTag(data[SECOND_PART]));
-
- request.append(buildEndTag(GPON_PONLINK_PORT));
- request.append(buildEndTag(GPON_PONLINK_PORTS));
- request.append(buildEndTag(VOLT_PORTS));
- request.append(VOLT_NE_CLOSE);
+ request.append(VOLT_NE_OPEN + VOLT_NE_NAMESPACE);
+ request.append(ANGLE_RIGHT + NEW_LINE);
+ request.append(buildStartTag(VOLT_PORTS))
+ .append(buildStartTag(GPON_PONLINK_PORTS))
+ .append(buildStartTag(GPON_PONLINK_PORT))
+ .append(buildStartTag(PONLINK_ID, false))
+ .append(data[FIRST_PART])
+ .append(buildEndTag(PONLINK_ID))
+ .append(buildStartTag(data[SECOND_PART], false))
+ .append(data[THIRD_PART])
+ .append(buildEndTag(data[SECOND_PART]))
+ .append(buildEndTag(GPON_PONLINK_PORT))
+ .append(buildEndTag(GPON_PONLINK_PORTS))
+ .append(buildEndTag(VOLT_PORTS))
+ .append(VOLT_NE_CLOSE);
result = controller.getDevicesMap().get(ncDeviceId).getSession().
editConfig(RUNNING, null, request.toString());
@@ -194,8 +191,7 @@
* Verifies input string for valid options.
*
* @param target input data in string
- * @return String array
- * @return null if an error condition is detected
+ * @return String array containing IDs; may be null if an error is detected
*/
private String[] checkSetInput(String target) {
String[] data = target.split(COLON);
@@ -273,8 +269,7 @@
* @param states input data in string for parameter state
* @param name input data in string for parameter name
* @param value input data in string for parameter value
- * @return true if the param is valid
- * @return false if the param is invalid
+ * @return true/false if the param is valid/invalid
*/
private boolean validState(Set<String> states, String name, String value) {
if (!states.contains(value)) {