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
2015-10-09 17:03:44 -0700
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
5251562d1568c7c16df31da3a9433dc2935648a1
5251562d
1 parent
6ee8aa3e
Fixing Javadoc errors
Change-Id: I72b9d49e052316cbbbef343d367ffffe13cd4e56
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
65 additions
and
7 deletions
apps/acl/src/main/java/org/onosproject/acl/AclWebResource.java
apps/dhcp/src/main/java/org/onosproject/dhcp/DhcpStore.java
apps/flowanalyzer/src/main/java/org/onosproject/flowanalyzer/FlowAnalyzer.java
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DeviceConfiguration.java
core/api/src/main/java/org/onosproject/net/behaviour/ControllerInfo.java
core/api/src/main/java/org/onosproject/net/flow/TypedStoredFlowEntry.java
core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
core/api/src/main/java/org/onosproject/net/statistic/FlowStatisticService.java
core/api/src/main/java/org/onosproject/net/statistic/SummaryFlowEntryWithLoad.java
core/api/src/main/java/org/onosproject/net/statistic/TypedFlowEntryWithLoad.java
core/api/src/main/java/org/onosproject/store/service/AsyncAtomicCounter.java
core/net/src/main/java/org/onosproject/net/device/impl/OpticalPortOperator.java
incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkProvider.java
ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbClientService.java
ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/notation/Row.java
providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java
apps/acl/src/main/java/org/onosproject/acl/AclWebResource.java
View file @
5251562
...
...
@@ -98,6 +98,7 @@ public class AclWebResource extends AbstractWebResource {
*
* @param stream JSON data describing the rule
* @return 200 OK
* @throws URISyntaxException uri syntax exception
*/
@POST
@Consumes
(
MediaType
.
APPLICATION_JSON
)
...
...
apps/dhcp/src/main/java/org/onosproject/dhcp/DhcpStore.java
View file @
5251562
...
...
@@ -64,6 +64,7 @@ public interface DhcpStore {
* Releases the IP assigned to a Mac ID into the free pool.
*
* @param hostId the host ID for which the mapping needs to be changed
* @return released ip
*/
Ip4Address
releaseIP
(
HostId
hostId
);
...
...
apps/flowanalyzer/src/main/java/org/onosproject/flowanalyzer/FlowAnalyzer.java
View file @
5251562
...
...
@@ -85,6 +85,8 @@ public class FlowAnalyzer {
* the network. The possible states are: Cleared (implying that the entry leads to
* a host), Cycle (implying that it is part of cycle), and Black Hole (implying
* that the entry does not lead to a single host).
*
* @return result string
*/
public
String
analyze
()
{
graph
=
topologyService
.
getGraph
(
topologyService
.
currentTopology
());
...
...
apps/segmentrouting/src/main/java/org/onosproject/segmentrouting/DeviceConfiguration.java
View file @
5251562
...
...
@@ -67,6 +67,8 @@ public class DeviceConfiguration implements DeviceProperties {
/**
* Constructor. Reads all the configuration for all devices of type
* Segment Router and organizes into various maps for easier access.
*
* @param cfgService config service
*/
public
DeviceConfiguration
(
NetworkConfigRegistry
cfgService
)
{
// Read config from device subject, excluding gatewayIps and subnets.
...
...
core/api/src/main/java/org/onosproject/net/behaviour/ControllerInfo.java
View file @
5251562
...
...
@@ -34,6 +34,7 @@ public class ControllerInfo {
*
* @param ip the ip address
* @param port the tcp port
* @param type the connection type
*/
public
ControllerInfo
(
IpAddress
ip
,
int
port
,
String
type
)
{
this
.
ip
=
ip
;
...
...
core/api/src/main/java/org/onosproject/net/flow/TypedStoredFlowEntry.java
View file @
5251562
...
...
@@ -54,6 +54,8 @@ public interface TypedStoredFlowEntry extends StoredFlowEntry {
/**
* Gets the flow live type for this entry.
*
* @return flow live type
*/
FlowLiveType
flowLiveType
();
...
...
core/api/src/main/java/org/onosproject/net/host/HostProviderService.java
View file @
5251562
...
...
@@ -55,9 +55,10 @@ public interface HostProviderService extends ProviderService<HostProvider> {
void
hostVanished
(
HostId
hostId
);
/**
* Notifies the core when a
host is no longer detected on a network
.
* Notifies the core when a
n IP is no longer associated with a host
.
*
* @param hostId id of the host that vanished
* @param hostId id of the host
* @param ipAddress ip address of host that vanished
*/
void
removeIpFromHost
(
HostId
hostId
,
IpAddress
ipAddress
);
...
...
core/api/src/main/java/org/onosproject/net/statistic/FlowStatisticService.java
View file @
5251562
...
...
@@ -94,6 +94,7 @@ public interface FlowStatisticService {
* @param pNumber the port number of the Device to query
* @param liveType the FlowLiveType to filter, null means no filtering .
* @param instType the InstructionType to filter, null means no filtering.
* @param topn topn //FIXME what?
* @return list of flow entry load
*/
List
<
TypedFlowEntryWithLoad
>
loadTopnByType
(
Device
device
,
PortNumber
pNumber
,
...
...
core/api/src/main/java/org/onosproject/net/statistic/SummaryFlowEntryWithLoad.java
View file @
5251562
...
...
@@ -94,6 +94,8 @@ public class SummaryFlowEntryWithLoad {
/**
* Returns connect point.
*
* @return connect point
*/
public
ConnectPoint
connectPoint
()
{
return
cp
;
...
...
@@ -101,6 +103,8 @@ public class SummaryFlowEntryWithLoad {
/**
* Returns total load of connect point.
*
* @return total load
*/
public
Load
totalLoad
()
{
return
totalLoad
;
...
...
@@ -108,6 +112,8 @@ public class SummaryFlowEntryWithLoad {
/**
* Returns immediate load of connect point.
*
* @return immediate load
*/
public
Load
immediateLoad
()
{
return
immediateLoad
;
...
...
@@ -115,6 +121,8 @@ public class SummaryFlowEntryWithLoad {
/**
* Returns short load of connect point.
*
* @return short load
*/
public
Load
shortLoad
()
{
return
shortLoad
;
...
...
@@ -122,6 +130,8 @@ public class SummaryFlowEntryWithLoad {
/**
* Returns mid load of connect point.
*
* @return mid load
*/
public
Load
midLoad
()
{
return
midLoad
;
...
...
@@ -129,6 +139,8 @@ public class SummaryFlowEntryWithLoad {
/**
* Returns long load of connect point.
*
* @return long load
*/
public
Load
longLoad
()
{
return
longLoad
;
...
...
@@ -136,6 +148,8 @@ public class SummaryFlowEntryWithLoad {
/**
* Returns unknown load of connect point.
*
* @return unknown load
*/
public
Load
unknownLoad
()
{
return
unknownLoad
;
...
...
core/api/src/main/java/org/onosproject/net/statistic/TypedFlowEntryWithLoad.java
View file @
5251562
...
...
@@ -36,19 +36,37 @@ public class TypedFlowEntryWithLoad {
private
static
final
int
MID_POLL_INTERVAL
=
10
;
private
static
final
int
LONG_POLL_INTERVAL
=
15
;
/**
* Creates a new typed flow entry with load.
*
* @param cp connect point
* @param tfe typed flow entry
* @param load load
*/
public
TypedFlowEntryWithLoad
(
ConnectPoint
cp
,
TypedStoredFlowEntry
tfe
,
Load
load
)
{
this
.
cp
=
cp
;
this
.
tfe
=
tfe
;
this
.
load
=
load
;
}
/**
* Creates a new typed flow entry with load.
*
* @param cp connect point
* @param tfe typed flow entry
*/
public
TypedFlowEntryWithLoad
(
ConnectPoint
cp
,
TypedStoredFlowEntry
tfe
)
{
this
.
cp
=
cp
;
this
.
tfe
=
tfe
;
this
.
load
=
new
DefaultLoad
(
tfe
.
bytes
(),
0
,
typedPollInterval
(
tfe
));
}
/**
* Creates a new typed flow entry with load.
*
* @param cp connect point
* @param fe flow entry
*/
public
TypedFlowEntryWithLoad
(
ConnectPoint
cp
,
FlowEntry
fe
)
{
this
.
cp
=
cp
;
this
.
tfe
=
newTypedStoredFlowEntry
(
fe
);
...
...
@@ -70,6 +88,8 @@ public class TypedFlowEntryWithLoad {
/**
* Returns short polling interval.
*
* @return short poll interval
*/
public
static
int
shortPollInterval
()
{
return
CAL_AND_POLL_INTERVAL
;
...
...
@@ -77,6 +97,8 @@ public class TypedFlowEntryWithLoad {
/**
* Returns mid polling interval.
*
* @return mid poll interval
*/
public
static
int
midPollInterval
()
{
return
MID_POLL_INTERVAL
;
...
...
@@ -84,6 +106,8 @@ public class TypedFlowEntryWithLoad {
/**
* Returns long polling interval.
*
* @return long poll interval
*/
public
static
int
longPollInterval
()
{
return
LONG_POLL_INTERVAL
;
...
...
@@ -91,6 +115,8 @@ public class TypedFlowEntryWithLoad {
/**
* Returns average polling interval.
*
* @return average poll interval
*/
public
static
int
avgPollInterval
()
{
return
(
CAL_AND_POLL_INTERVAL
+
MID_POLL_INTERVAL
+
LONG_POLL_INTERVAL
)
/
3
;
...
...
@@ -100,6 +126,7 @@ public class TypedFlowEntryWithLoad {
* Returns current typed flow entry's polling interval.
*
* @param tfe typed flow entry
* @return typed poll interval
*/
public
static
long
typedPollInterval
(
TypedStoredFlowEntry
tfe
)
{
checkNotNull
(
tfe
,
"TypedStoredFlowEntry cannot be null"
);
...
...
@@ -120,6 +147,7 @@ public class TypedFlowEntryWithLoad {
* Creates a new typed flow entry with the given flow entry fe.
*
* @param fe flow entry
* @return new typed flow entry
*/
public
static
TypedStoredFlowEntry
newTypedStoredFlowEntry
(
FlowEntry
fe
)
{
if
(
fe
==
null
)
{
...
...
core/api/src/main/java/org/onosproject/store/service/AsyncAtomicCounter.java
View file @
5251562
...
...
@@ -63,6 +63,7 @@ public interface AsyncAtomicCounter {
/**
* Atomically sets the given value to the current value.
*
* @param value new value
* @return future void
*/
CompletableFuture
<
Void
>
set
(
long
value
);
...
...
core/net/src/main/java/org/onosproject/net/device/impl/OpticalPortOperator.java
View file @
5251562
...
...
@@ -158,8 +158,8 @@ public final class OpticalPortOperator implements ConfigOperator {
/**
* Returns a description built from an existing port and reported status.
*
* @param port
* @param isEnabled
* @param port
port
* @param isEnabled
true if enabled
* @return a PortDescription based on the port
*/
static
PortDescription
descriptionOf
(
Port
port
,
boolean
isEnabled
)
{
...
...
incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkProvider.java
View file @
5251562
...
...
@@ -17,6 +17,7 @@ public interface VirtualNetworkProvider extends Provider {
* @param networkId virtual network identifier
* @param src source connection point
* @param dst destination connection point
* @return new tunnel's id
*/
TunnelId
createTunnel
(
NetworkId
networkId
,
ConnectPoint
src
,
ConnectPoint
dst
);
...
...
ovsdb/api/src/main/java/org/onosproject/ovsdb/controller/OvsdbClientService.java
View file @
5251562
...
...
@@ -88,13 +88,14 @@ public interface OvsdbClientService extends OvsdbRPC {
/**
* Gets controllers of the node.
*
* @param openflowDeviceId target device id
* @return set of controllers; empty if no controller is find
*/
Set
<
ControllerInfo
>
getControllers
(
DeviceId
openflowDeviceId
);
/**
* Sets the Controllers for the specified bridge.
* <p
/
>
* <p>
* This method will replace the existing controller list with the new controller
* list.
*
...
...
@@ -105,7 +106,7 @@ public interface OvsdbClientService extends OvsdbRPC {
/**
* Sets the Controllers for the specified device.
* <p
/
>
* <p>
* This method will replace the existing controller list with the new controller
* list.
*
...
...
ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/notation/Row.java
View file @
5251562
...
...
@@ -56,6 +56,7 @@ public final class Row {
*
* @param tableName table name
* @param columns Map of Column entity
* @param uuid UUID of the row
*/
public
Row
(
String
tableName
,
UUID
uuid
,
Map
<
String
,
Column
>
columns
)
{
checkNotNull
(
tableName
,
"table name cannot be null"
);
...
...
providers/openflow/flow/src/main/java/org/onosproject/provider/of/flow/impl/NewAdaptiveFlowStatsCollector.java
View file @
5251562
...
...
@@ -492,6 +492,7 @@ public class NewAdaptiveFlowStatsCollector {
/**
* returns flowMissingXid that indicates the execution of flowMissing process or not(NO_FLOW_MISSING_XID(-1)).
*
* @return xid of missing flow
*/
public
long
getFlowMissingXid
()
{
return
flowMissingXid
;
...
...
Please
register
or
login
to post a comment