182 Commits

Author SHA1 Message Date
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
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
Pavlin Radoslavov
211f4e562c Removed extra IpAddress.toInt() calls, which are not needed.
Change-Id: Ic295d0e4ca963b15eb4ebf905d6360e457832c8f
2014-10-31 11:59:43 -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
Thomas Vachuska
50c7bb7166 Merge remote-tracking branch 'origin/master' 2014-10-30 16:04:53 -07:00
Thomas Vachuska
2ac1b82ff2 Changed onos-app-calendar web.xml to use class-based, rather than package based resource loading. 2014-10-30 16:04:46 -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
Thomas Vachuska
a05c0a2941 Merge "Prototype bandwidth reservation" 2014-10-29 18:26:50 -07:00
Praseed Balakrishnan
3abb083894 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-29 17:20:32 -07:00
Praseed Balakrishnan
546cdfc6ba Fixed packet optical link. 2014-10-29 17:19:37 -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
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
e60d452eda avoid transient changes to MastershipStore from being posted as events
Change-Id: Id033cf50f865e44439138f5b3814ebaedb832b73
2014-10-29 11:15:59 -07:00
Jonathan Hart
ec2df013ed Fixed a few intent synchronization issues.
Also added a CLI command to test SDN-IP primary switchover.

Change-Id: Id31f79262a2b607f987adad2fdb3eb54eb939fea
2014-10-29 09:39:35 -07:00
Marc De Leenheer
631ffce5b0 Support optical port status via OFExperimenter type 0x748771 2014-10-28 16:29:07 -07:00
Pingping
f5d90939a7 IntentSync test without state
The current Router class does not check the Intent state.
So I did not add the state in this patch.
I will push another patch for testing the intent state.

Change-Id: Idb44dcace5f33a0144852a999445931bc2189448
2014-10-28 14:05:17 -07:00
Thomas Vachuska
4f1a60c9fd Revised copyright message. 2014-10-28 13:39:11 -07:00
Thomas Vachuska
e0f804aa3f Added application ID store; both trivial and distributed variants. 2014-10-27 23:40:48 -07:00
Thomas Vachuska
755fb43aea Merge remote-tracking branch 'origin/master' 2014-10-27 19:56:22 -07:00
Thomas Vachuska
18867bf463 Added a standalone utility to convert ONOS topology JSON config to OELinc JSON config. 2014-10-27 19:56:15 -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
Pingping
fc58467f16 Unit test to Router class with Async ARP
Change-Id: I3797433ae5dcce06425159887e42ee75bcf621e4
2014-10-27 17:20:52 -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
Jonathan Hart
e4c37cecfd Added osgi dependency to prevent build errors in Eclipse
Change-Id: I7b3e1f5f3b4e664f321804f74ae97e5f47aad36d
2014-10-27 11:56:44 -07:00
Thomas Vachuska
781d18bfa1 Added copyrights to cli, features, openflow, providers and web code 2014-10-27 10:31:25 -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
Madan Jampani
24f9efb49e sendAndReceive now returns a Future instead of Reponse 2014-10-24 18:56:23 -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
Thomas Vachuska
7d84453188 Merge "Cleanup and javadocs for SDN-IP code" 2014-10-23 17:20:09 -07:00
Praseed Balakrishnan
e218ba10ea Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-23 16:58:46 -07:00
Jonathan Hart
31582d1b39 Cleanup and javadocs for SDN-IP code
plus refactor a unit test that started failing

Change-Id: Ib9f0f8eefc2ba7a9798d8f01b537dae18dd2920c
2014-10-23 16:44:04 -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
Praseed Balakrishnan
29d7d85563 removing test add component 2014-10-23 15:58:41 -07:00
Praseed Balakrishnan
64369da98a sigtype selector and treatment and fix not finding the switch id in test app. 2014-10-23 15:55:20 -07:00
Marc De Leenheer
37f328a1d6 Merge branch 'optical-integration' of ssh://gerrit.onlab.us:29418/onos-next into optical-integration 2014-10-23 14:16:04 -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
Pavlin Radoslavov
ccc2e33a6b Refeactor the Topology Events and Intent Events Metrics modules:
* Use the new class EventMetric to cleanup and simplify the implementation
 * Replaced the single metric for Topology Events with four metrics
   (last event timestamp and event rate):
   - Device Event metrics
   - Host Event metrics
   - Link Event metrics
   - Topology Graph metrics

Change-Id: I2acc06ab84ef3ca06d0d383983dfcff9774ff341
2014-10-23 13:49:26 -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
Jonathan Hart
b358c1ec9a Updated example SDN-IP config files
Change-Id: I49b4a11b1ececddaf88f08dd8f1e97a42f274b8a
2014-10-23 11:05:17 -07:00
Praseed Balakrishnan
68b4016ff9 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-10-23 10:15:50 -07:00