293 Commits

Author SHA1 Message Date
Thomas Vachuska
07ac62ab2e Merge remote-tracking branch 'origin/master' 2014-10-21 12:47:34 -07:00
Thomas Vachuska
10d4abcf36 Adding JSON output for intent list command. 2014-10-21 12:47:26 -07:00
Jonathan Hart
bc4a793a00 Allowed flows to be permanent
Change-Id: I61952fe4cbad98be53094c7ec4a474868384b616
2014-10-21 11:46:00 -07:00
Thomas Vachuska
e291c8445e Enhanced toString for intents for consistency.
Removed ID block allocator stuff.
2014-10-21 02:52:38 -07:00
Thomas Vachuska
3a78be6ccf Merge remote-tracking branch 'origin/master' 2014-10-21 01:34:05 -07:00
Thomas Vachuska
a12fdf2fb0 Ooops... corrected a unit test. 2014-10-21 01:33:48 -07:00
Yuta HIGUCHI
f3d51bdbc0 Initial DistributedDlowRuleStore
- known bug: responding to ClusterMessage not possible.

Change-Id: Iaa4245c64d2a6219d7c48ed30ddca7d558dbc177
2014-10-21 01:08:55 -07:00
Thomas Vachuska
4926c1b06f Refactoring intent API. 2014-10-21 00:44:10 -07:00
Thomas Vachuska
b97cf28766 Refactoring intent API. 2014-10-21 00:21:24 -07:00
Jonathan Hart
11096406ca Changed some non concurrent structures to ConcurrentHashMaps in
SimpleIntentStore and OpenFlowRuleProvider.

Also improved logging in IntentManager so exception stack traces are logged.

Change-Id: I72f5e20893bda633dc36ea271a0f56c0ddb7fb5a
2014-10-20 17:38:38 -07:00
Ayaka Koshibe
abedb0998d MasteshipService, store, and CLI commands use RoleInfo
Change-Id: Ibc569498a67d33d088e5c9f89c6bb1f45eadc26e
2014-10-20 17:31:11 -07:00
Ayaka Koshibe
67af1f4247 add roleInfo structure and backup_changed mastership event
Change-Id: Iedee219fe250d681377d73a50a71f5fa72cd7802
2014-10-20 17:31:10 -07:00
Brian O'Connor
f2dbde576b refactoring intent framework installers
installers should return work rather than futures

Change-Id: I664c9ef43279139eaf3bbc3cfc84b258b480eaab
2014-10-20 15:35:06 -07:00
Jonathan Hart
6b2ffc35b9 Fixed issue where LinkCollectionIntentInstaller was missing a flow rule
for the last hop switch.

Change-Id: I0f3d49de10dc5a6fd7cf65463d0d2e9b6d512346
2014-10-20 10:14:23 -07:00
Yuta HIGUCHI
f6f50a6471 FlowEntry must not be modified outside store.
- Remove set method from FlowEntry
- Storing last seen timestamp for FlowEntry eviction locally on FlowManager.
  FlowEntry eviction based on packet counter will take longer time to timeout
  after master Node change.

Change-Id: I7134d698dd5b9bf7cca379c5ba7c4fbcc2e3d5f3
2014-10-19 15:58:49 -07:00
Yuta HIGUCHI
0722fb2149 added FIXME for disconnection corner case
- disconnection event triggered while
  DeviceManager recognition of mastership is not in sync yet.

Change-Id: I03959ca59a4220a8e91b88f2f8565c883e39a93f
2014-10-19 01:16:33 -07:00
Yuta HIGUCHI
d631e42168 bugfix: DeviceManager#applyRole should ignore NONE
Change-Id: Ib235c4853b0a7e504a8ee42e9bc9eafe99257fc8
2014-10-19 00:23:27 -07:00
Ayaka Koshibe
da1cda69a0 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-18 18:43:08 -07:00
Ayaka Koshibe
b5c63a0af2 fixes for mastership handoff race conditions
Change-Id: Ifed733df1bdc3b144b6a341a9322838ea2aacd72
2014-10-18 18:42:27 -07:00
Yuta HIGUCHI
605347c288 modified SimpleFlowRuleStore not to use MultiMap
Change-Id: Ie9adb127f1acb4d919951c75513e689fbd80596d
2014-10-18 18:03:14 -07:00
Pavlin Radoslavov
a0e47543d6 Bug fix: don't generate topology events with "null" reasons.
Approved by: Yuta
2014-10-17 19:22:17 -07:00
Yuta HIGUCHI
e794cbe349 Add FIXME to LinkManager
When multiple provider register Links (e.g., LLDP, Config),
and one of the provider remove a Link, all the Links sharering the
same ConnectionPoint will be removed.

