홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Sho SHIMIZU
e8f656c9 1 parent 12d02686

Reduce depth of indent 

Change-Id: Ie1caf1c818cb83824a1e495b46a5b7a0c2640098
Inline Side-by-side
Showing 1 changed file with 8 additions and 10 deletions
...@@ -117,18 +117,16 @@ public class PathIntentCompiler implements IntentCompiler<PathIntent> { ...@@ -117,18 +117,16 @@ public class PathIntentCompiler implements IntentCompiler<PathIntent> {
117 } 117 }
118 118
119 return ImmutableList.of(new FlowRuleIntent(appId, null, rules, intent.resources())); 119 return ImmutableList.of(new FlowRuleIntent(appId, null, rules, intent.resources()));
120 + }
120 121
121 - } else { 122 + if (EncapsulationType.VLAN == enacpConstraint.get().encapType()) {
122 - if (EncapsulationType.VLAN == enacpConstraint.get().encapType()) { 123 + rules = manageVlanEncap(intent);
123 - rules = manageVlanEncap(intent); 124 + } else if (EncapsulationType.MPLS == enacpConstraint.get().encapType()) {
124 - } 125 + //TODO: to be implemented
125 - if (EncapsulationType.MPLS == enacpConstraint.get().encapType()) { 126 + rules = Collections.emptyList();
126 - //TODO: to be implemented
127 - rules = Collections.emptyList();
128 - }
129 -
130 - return ImmutableList.of(new FlowRuleIntent(appId, null, rules, intent.resources()));
131 } 127 }
128 +
129 + return ImmutableList.of(new FlowRuleIntent(appId, null, rules, intent.resources()));
132 } 130 }
133 131
134 private FlowRule createFlowRule(TrafficSelector originalSelector, TrafficTreatment originalTreatment, 132 private FlowRule createFlowRule(TrafficSelector originalSelector, TrafficTreatment originalTreatment,
......