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
Brian O'Connor
2014-12-08 01:28:50 -0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
f25a5115e901f1f3383ccb60af7ad48355c39ee2
f25a5115
1 parent
e84ab32f
temporary NPE fix for ONOS-439
Change-Id: I238ea24e1a4c4bebb40d132d060c418f5675f570
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
0 deletions
apps/optical/src/main/java/org/onosproject/optical/OpticalLinkProvider.java
core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
apps/optical/src/main/java/org/onosproject/optical/OpticalLinkProvider.java
View file @
f25a511
...
...
@@ -137,8 +137,14 @@ public class OpticalLinkProvider extends AbstractProvider implements LinkProvide
Port
srcPort
=
deviceService
.
getPort
(
srcId
,
link
.
src
().
port
());
Port
dstPort
=
deviceService
.
getPort
(
dstId
,
link
.
dst
().
port
());
if
(
srcPort
==
null
||
dstPort
==
null
)
{
return
;
//FIXME remove this in favor of below TODO
}
boolean
active
=
deviceService
.
isAvailable
(
srcId
)
&&
deviceService
.
isAvailable
(
dstId
)
&&
// TODO: should update be queued if src or dstPort is null?
//srcPort != null && dstPort != null &&
srcPort
.
isEnabled
()
&&
dstPort
.
isEnabled
();
LinkDescription
desc
=
new
DefaultLinkDescription
(
link
.
src
(),
link
.
dst
(),
OPTICAL
);
...
...
core/net/src/main/java/org/onosproject/net/intent/impl/OpticalPathIntentInstaller.java
View file @
f25a511
...
...
@@ -133,6 +133,7 @@ public class OpticalPathIntentInstaller implements IntentInstaller<OpticalPathIn
List
<
FlowRuleBatchEntry
>
rules
=
Lists
.
newLinkedList
();
ConnectPoint
prev
=
intent
.
src
();
//FIXME check for null allocations
//TODO throw exception if the lambda was not assigned successfully
for
(
Link
link
:
intent
.
path
().
links
())
{
Lambda
la
=
null
;
...
...
Please
register
or
login
to post a comment