Code Review
/
controller.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Implement finding a primary based on the shard name and do basic wiring of...
[controller.git]
/
opendaylight
/
md-sal
/
compatibility
/
sal-compatibility
/
src
/
main
/
java
/
org
/
opendaylight
/
controller
/
sal
/
compatibility
/
ToSalConversionsUtils.java
diff --git
a/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
b/opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
index 97a25bf71cd9789df1ca0a31f006dc7b99a37e19..7bbf7f10e0c2be3c8246849d468fdbc0a8be5996 100644
(file)
--- a/
opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
+++ b/
opendaylight/md-sal/compatibility/sal-compatibility/src/main/java/org/opendaylight/controller/sal/compatibility/ToSalConversionsUtils.java
@@
-208,7
+208,8
@@
public class ToSalConversionsUtils {
Uri nodeConnector = ((OutputActionCase) sourceAction).getOutputAction().getOutputNodeConnector();
if (nodeConnector != null) {
//for (Uri uri : nodeConnectors) {
Uri nodeConnector = ((OutputActionCase) sourceAction).getOutputAction().getOutputNodeConnector();
if (nodeConnector != null) {
//for (Uri uri : nodeConnectors) {
- targetAction.add(new Output(fromNodeConnectorRef(nodeConnector, node)));
+ Uri fullNodeConnector = new Uri(node.getType()+":"+node.getID()+":"+nodeConnector.getValue());
+ targetAction.add(new Output(fromNodeConnectorRef(fullNodeConnector, node)));
//}
}
} else if (sourceAction instanceof PopMplsActionCase) {
//}
}
} else if (sourceAction instanceof PopMplsActionCase) {
@@
-376,12
+377,19
@@
public class ToSalConversionsUtils {
return null;
}
return null;
}
- private static NodeConnector fromNodeConnectorRef(Uri uri, Node node) {
+ /**
+ * @param openflow nodeConnector uri
+ * @param node
+ * @return assembled nodeConnector
+ */
+ public static NodeConnector fromNodeConnectorRef(Uri uri, Node node) {
NodeConnector nodeConnector = null;
try {
NodeConnector nodeConnector = null;
try {
- nodeConnector = new NodeConnector(NodeMapping.MD_SAL_TYPE,node.getNodeIDString()+":"+uri.getValue(),node);
+ NodeConnectorId nodeConnectorId = new NodeConnectorId(uri.getValue());
+ nodeConnector = NodeMapping.toADNodeConnector(nodeConnectorId, node);
} catch (ConstructionException e) {
} catch (ConstructionException e) {
- e.printStackTrace();
+ LOG.warn("nodeConnector creation failed at node: {} with nodeConnectorUri: {}",
+ node, uri.getValue());
}
return nodeConnector;
}
}
return nodeConnector;
}