Sho SHIMIZU

Refactor: Extract method

Change-Id: I729f679f2adcdc8507f0bb24a2d89117df18a5e6
...@@ -290,20 +290,24 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu ...@@ -290,20 +290,24 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
290 } 290 }
291 291
292 private boolean isAllowed(OpticalCircuitIntent circuitIntent, OpticalConnectivityIntent connIntent) { 292 private boolean isAllowed(OpticalCircuitIntent circuitIntent, OpticalConnectivityIntent connIntent) {
293 - ConnectPoint srcStaticPort = staticPort(circuitIntent.getSrc()); 293 + if (!isAllowed(circuitIntent.getSrc(), connIntent.getSrc())) {
294 - if (srcStaticPort != null) {
295 - if (!srcStaticPort.equals(connIntent.getSrc())) {
296 return false; 294 return false;
297 } 295 }
298 - }
299 296
300 - ConnectPoint dstStaticPort = staticPort(circuitIntent.getDst()); 297 + if (!isAllowed(circuitIntent.getDst(), connIntent.getDst())) {
301 - if (dstStaticPort != null) {
302 - if (!dstStaticPort.equals(connIntent.getDst())) {
303 return false; 298 return false;
304 } 299 }
300 +
301 + return true;
305 } 302 }
306 303
304 + private boolean isAllowed(ConnectPoint circuitCp, ConnectPoint connectivityCp) {
305 + ConnectPoint srcStaticPort = staticPort(circuitCp);
306 + if (srcStaticPort != null) {
307 + if (!srcStaticPort.equals(connectivityCp)) {
308 + return false;
309 + }
310 + }
307 return true; 311 return true;
308 } 312 }
309 313
......