504 Commits

Author SHA1 Message Date
Thomas Vachuska
2498c0b549 Merge "Fixing flow rule batches" 2014-11-11 17:16:51 -08:00
Thomas Vachuska
9b2da21522 Fixing flow rule batches
Problem should now be fixed. Hashing on enums last is a bad
idea because the enum value could be 0.

Change-Id: Ib29e90b393b5285be2807729b52e69b121340f09
2014-11-11 17:08:14 -08:00
Ray Milkey
930fc663c5 Add unit tests fir DefaultFlowEntry class
Also fixed a bug where the error DefaultFlowEntry was not setting the
timestamp.

Change-Id: Ic23e91926605ea7c166b244d8352b58347844a5f
2014-11-11 16:13:28 -08:00
Ray Milkey
1e20711a9c Unit tests for the DefaultFlowRule class
- added a method to the immutable class checker for
  immutable classes used as base classes
- fixed a typo in spelling of a constructor parameter
  in DefaultFlowRule

Change-Id: I8991c1eadcc990040bb97a02c1027b4708a4f58d
2014-11-11 11:11:05 -08:00
Thomas Vachuska
6acd3bbc83 Miscellaneous clean-up of provider IDs.
Change-Id: If7b3adf96425f8a655ea9af07b6da27a1a66a6f2
2014-11-10 20:35:16 -08:00
Thomas Vachuska
2683761416 Merge "Refactor: Improve null safety and simplify branch conditioin" 2014-11-10 20:05:13 -08:00
Ray Milkey
8d3ce43a84 Unit Tests for Bandwidth and Lambda allocations
These tests are for checking the valid path calculation logic
in the intent compilers and the PathIntent installer.

Change-Id: I2986729ae27202a2f42a71e64a53026383ddfb0b
2014-11-10 17:32:29 -08:00
Sho SHIMIZU
5653151088 Refactor: Improve null safety and simplify branch conditioin
Change-Id: I0b8fdf34dcdd1914175ab21f7542d8e85cea7047
2014-11-10 15:27:49 -08:00
Thomas Vachuska
4830d390a9 Added server-side code to create host-to-host intent. Still WIP.
Change-Id: I80626aa9ecb38802ddca4be3bce3def85ccfdb88
2014-11-09 18:17:24 -08:00
Thomas Vachuska
10ac63b61e Decreasing event accummulator times.
Change-Id: Ida8d6d63286eedb96ef8d9bc777d6cf392e32511
2014-11-07 16:19:45 -08:00
Ray Milkey
40f50b96a6 Reenable tests cases that were turned off
Change-Id: I4211d0e5ed92e7e4e66e2a8391e917d43dcef97c
2014-11-07 15:29:25 -08:00
Yuta HIGUCHI
0c6e184044 Trigger MastershipEvent on no more master case
Change-Id: Iaac7b7d021802e7470df061dad719dcdf0e4b73e
2014-11-05 23:49:24 -08:00
Thomas Vachuska
65d1294434 Merge "Make logger static final variable" 2014-11-05 18:46:37 -08:00
Ray Milkey
460f40251c ONOS-22 - Add Constraints to CLI Commands
Added optional --lambda and --bandwidth operations to command
line for host to host, point to point, and multi point to
single point intents

Fixed intent compilers to add constraints to the PathIntents they
create

Change-Id: I25510d401118feba493f51ecddc72d770d8ae3e3
2014-11-05 16:45:47 -08:00
Sho SHIMIZU
8b5051d202 Make logger static final variable
Change-Id: I1ea7f3bb9a74a1b1f139512f3d253a1916b30c3e
2014-11-05 15:22:03 -08:00
Pavlin Radoslavov
5b5dc48d9c Updated the ProxyArpManager to use Ip4Address instead of
the more generic IpAddress.

The ProxyArpManager is defined and works only for IPv4, hence
we should use the concrete IPv4 addresses.

