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-24 14:07:35 -0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
a5e9bebfad6be758d8e9935f16c0fbf3b3acb1b0
a5e9bebf
1 parent
e8f656c9
Fix typo
Change-Id: Ic138bcecd04d47431a4cfa9d578a1216b4ec0030
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
4 deletions
core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PathIntentCompiler.java
core/net/src/main/java/org/onosproject/net/intent/impl/compiler/PathIntentCompiler.java
View file @
a5e9beb
...
...
@@ -101,11 +101,11 @@ public class PathIntentCompiler implements IntentCompiler<PathIntent> {
List
<
Link
>
links
=
intent
.
path
().
links
();
List
<
FlowRule
>
rules
=
new
LinkedList
<>();
Optional
<
EncapsulationConstraint
>
en
ac
pConstraint
=
intent
.
constraints
().
stream
()
Optional
<
EncapsulationConstraint
>
en
ca
pConstraint
=
intent
.
constraints
().
stream
()
.
filter
(
constraint
->
constraint
instanceof
EncapsulationConstraint
)
.
map
(
x
->
(
EncapsulationConstraint
)
x
).
findAny
();
//if no encapsulation or is involved only a single switch use the default behaviour
if
(!
en
ac
pConstraint
.
isPresent
()
||
links
.
size
()
==
1
)
{
if
(!
en
ca
pConstraint
.
isPresent
()
||
links
.
size
()
==
1
)
{
for
(
int
i
=
0
;
i
<
links
.
size
()
-
1
;
i
++)
{
ConnectPoint
ingress
=
links
.
get
(
i
).
dst
();
...
...
@@ -119,9 +119,9 @@ public class PathIntentCompiler implements IntentCompiler<PathIntent> {
return
ImmutableList
.
of
(
new
FlowRuleIntent
(
appId
,
null
,
rules
,
intent
.
resources
()));
}
if
(
EncapsulationType
.
VLAN
==
en
ac
pConstraint
.
get
().
encapType
())
{
if
(
EncapsulationType
.
VLAN
==
en
ca
pConstraint
.
get
().
encapType
())
{
rules
=
manageVlanEncap
(
intent
);
}
else
if
(
EncapsulationType
.
MPLS
==
en
ac
pConstraint
.
get
().
encapType
())
{
}
else
if
(
EncapsulationType
.
MPLS
==
en
ca
pConstraint
.
get
().
encapType
())
{
//TODO: to be implemented
rules
=
Collections
.
emptyList
();
}
...
...
Please
register
or
login
to post a comment