247 Commits

Author SHA1 Message Date
Pavlin Radoslavov
33f228af5a Replaced IpPrefix and IpAddress in the following methods
and cleanup related code:

 - Host.ipAddresses()
 - DefaultHost.ipAddresses()
 - HostDescription.ipAddress()
 - DefaultHostDescription.ipAddress()
 - HostService.getHostsByIp()
 - HostManager.getHostsByIp()
 - HostStore.getHosts()
 - GossipHostStore.getHosts()
 - SimpleHostStore.getHosts()
 - ProxyArpService.known()
 - ProxyArpManager.known()

As a result of the above cleanup, the "hosts" CLI command outputs
the IP addresses as "1.2.3.4" instead of "1.2.3.4/32".

Also, the following REST calls might be affected as well with
the above format replacement:
  - REST POST: config/topology
  - REST GET: topology/graph
2014-10-27 19:33:16 -07:00
Pavlin Radoslavov
76b0ae2789 Work toward common IP address classes.
* Updated classes PortAddresses (in core/api) and Interface (in sdnip)
   to use class InterfaceIpAddress instead of IpPrefix
 * Updated corresponding unit tests and relevant code
 * Minor refactoring inside ProxyArpManager to simplify some of the
   logic and usage related to PortAddresses. Also, renamed
   method findOutsidePortInSubnet() to findPortInSubnet() and updated
   its implementation to reflect better its usage.
2014-10-27 15:33:19 -07:00
Thomas Vachuska
4353a5a390 Fixed graph relaxEdge to properly deal with Double.MIN_VALUE. 2014-10-27 15:18:10 -07:00
Jonathan Hart
dc09a3ba25 Fixed flaky HostMonitor unit tests.
Change-Id: Ie9e9e922733e6210b61a0360feae38d683685fe7
2014-10-27 11:40:18 -07:00
Yuta HIGUCHI
eb24e9d0ac Attempt to fix Link vanishing after mastership change
- LLDPLinkProvider: handle DeviceUpdate event
- DeviceManager: publish Device events caused by Mastership change
- DeviceManager: Always try to markOffLine on deviceDisconnected
- GossipDeviceStore: Silently ignore failure to get Timestamp on port events

Change-Id: I51fbb3f1924007867512f20e62d6d53090c63640
2014-10-26 19:58:10 -07:00
Yuta HIGUCHI
305ec83471 add debug log
Change-Id: I0fe955fd5a3a5916fbfb071502b415476b9af240
2014-10-26 19:44:55 -07:00
weibit
76622d6e6d Merge branch 'optical_path_provisioner'
Conflicts:
	core/net/src/main/java/org/onlab/onos/net/intent/impl/IntentManager.java

Change-Id: I3449d508668835307d9b00a87d047599a83de81d
2014-10-25 21:56:29 -07:00
weibit
50eb95beae packet-intent fail event will trigger the creation of lightpaths
Change-Id: I54b3b039dee3350eaa0f3b4c7d3f0131966ea6bc
2014-10-25 21:47:54 -07:00
Brian O'Connor
9cfe82905d dispatching failed event when compile fails
Change-Id: I5c5ae38c25a8ef08bc066bcf5bc70bc85137934d
2014-10-24 14:14:19 -07:00
Ayaka Koshibe
b62aab5c29 fix relinquishment behavior in SimpleMastershipStore
Change-Id: Ibc9eeae397b7acc9e08cc569f9c8a642557bf4f9
2014-10-24 13:15:25 -07:00
Thomas Vachuska
f99769573d Sketched out changes to link resource service to support intent replacement mechanism. 2014-10-24 11:55:05 -07:00
Madan Jampani
6a45616dbe FlowRuleManager is now fully batch based 2014-10-24 11:36:17 -07:00
weibit
8e6dba2982 Merge branch 'optical_path_provisioner'
Conflicts:
	apps/optical/src/main/resources/demo-3-roadm-2-ps.json

Change-Id: I6fb95eb8de5b8331678c8cdac621309ea4d2d2b8
2014-10-24 10:34:05 -07:00
weibit
aca1460cee support bidirectional links
Change-Id: I6c5d092abf7629b28ea0b1928ee6cf63f99de962
2014-10-24 10:26:26 -07:00
Pavlin Radoslavov
d26f57a8e6 Refactoring in the unit test utility framework:
* Moved unit test utilities to the onlab-junit package under utils/junit
   - ImmutableClassChecker
   - TestUtils and TestUtilsTest

 * Added/ported unit test utilities from the older code
   - UtilityClassChecker and UtilityClassCheckerTest
   - ImmutableClassCheckerTest

 * Updated/fixed some of the pom.xml files in the context of the
   onlab-junit package:
   - Added <scope>test</scope>
   - Replaced hard-coded "1.0.0-SNAPSHOT" with "${project.version}"