Change-Id: Ie43ca17ce03ea86d2efb6b33f55a5dcafb2ab985
2014-11-05 14:48:08 -08:00
Thomas Vachuska
b14c77af79 Fixed a number of javadoc warnings and cleaned up aggregate javadocs. 2014-11-04 18:08:01 -08:00
Thomas Vachuska
edc944c3fc adding constaints to intent API 2014-11-04 15:42:52 -08:00
Jonathan Hart
a887ba8ae0 Refactored the HostStore to allow multiple MAC addresses bound to a single port
Change-Id: Icd3b2e483b15486251ac1cca107478a012d1a3e7
2014-11-03 17:14:10 -08:00
Praseed Balakrishnan
5c324331e3 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-11-03 14:56:44 -08:00
Praseed Balakrishnan
2dd5abd17f Optical Treatment to include SigType 2014-11-03 14:56:28 -08:00
Yuta HIGUCHI
2fcb40ce06 FlowRule subsystem bugfixes
- RULE_ADDED will be posted when the Flow was confirmed by stats,
  even if they were installed as a batch
- Properly handle batch in Simple store

Change-Id: I0a0e15b29ff9c0d56d5a646e0751511d73c8f552
2014-11-03 14:49:27 -08:00
Yuta HIGUCHI
3e848a8eb8 add methods to directly set MacAddress
Change-Id: Idab9dce493927d8943789177830df630f3b1326a
2014-11-03 09:29:59 -08:00
Brian O'Connor
fe0f4b1c3a Adding resource-{available,allocated} CLI commands and lots of toStrings
Change-Id: Ib23eda2d9feb523e23dc33fb437994267b4cc555
2014-11-02 00:34:10 -07:00
Yuta HIGUCHI
548153202c Changed argument from Device -> DeviceId
- roleChanged(), isReachable()
   Eventually consistent nature of Device store was
  interfering with mastership control.

Change-Id: I9c0dd846a4e30863f922f6706c6cb62fd7c83f29
2014-11-01 09:45:23 -07:00
Yuta HIGUCHI
d26354db11 revisiting DeviceManager role handling
Change-Id: If7765b38e2eda99ca210316429a8e65d482c2791
2014-10-31 23:21:39 -07:00
Yuta HIGUCHI
2d3cd31c61 log message fixes in DeviceManager
Change-Id: Ia07cfa936d171a31c619e1ee13d6df5f80d7e629
2014-10-31 23:21:38 -07:00
Yuta HIGUCHI
13c0b87df5 Add API in DeviceClock*Service to check if Timestamp can be issued.
- check local DeviceClockProviderService before trying to
  store Port update information.

Change-Id: I22c94cb712d7001a227497b723780b6db3fbdf04
2014-10-31 23:21:38 -07:00
Pavlin Radoslavov
d0e32d7486 Added support for IPv6 addresses to class IpAddress:
- For some of the methods, the IP Version needs to be specified by the
   caller. This applies to the IpPrefix API as well.
 - For now, everywhere IpAddress is used and the IP version has to be
   explicitly specified by the caller, we assume/specify IPv4.
 - Added unit test for class IpAddress: for both IPv4 and IPv6 addresses.
2014-10-31 18:11:43 -07:00
Ayaka Koshibe
3ef2b0db6c vertical feedback path for Role replies
Change-Id: I31bdb85f90901ec79147adeea0df8ceae00ed1dc
2014-10-31 14:02:54 -07:00
Brian O'Connor
41718fced1 Applied some fixes to Intents
- Use classname instead of class in IntentId
- Added hashcode and equals to LambdaResourceAllocation
- Untrack resources in IntentManger during uninstall
- Refactored common code in OpticalPathIntentInstaller
- Copied SimpleLinkResourceStore to DistributedLinkResourceStore
- Added a few unserializable files to KryoNamespaces

Change-Id: Ic35d102244972d5cf0c64482fd99e8c9bb1293a6
2014-10-30 16:59:19 -07:00
Thomas Vachuska
4b42077418 Cleaned up a slew of Javadoc errors in preparation for switch over to Java 8. 2014-10-30 16:46:17 -07:00
Yuta HIGUCHI
d40e950c71 use termService field
Change-Id: I56998905db4f0403e8c244937a788555dea37823
2014-10-30 15:43:45 -07:00
Thomas Vachuska
96f4d47578 Merge remote-tracking branch 'origin/master' 2014-10-30 14:10:57 -07:00
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