Toggle navigation
Toggle navigation
This project
Loading...
Sign in
홍길동
/
onos
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Snippets
Network
Create a new issue
Builds
Commits
Issue Boards
Authored by
Sho SHIMIZU
2016-02-29 13:49:04 -0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
caf0b341fc353eb094f863a7edf0f2dafc4db4b2
caf0b341
1 parent
d6209677
Refactor: Make method simpler
Change-Id: I28cabf5c5a381a8e2e6695aea7ad5000146111a3
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
6 deletions
core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
core/net/src/main/java/org/onosproject/net/intent/impl/compiler/OpticalCircuitIntentCompiler.java
View file @
caf0b34
...
...
@@ -194,7 +194,8 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
}
// Check if both devices support multiplexing (usage of TributarySlots)
boolean
multiplexingSupported
=
isMultiplexingSupported
(
intent
.
getSrc
(),
intent
.
getDst
());
boolean
multiplexingSupported
=
isMultiplexingSupported
(
intent
.
getSrc
())
&&
isMultiplexingSupported
(
intent
.
getDst
());
// slots are used only for devices supporting multiplexing
Set
<
TributarySlot
>
slots
=
Collections
.
emptySet
();
...
...
@@ -557,11 +558,8 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
return
(
driver
!=
null
&&
driver
.
hasBehaviour
(
TributarySlotQuery
.
class
));
}
private
boolean
isMultiplexingSupported
(
ConnectPoint
src
,
ConnectPoint
dst
)
{
return
isTributarySlotBehaviourSupported
(
src
.
deviceId
())
&&
isTributarySlotBehaviourSupported
(
dst
.
deviceId
())
&&
staticPort
(
src
)
==
null
&&
staticPort
(
dst
)
==
null
;
private
boolean
isMultiplexingSupported
(
ConnectPoint
cp
)
{
return
isTributarySlotBehaviourSupported
(
cp
.
deviceId
())
&&
staticPort
(
cp
)
==
null
;
}
/**
...
...
Please
register
or
login
to post a comment