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
2015-09-29 12:45:36 -0700
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
0f9a68cdfdfc471ba39bb11d37ba84f4bba048b2
0f9a68cd
1 parent
71892221
Refactor: Remove unused parameter
Change-Id: Ieef2177484fbe94e17d4a3105237ed2c6f36e116
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
5 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 @
0f9a68c
...
...
@@ -209,11 +209,10 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
* Checks if current allocations on given resource can satisfy request.
* If the resource is null, return true.
*
* @param request the intent making the request
* @param resource the resource on which to map the intent
* @return true if the resource can accept the request, false otherwise
*/
private
boolean
isAvailable
(
Intent
request
,
Intent
Id
resource
)
{
private
boolean
isAvailable
(
IntentId
resource
)
{
if
(
resource
==
null
)
{
return
true
;
}
...
...
@@ -271,7 +270,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
continue
;
}
if
(
isAvailable
(
c
ircuitIntent
,
c
onnIntent
.
id
()))
{
if
(
isAvailable
(
connIntent
.
id
()))
{
return
connIntent
;
}
}
...
...
@@ -303,7 +302,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
if
(
ochCP
!=
null
)
{
OchPort
ochPort
=
(
OchPort
)
deviceService
.
getPort
(
ochCP
.
deviceId
(),
ochCP
.
port
());
IntentId
intentId
=
deviceResourceService
.
getAllocations
(
ochPort
);
if
(
isAvailable
(
circuitIntent
,
intentId
))
{
if
(
isAvailable
(
intentId
))
{
return
ochPort
;
}
}
...
...
@@ -317,7 +316,7 @@ public class OpticalCircuitIntentCompiler implements IntentCompiler<OpticalCircu
}
IntentId
intentId
=
deviceResourceService
.
getAllocations
(
port
);
if
(
isAvailable
(
circuitIntent
,
intentId
))
{
if
(
isAvailable
(
intentId
))
{
return
(
OchPort
)
port
;
}
}
...
...
Please
register
or
login
to post a comment