Change-Id: I8e607edd3eeabd849ff8ec9d92367019a42892ac
2014-10-17 13:21:23 -07:00
alshabib
da9c64f4a9 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-17 12:00:35 -07:00
alshabib
3effd04e74 fix for a failed sub batch
Change-Id: Ie686efd41a6815f913e06d1167f2282334a98ecb
2014-10-17 12:00:31 -07:00
Jonathan Hart
7d1ad60622 Explicitly set address length when creating a new host 2014-10-17 11:48:32 -07:00
Ray Milkey
c0fa4db98d PointToPointintent unit tests
Change-Id: I5852862337cc4e67ca9d8fee2ba860a2751838d4
2014-10-17 10:29:07 -07:00
alshabib
75e774203d Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	core/store/hz/net/src/main/java/org/onlab/onos/store/device/impl/DistributedDeviceStore.java
	core/store/hz/net/src/test/java/org/onlab/onos/store/device/impl/DistributedDeviceStoreTest.java
	features/features.xml
	tools/test/cells/office

Change-Id: I08e6d7c6a0bdaae072dd50ff7ac36d94f16d77e1
2014-10-16 18:03:40 -07:00
alshabib
7911a05aae lldp discovery independent of OF
Change-Id: I720f727f6628e30e5d732e6d7bf742d1b7050812
2014-10-16 17:49:37 -07:00
Ray Milkey
e668408321 Unit tests for some Intent objects and compilers
Unit tests for HostToHost and MultiPointToSinglePoint intents
and intent compilers.

Made Intent classes final to make them immutable.
2014-10-16 16:59:47 -07:00
Thomas Vachuska
97839bb7e5 Merge remote-tracking branch 'origin/master' 2014-10-16 11:16:06 -07:00
Thomas Vachuska
0a608ac7d9 Pruned duplicate dependencies and plugins from several core related pom.xml files. 2014-10-16 11:15:59 -07:00
Pavlin Radoslavov
87710fb6e2 Cleanup in the core/net/pom.xml file after the "onos-core-hz-net"
project was removed.

Reviewed by: Yuta
2014-10-16 10:57:25 -07:00
Ayaka Koshibe
760a7f9745 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	core/store/serializers/src/main/java/org/onlab/onos/store/serializers/KryoPoolUtil.java

Change-Id: I6a8fc884f0c0b6578762d7b439177378e838735f
2014-10-16 10:57:12 -07:00
Jonathan Hart
bcae7bdf0e Removed faulty toInt method and renamed toRealInt to toInt. 2014-10-16 10:26:54 -07:00
tom
a4b548c633 Added javadoc comment to onos.impl package. 2014-10-16 00:20:29 -07:00
Ayaka Koshibe
bfca040388 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-15 17:07:45 -07:00
Jonathan Hart
dbdbdbb451 Added restrictions for proxy ARP 2014-10-15 11:27:04 -07:00
Ayaka Koshibe
45503ce0b2 list mastership roles CLI command
Change-Id: I54dc296f90c4b8ceebe4e86816c3796da4d2d714
2014-10-14 11:26:45 -07:00
Yuta HIGUCHI
8bca23574f remove timing sensitive portion from DefaultTopologyProviderTest.
Change-Id: I7fa496c421470520df4cb79c036ac8ea25b31c96
2014-10-14 11:17:49 -07:00
alshabib
9dc1b0ece5 removing print statememt
Change-Id: I2b3543c41e64ef3f5260661809e85f985cd15e0e
2014-10-13 14:25:46 -07:00
alshabib
94cf3c557b Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-13 14:16:46 -07:00
alshabib
cf3699106d flowrule service : apply batch tests
Change-Id: I8e8660e979a2d250496a5ae3100e66e48a67290a
2014-10-13 14:16:42 -07:00
Yuta HIGUCHI
18ab8a9fc2 modified LinkKey creation to follow other id objects
Change-Id: Ie70444f9069486d0251482464595f5835cf12539
2014-10-13 12:01:11 -07:00
Ray Milkey
0742ec92cd Add a Multiple source to single destination intent
This is a very simplistic implementation of an intent that
represents multiple sources with a single destination.
The implementaiton is simple, it just computes the union
of the set of path segments needed to satisfy all the connections
and installs them.

The unit test is just a skeleton with a single test case and
needs to be expanded.
2014-10-13 08:39:55 -07:00
Yuta HIGUCHI
80912e6757 Separate cluster management and mastership management to separate packages
Change-Id: If1e399648451842da6dccc644b75b81337b105f9
2014-10-12 00:15:47 -07:00
Yuta HIGUCHI
093e83ea68 Refactoring
- Renamed Clock{Service, Provider} -> DeviceClock*
- move from store -> net/device package

Change-Id: Ib4ba5119146bb2df97d3148f48890fb1f47d6a9d
2014-10-11 20:15:39 -07:00
Ayaka Koshibe
db450ab300 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-11 14:17:21 -07:00
Ayaka Koshibe
ea5b4cec7e fixes in mastership reelection for single-node failure
Change-Id: Iedcab52bb156643464a97435fcc39c5db7393976
2014-10-11 14:17:17 -07:00
tom
093340b44c Speeding up stuff.
HostDescription now passes up just a single IpAddress.
2014-10-10 00:15:36 -07:00
tom
88a6f11a9a Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next
Conflicts:
	core/api/src/main/java/org/onlab/onos/net/ElementId.java
2014-10-09 18:00:19 -07:00