1270 Commits

Author SHA1 Message Date
Thomas Vachuska
7b652ad97c Fixed some javadoc warning/errors.
Fixed NPE error in objective tracker.
Preparing for upgrade to Java 8 and Karaf 3.0.2.
2014-10-30 14:10:51 -07:00
Yuta HIGUCHI
38b4d9d9ec Device Mastership
try to fix Masteship recognition mismatch when MastershipEvent suggest different view.

Change-Id: If1aba3d330978c48e8c4053fb47f4d149d57966e
2014-10-30 12:10:24 -07:00
Yuta HIGUCHI
dfe6e3bd05 allow null Master in MastershipTerm
Change-Id: I840354eb6d0b5a1bac91887a41626c33c49d592c
2014-10-30 12:10:24 -07:00
Jonathan Hart
4f60f98bd8 Implemented multi-instance packet out.
We've defined a PacketStore abstraction through which outbound packets are
sent. The packet store has a simple implementation (basically a no-op) and a
distributed implementation on top of the cluster messaging service.

Change-Id: Ib32753314fe518ef1fd67c858db744b004539938
2014-10-30 11:02:52 -07:00
Yuta HIGUCHI
225e63e3d4 turn off duplicate check for now
Change-Id: Ic11a4e4c33ae219df1ddf49f512b8f61a145dc91
2014-10-30 08:21:27 -07:00
Toshio Koide
106d4495d3 Initial implementation of LinkResourceStore for single instance env. 2014-10-30 04:23:23 -07:00
Thomas Vachuska
e3784c9c09 Added protection against no resources to PathIntentInstaller. 2014-10-29 21:09:10 -07:00
Thomas Vachuska
a05c0a2941 Merge "Prototype bandwidth reservation" 2014-10-29 18:26:50 -07:00
Thomas Vachuska
d16ce18d0c Added Port.Type and plumbed it throughout. 2014-10-29 17:25:29 -07:00
Ray Milkey
caa450ba34 Prototype bandwidth reservation
This is a prototype of the bandwidth reservation implementation.
There is no bandwidth discovery, it is all faked.  The bandwidth is
specified by allocating a special Intent used for demonstration purposes.
This code also uses faked out interfaces in the Resource Manager, and will
need to be refactored when the real Resource Manager is in place.

Change-Id: I1f9a16b4144f5440bb529014a6a6f0f21d22839e
2014-10-29 16:10:16 -07:00
Yuta HIGUCHI
eb5a0b9d7d minor Device - Mastership fixes
Change-Id: Id6d46e22fb67f01cd5c0802cf4fad135a043ec77
2014-10-29 15:59:40 -07:00
Pavlin Radoslavov
52307e60ba IpAddress and IpPrefix related cleanup:
* Removed IpAddress.MAX_INET_MASK and use IpPrefix.MAX_INET_MASK_LENGTH
   instead
 * Renamed IpAddress.INET_LEN to INET_BYTE_LENGTH
 * Added IpAddress.INET_BIT_LENGTH, INET6_BYTE_LENGTH, and INET6_BIT_LENGTH
 * Removed methods that are semantically incorrect, or are not needed/used
   - IpAddress.prefixLength()
   - IpAddress.toPrefix()
   - IpAddress.mask()
   - IpAddress.netmask()
   - IpAddress.network()
   - IpAddress.host()
   - IpAddress.isMasked()
   - IpAddress.contains()
   - IpPrefix constructor for version and bytes (but no netmask)
   - IpPrefix.valueOf(int)

 * Misc. other cleanup.
2014-10-29 15:07:37 -07:00
Thomas Vachuska
ef5a809573 Merge remote-tracking branch 'origin/master' 2014-10-29 11:28:48 -07:00
Thomas Vachuska
425a2d757f Modified intent compilers to only chose paths that are appropriate to the type of intent, i.e. packet or optical. 2014-10-29 11:28:28 -07:00
Ayaka Koshibe
317245a6db add check for duplicate MastershipEvents to DeviceManager
Change-Id: I2753366b29ef32fa77ebcefff4b2202f1afe0006
2014-10-29 11:15:59 -07:00
Ayaka Koshibe
e60d452eda avoid transient changes to MastershipStore from being posted as events
Change-Id: Id033cf50f865e44439138f5b3814ebaedb832b73
2014-10-29 11:15:59 -07:00
Yuta HIGUCHI
56df70f929 Added debug log
Change-Id: Icc86bb91a382fd2d9bb013b9d6d30e0f45ffad74
2014-10-28 22:26:15 -07:00
Yuta HIGUCHI
4b52444082 DistributedFlowRuleStore related fixes
- handle no master for Device case
- Changed failed item type to FlowRule

Change-Id: If6c85751759cf6ba9ab0ed0384cbe1bf08a5d572
2014-10-28 22:23:57 -07:00
Yuta HIGUCHI
10a31c3b85 initial Distributed IntentStore using Hz
Change-Id: Iffb3f5fdfe8ba080fd039e67f8473ea18348f20d
2014-10-28 14:42:06 -07:00
Thomas Vachuska
4f1a60c9fd Revised copyright message. 2014-10-28 13:39:11 -07:00
Toshio Koide
9be539e079 Preparing implementation of link resource data store. 2014-10-28 11:07:52 -07:00
Pavlin Radoslavov
444b519327 Replaced the usage of IpPrefix with IpAddress in the context of
Controller Nodes.

Change-Id: Id2b25fb071bb20541db3f77b7afefe886520538e
2014-10-28 10:45:19 -07:00
Thomas Vachuska
e0f804aa3f Added application ID store; both trivial and distributed variants. 2014-10-27 23:40:48 -07:00
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