Code Review
/
transportpce.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Add bug fixes for 2.2.1 devices
[transportpce.git]
/
common
/
src
/
main
/
java
/
org
/
opendaylight
/
transportpce
/
common
/
crossconnect
/
CrossConnectImpl121.java
diff --git
a/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java
b/common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java
index a7483894729c9f86958b13dd6697040e5be865df..c49ed9b2df604fbbe2a62174253c6bb6592a9c64 100644
(file)
--- a/
common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java
+++ b/
common/src/main/java/org/opendaylight/transportpce/common/crossconnect/CrossConnectImpl121.java
@@
-9,6
+9,7
@@
package org.opendaylight.transportpce.common.crossconnect;
import com.google.common.util.concurrent.ListenableFuture;
import java.math.BigDecimal;
import com.google.common.util.concurrent.ListenableFuture;
import java.math.BigDecimal;
+import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
@@
-93,11
+94,16
@@
public class CrossConnectImpl121 {
return Optional.empty();
}
return Optional.empty();
}
- public boolean deleteCrossConnect(String deviceId, String connectionNumber) {
+ public List<String> deleteCrossConnect(String deviceId, String connectionNumber) {
+ List<String> interfList = new ArrayList<>();
+ Optional<RoadmConnections> xc = getCrossConnect(deviceId, connectionNumber);
//Check if cross connect exists before delete
//Check if cross connect exists before delete
- if (!getCrossConnect(deviceId, connectionNumber).isPresent()) {
+ if (xc.isPresent()) {
+ interfList.add(xc.get().getSource().getSrcIf());
+ interfList.add(xc.get().getDestination().getDstIf());
+ } else {
LOG.warn("Cross connect does not exist, halting delete");
LOG.warn("Cross connect does not exist, halting delete");
- return
false
;
+ return
null
;
}
Future<Optional<DeviceTransaction>> deviceTxFuture = deviceTransactionManager.getDeviceTransaction(deviceId);
DeviceTransaction deviceTx;
}
Future<Optional<DeviceTransaction>> deviceTxFuture = deviceTransactionManager.getDeviceTransaction(deviceId);
DeviceTransaction deviceTx;
@@
-107,11
+113,11
@@
public class CrossConnectImpl121 {
deviceTx = deviceTxOpt.get();
} else {
LOG.error("Device transaction for device {} was not found!", deviceId);
deviceTx = deviceTxOpt.get();
} else {
LOG.error("Device transaction for device {} was not found!", deviceId);
- return
false
;
+ return
null
;
}
} catch (InterruptedException | ExecutionException e) {
LOG.error("Unable to obtain device transaction for device {}!", deviceId, e);
}
} catch (InterruptedException | ExecutionException e) {
LOG.error("Unable to obtain device transaction for device {}!", deviceId, e);
- return
false
;
+ return
null
;
}
// post the cross connect on the device
}
// post the cross connect on the device
@@
-121,11
+127,11
@@
public class CrossConnectImpl121 {
try {
submit.get();
LOG.info("Roadm connection successfully deleted ");
try {
submit.get();
LOG.info("Roadm connection successfully deleted ");
- return
true
;
+ return
interfList
;
} catch (InterruptedException | ExecutionException e) {
LOG.warn("Failed to delete {}", connectionNumber, e);
}
} catch (InterruptedException | ExecutionException e) {
LOG.warn("Failed to delete {}", connectionNumber, e);
}
- return
false
;
+ return
null
;
}
}