Skip to content

bugfix, federator edge_actions #236

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
haizawa wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

bugfix, federator edge_actions #236

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e8a0fd7
bugfix, federator edge_actions
haizawa Feb 8, 2016
5f73de4
bugfix, federator edge_actions
haizawa Feb 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 14 additions & 5 deletions src/main/java/org/o3project/odenos/component/federator/FederatorOnFlow.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -325,6 +325,7 @@ protected void doFlowAddedSelect(BasicFlow fedFlow) {

BasicFlow orgFlow = fedFlow.clone();
orgFlow.getPath().clear();
orgFlow.getEdgeActions().clear();
orgFlow.setVersion("0");

// convert match
Expand All @@ -347,16 +348,24 @@ protected void doFlowAddedSelect(BasicFlow fedFlow) {
continue;
}
edgeNode = fedLink.getDstNode();

// convert action
Map<String, List<FlowAction>> newEdgeActions =
convertAction2(fedNwId, fedLink.getSrcNode(), fedLink.getSrcPort(), fedFlow.getEdgeActions());

Map<String, List<FlowAction>> orgEdgeActions = orgFlow.getEdgeActions();
for (Map.Entry<String, List<FlowAction>> entry : newEdgeActions.entrySet()) {
orgEdgeActions.put(entry.getKey(), entry.getValue());
}
orgFlow.putEdgeActions(orgEdgeActions);

// convert path
String orgPathId = convertPath(fedNwId, fedPathId);
if (orgPathId != null) {
orgFlow.getPath().add(orgPathId);
continue;
}

// convert action
orgFlow.putEdgeActions(
convertAction2(fedNwId, fedLink.getSrcNode(), fedLink.getSrcPort(), orgFlow.getEdgeActions()));
doFlowAddedSetFlowRegister(orgNwId, orgFlow);

// next network
Expand All @@ -365,6 +374,7 @@ protected void doFlowAddedSelect(BasicFlow fedFlow) {

orgFlow = fedFlow.clone();
orgFlow.getPath().clear();
orgFlow.getEdgeActions().clear();
orgFlow.setVersion("0");

// set match
Expand All @@ -378,8 +388,7 @@ protected void doFlowAddedSelect(BasicFlow fedFlow) {

// convert action
try {
orgFlow.putEdgeActions(
convertAction(fedNwId, edgeNode, orgFlow.getEdgeActions()));
orgFlow.putEdgeActions(convertAction(fedNwId, edgeNode, fedFlow.getEdgeActions()));
} catch (Exception e) {
log.warn("failed convert flow's actions.");
}
Expand Down