186 Commits

Author SHA1 Message Date
Pavlin Radoslavov
ff894a2fcb Use Ip4Address and Ip4Prefix inside FlowEntryBuilder when dealing
with IPv4 source or destination.

Change-Id: Ia9084c2361b296d8636052e859c2a2d1516a4a11
2014-11-05 16:09:35 -08:00
Pavlin Radoslavov
23e398d804 Updated the Flow Mod builders (FlowModBuilder, FlowModBuilderVer10,
and FlowModBuilderVer13) to use Ip4Address and Ip4Prefix
instead of the generic IpAddress and IpPrefix when handling
IPv4 source and destination.

Change-Id: If35d735efe4cf557c79dc04eccf38f6a909e4506
2014-11-05 15:17:57 -08:00
Ray Milkey
7808105d8c Add unit test for Instructions class and improve Criteria toString() test
Change-Id: Ie1ffb4ca0c0bcd168625213fecbdb3818a61704e
2014-11-05 12:36:36 -08:00
Pingping
32fa30cce1 port SdnIpTest.java to onos-next
Change-Id: Iec9de810b168e3fbc8f1aa447778d3883fba03a1
2014-11-05 10:43:38 -08:00
Yuta HIGUCHI
3225578be4 LinkDiscovery: only reschedule if not requested to stop
Change-Id: If2ac04fbc81afec95137fbdbe22afa0c7f826e4a
2014-11-04 22:48:45 -08:00
Yuta HIGUCHI
5c94727a3c javadoc fixes
Change-Id: I3b4fc2d99f42b2413a535fb411b9c19bdd186ad8
2014-11-03 21:39:21 -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
3e848a8eb8 add methods to directly set MacAddress
Change-Id: Idab9dce493927d8943789177830df630f3b1326a
2014-11-03 09:29:59 -08: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
802d0e81f3 check switch connection before probing
Change-Id: I7f53866d8863e7335bb19a5bee80967c4ce0070c
2014-10-31 23:21:39 -07:00
Yuta HIGUCHI
69a27353f0 move isConnected to OpenFlowSwitch interface
Change-Id: I08d1746dc05464135cabe31888f6bb3eac9c15d5
2014-10-31 23:21:39 -07:00
Yuta HIGUCHI
d19f6706a6 extract DeviceId
Change-Id: I1379ca26846e75b1c60fc523cae87539b3fa22db
2014-10-31 23:21:39 -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
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
Pavlin Radoslavov
855ea2d5b9 Refactor the IpPrefix API and implementation:
* Now IpPrefix uses IpAddress to represent the subnet address
 * The IpPrefix subnet address is masked-out by the prefix length.
   E.g., IpPrefix("1.2.3.4/24") is now stored as IpPrefix("1.2.3.0/24")
 * Removed IpPrefix methods that are not used or don't apply anymore
 * Replaced usage of IpPrefix with IpAddress where appropriate
2014-10-30 15:32:39 -07:00
Jonathan Hart
4f1ba09655 Lowered log level for common log
Change-Id: I4b60a4537a1398517ce403a37d2e6513bfb0b963
2014-10-29 17:50:48 -07:00
Thomas Vachuska
98eda53b6b Added back the MBPS divisor for port speeds. 2014-10-29 17:31:02 -07:00
Thomas Vachuska
1e426e9e37 Added Port.Type and plumbed it throughout. 2014-10-29 17:26:25 -07:00
Thomas Vachuska
d16ce18d0c Added Port.Type and plumbed it throughout. 2014-10-29 17:25:29 -07:00
Yuta HIGUCHI
f672588ec4 LLDP LinkDiscovery related fix
- avoid LinkDiscovery from start()-ing multiple times
- Only check device mastership at beginning of probe interval

Change-Id: I0cece8fbcf2a031ea3ac603c6f51dbe87ad454ad
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
Ayaka Koshibe
e60d452eda avoid transient changes to MastershipStore from being posted as events
Change-Id: Id033cf50f865e44439138f5b3814ebaedb832b73
2014-10-29 11:15:59 -07:00
Thomas Vachuska
4f1a60c9fd Revised copyright message. 2014-10-28 13:39:11 -07:00
Jonathan Hart
d4a8bba682 Changed back to using apply-actions in 1.3 because LINC-OE doesn't support write-actions
Change-Id: I5fcd386d329d1d520da31098c81f25c5cd877c1f
2014-10-28 12:44:20 -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
Thomas Vachuska
e1bcb0b3ef Added isLinkLocal predicate to MacAddress and used it in ReactiveForwarding. 2014-10-27 17:45:10 -07:00
Thomas Vachuska
781d18bfa1 Added copyrights to cli, features, openflow, providers and web code 2014-10-27 10:31:25 -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
1b6f5688d0 FlowStatsCollector: collect FlowStats on MASTER sw only
Change-Id: I4a7e808cceeaee209aaf22d85c9fa4dc069d8acc
2014-10-26 19:44:55 -07:00
Yuta HIGUCHI
00b476fadb send LLDP probe only to non-Logical ports
Change-Id: I93995a718c9fcf5352a015c0cdc011f5876c9730
2014-10-26 19:44:55 -07:00
Jonathan Hart
86e5935289 Change the way 1.3 flow mods are built to support rewrite actions.
Change-Id: I9c1c3059822b19d0665702162dee9904f95127d8
2014-10-24 11:04:27 -07:00
Marc De Leenheer
9eb47ec124 Working lambda treatment & selectors 2014-10-23 14:15:49 -07:00
Marc De Leenheer
4908775b84 Support lambda's in selector & treatment 2014-10-23 13:54:09 -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
Jonathan Hart
43ef46fbad Shut LinkDiscovery up
Change-Id: I59dbb008014969476c8180f7a2b09a78a69519a5
2014-10-23 10:48:37 -07:00
Madan Jampani
117aaae1fd Towards a distributed flow rule store 2014-10-23 10:04:05 -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
Ayaka Koshibe
38594c28b5 implement DeviceProvider triggerProbe() to call after mastership change
Change-Id: I65002296189e6a499ef353255a016b013eb24020
2014-10-22 13:40:26 -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
alshabib
2374fc9e45 many fixes from different people in various place. Optical, FlowRuleManager, LinkDiscovery
Change-Id: Ie3302e80ee94bf2e41b3da7ac765557b1e7509fd
2014-10-22 11:03:23 -07:00
alshabib
dfc7afb1a7 distributed link fixes
Change-Id: Iefede001a76834599a5629d843a4325283e42711
2014-10-21 20:13:27 -07:00
Jonathan Hart
bc4a793a00 Allowed flows to be permanent
Change-Id: I61952fe4cbad98be53094c7ec4a474868384b616
2014-10-21 11:46:00 -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