Change-Id: Ie5f51ba401ca1748340f38848ab6bfc251964adc
2014-10-23 17:58:36 -07:00
Jonathan Hart
936c49d147 Added getCriterion method to TrafficSelector
Change-Id: I72d89d878e1fae95d1e16d9ed473b7711895e478
2014-10-23 16:41:00 -07:00
Brian O'Connor
38948410f7 Merge branch 'optical-integration' 2014-10-23 16:32:25 -07:00
weibit
253c865d79 some optical intent changes
Change-Id: Ie9b02e2d199aa72f9828e91b248bd052f7b38fa2
2014-10-23 16:31:29 -07:00
Thomas Vachuska
8ac922dad8 FIxed checkstyle fails. 2014-10-23 16:17:03 -07:00
Yuta HIGUCHI
9def047b78 DistributedFlowRuleStore: remote batch support
Change-Id: I373a942697624440e025a8022a13394396058a71
2014-10-23 15:54:47 -07:00
Brian O'Connor
086724eb7e refactoring OpticalPathIntent
Change-Id: Ic6ab6237237b2a5019851182b2869110bc5b1b73
2014-10-23 15:47:47 -07:00
Toshio Koide
86160f548c Change method name of LinkResourceService 2014-10-23 14:59:26 -07:00
Toshio Koide
5c0a726977 Rename package name of LinkResourceManager. 2014-10-23 14:50:40 -07:00
weibit
2543d5aee9 optical intent
Change-Id: I8cef7ae7fff3c9423daad242630a69922b855e98
2014-10-23 14:14:47 -07:00
Toshio Koide
ca0fcff106 Implement fake requestResources() method. 2014-10-23 14:09:22 -07:00
weibit
9e622ac47b optical intent
Change-Id: I23714985a2fe1e3bbc59deff2d267007750d0420
2014-10-23 13:47:48 -07:00
weibit
7e5834602f optical intent module
Change-Id: Ifa405ab1d883b293d349f1b66d26a05a0724691f
2014-10-23 13:47:48 -07:00
weibit
f32383bb00 Optical Path Porvisioning
Change-Id: I9788fd9172edc8ab571aa1d41962c2bd10697c50
2014-10-23 13:47:48 -07:00
Marc De Leenheer
09e5f64886 Merge branch 'optical-integration' of ssh://gerrit.onlab.us:29418/onos-next into optical-integration 2014-10-23 13:54:26 -07:00
Brian O'Connor
e7e4bd5825 adding Get by IntentId to LinkResourceService
Change-Id: Ic27daef6e3e55a7d2301f8009432d6c216e1523d
2014-10-23 13:36:59 -07:00
Marc De Leenheer
922760bec9 Merge branch 'master' into optical-integration 2014-10-23 13:13:10 -07:00
Madan Jampani
692ca59a98 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-23 12:07:07 -07:00
Madan Jampani
31961c1409 Resolving merge conflicts 2014-10-23 12:06:58 -07:00
alshabib
9cbdec4015 stats manager cleanup
Change-Id: Icf5ab2ef39d3ad887c56b2d49ebb418e9de4ff2d
2014-10-23 10:45:55 -07:00
Toshio Koide
50df38df23 Starting implementation of LinkResourceManager. 2014-10-23 10:36:51 -07:00
alshabib
12288c8396 fix for distributed link discovery
Change-Id: I2ef2b8f6bdfcbde5c4a71d15d868fef8092c4aaa
2014-10-23 10:24:23 -07:00
Madan Jampani
117aaae1fd Towards a distributed flow rule store 2014-10-23 10:04:05 -07:00
alshabib
8d5665f295 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-23 09:52:14 -07:00
alshabib
46122d8550 finished stats service
Change-Id: Ic1edef3e9cabefb2cbfdd8eecc465b3fa7f96bd9
2014-10-23 09:05:31 -07:00
Thomas Vachuska
0e752bdbb4 Added link types of TUNNEL and OPTICAL.
Fixed the optical config json file.
Fixed treatment of links added by ancillary providers.
Added a trap for topology provider errors.
Added CLI to recompute topology.
2014-10-22 22:33:41 -07:00
Ayaka Koshibe
a7384a83d8 fixes related to getRole() assumptions
Change-Id: Icf19d95714dc217200eed021a495d9a78440ca8e
2014-10-22 18:59:34 -07:00
alshabib
44521eccf6 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	core/net/src/test/java/org/onlab/onos/net/flow/impl/FlowRuleManagerTest.java

Change-Id: I23a7b1bff399c95499a39f7a00563650f58b7210
2014-10-22 18:36:02 -07:00
alshabib
3d643ecc8d functional stats service
Change-Id: I90de3aa5d7721db8ef6a154e122af8b446243f60
2014-10-22 18:33:00 -07:00
Thomas Vachuska
83e090e320 Adding intent operations batch abstraction.
Adding copyright to intent and flows.
2014-10-22 14:25:35 -07:00
Thomas Vachuska
1fb982fe93 Adding intent operations batch abstraction. 2014-10-22 14:09:17 -07:00
Ayaka Koshibe
e8708e3c8d trigger device query after mastership reelection
Change-Id: Ibf8b32ed1de2a904289731596a28bd5524d6ea25

Conflicts:
	core/net/src/main/java/org/onlab/onos/net/device/impl/DeviceManager.java
2014-10-22 13:40:18 -07:00
Ray Milkey
5154ec3e91 Fix some unchecked conversion warnings
Change-Id: I5cfb0fceb6ab1d200fb1d7e9849ce458a2aa8ac7
2014-10-22 11:05:43 -07:00
alshabib
2374fc9e45 many fixes from different people in various place. Optical, FlowRuleManager, LinkDiscovery
Change-Id: Ie3302e80ee94bf2e41b3da7ac765557b1e7509fd
2014-10-22 11:03:23 -07:00
Yuta HIGUCHI
67dce883d4 Mastership related minor fixes on DeviceManager
Change-Id: I8aefedd22b285f132d8b0cd2e7b76bf422dcf444
2014-10-21 22:26:15 -07:00
Pavlin Radoslavov
3559249b9b Refactoring and cleanup in the Metrics module:
* Removed logging related code inside class MetricsManager
 * Removed @Component related code, because it is not suppose to be used
   as an component.
 * Added a new class-wrapper so the Metrics can be used as a loadable service:
   MetricsManagerComponent. The name and the location of this class
   will be refactored in the future.
 * Added new method MetricsManager.removeMetric()
 * Line formatting
 * Changed "interface MetricsService" to public
2014-10-21 21:57:25 -07:00