162 Commits

Author SHA1 Message Date
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
Pingping
3855f31f9e add unit test to Router class
Change-Id: I26d129fdae3b247e7f3976b7fbe953bef47cd4fd
2014-10-23 08:16:15 -07:00
Thomas Vachuska
9f805b16f2 Merge remote-tracking branch 'origin/master' 2014-10-23 02:33:42 -07:00
Pavlin Radoslavov
295b296961 Added a new module: ONOS intent metrics application
It can be used as an Intent-related event and event metrics collector.
It can be loaded by one of the following two (new) features:
     onos-app-metrics, onos-app-metrics-intent

After loading the module, it subscribes for intent-related events
and keeps the following state:
 (a) The last 100 events
 (b) The timestamp of the last event (ms after epoch) as observed by this
     module for each event type: SUBMITTED, INSTALLED, WITHDRAWN.
     The missing event type is the equivalent of "Withdraw Requested"
 (c) The rate of each intent event type: count, median rate, average rate
      over the last 1, 5 or 15 minutes

The following CLI commands are added:
 * onos:intents-events
   Shows the last 100 intent events
 * onos:intents-events-metrics
   Shows the timestamp of the last event (ms after epoch) as observed by
   this module for each event type, and the rate of the topology
   events (for each event type): see (b) and (c) above

Change-Id: I9f23e9086bbd433b8f24283539abdeb97e199e2e
2014-10-23 01:12:41 -07:00
Pavlin Radoslavov
5ba8b28e76 Update the TopologyMetrics module to listen for all topology-related events:
Devices, Hosts, Links, TopologyEvent

Now the semantics for updating the metrics are:
 * Any topology-related event (DeviceEvent, HostEvent, LinkEvent,
   TopologyEvent) will update the Lost Topology Event Timestamp
 * Only the DeviceEvent, HostEvent and LinkEvent will be counted in
   measuring the event rate; TopologyEvent is excluded, because it
   is generated as a result of some of those events

Also, increased the number of saved events from 10 to 100.

Change-Id: Ie759ee69869cddc617d7ad5b8b75a622e2571620
2014-10-23 01:03:10 -07:00
Thomas Vachuska
0e752bdbb4 Added link types of TUNNEL and OPTICAL.
Fixed the optical config json file.
Fixed treatment of links added by ancillary providers.
Added a trap for topology provider errors.
Added CLI to recompute topology.
2014-10-22 22:33:41 -07:00
Jonathan Hart
4c2b15e265 Implemented getMatchingInterface and added unit tests for
HostToInterfaceAdaptor.

Change-Id: Ibb56902e13f26dbd619d1ef87e283e8e4c5317db
2014-10-22 14:47:07 -07:00
Praseed Balakrishnan
69d95be9e5 Fixed learning optical links 2014-10-22 13:55:05 -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
Pavlin Radoslavov
6bc5594e7b Fix the property name inside the JSON representation of the topology
event rate metric:
  listenerEventRate -> topologyEventRate
2014-10-21 22:16:53 -07:00
Pavlin Radoslavov
64d9e47215 Added initial implementation of Topology-related event and
event metrics collector. It can be loaded by one of the following two (new)
features: onos-app-metrics, onos-app-metrics-topology

After loading the module, it subscribes for topology-related events
and keeps the following state:
 (a) The last 10 events
 (b) The timestamp of the last event (ms after epoch) as observed by this
     module
 (c) The rate of the topology events: count, median rate, average rate
     over the last 1, 5 or 15 minutes

The following CLI commands are added:
 * onos:topology-events
   Shows the last 10 topology events

 * onos:topology-events-metrics
   Shows the timestamp of the last event, and the rate of the topology
   events: see (b) and (c) above
2014-10-21 22:13:09 -07:00
Pavlin Radoslavov
3559249b9b Refactoring and cleanup in the Metrics module:
* Removed logging related code inside class MetricsManager
 * Removed @Component related code, because it is not suppose to be used
   as an component.
 * Added a new class-wrapper so the Metrics can be used as a loadable service:
   MetricsManagerComponent. The name and the location of this class
   will be refactored in the future.
 * Added new method MetricsManager.removeMetric()
 * Line formatting
 * Changed "interface MetricsService" to public
2014-10-21 21:57:25 -07:00
Jonathan Hart
bc4a793a00 Allowed flows to be permanent
Change-Id: I61952fe4cbad98be53094c7ec4a474868384b616
2014-10-21 11:46:00 -07:00
Thomas Vachuska
b97cf28766 Refactoring intent API. 2014-10-21 00:21:24 -07:00
Jonathan Hart
bc3f7f7130 Remove test route from SDN-IP
Change-Id: I767cc9829438e56da945ab35def86a3f7b9b244d
2014-10-20 18:50:17 -07:00
Jonathan Hart
d7bd98290c Moved SDN-IP and config to fasterxml jackson package
Change-Id: I5a5319188bb54738238787b58a7854e8b5564c9a
2014-10-20 18:26:13 -07:00
Jonathan Hart
d0caacd397 Added example config files for SDN-IP
Change-Id: Ia40bea166c147e95c2d9f5dbe13c6ccbd622de3d
2014-10-20 17:56:35 -07:00
Jonathan Hart
ce37f6d66d Renamed a class to better name 2014-10-20 10:25:03 -07:00
Jonathan Hart
0e12fadd5b Fixed issues with reading masked IP addresses from Loxi 2014-10-17 14:55:13 -07:00
weibit
38c42ede2e Optical topology provider for UC1
Change-Id: I1b25c9412b5180f9dce167f8700eb84baba70486
2014-10-17 11:09:34 -07:00
Jonathan Hart
ce430a4815 Ported the unit tests for PeerConnectivityManager 2014-10-16 20:48:52 -07:00