1514 Commits

Author SHA1 Message Date
Jonathan Hart
2e3eef3e81 Compare ConnectPoints rather than Interfaces.
Now we can have multiple Interfaces per port, and the old code results in an
intent using the same port for ingress and egress.

Change-Id: I9f9ad396a0c6e7d31d654896f31c59a34240f82f
2014-11-12 13:49:02 -08:00
Praseed Balakrishnan
b6b8cabd33 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-11-12 12:15:02 -08:00
Praseed Balakrishnan
bf78cf75ab Fix onos-json to linc-oe json error and create a simple non-linear topo for test team to test re-routing
Change-Id: I47c5f3279f5592f235aa831c3d4ca433060b3668
2014-11-12 12:14:50 -08:00
Yuta HIGUCHI
7a0ed16b62 FooComponent: check before create
Change-Id: Ie073ebc41a4c9028a1db804c57047a95f6617e47
2014-11-12 10:40:58 -08:00
Pavlin Radoslavov
3066cf6c94 Removed leftover TODO comment, that was done in the past.
Change-Id: If4e89a19248a7915f11c408355bad9fc39442992
2014-11-12 10:38:30 -08:00
Madan Jampani
650840bc9e One last checkstyle fix. 2014-11-12 01:10:57 -08:00
Madan Jampani
12390c1203 Reworked DatabaseService API.
Initial implementation of LockManager.
2014-11-12 00:35:56 -08:00
Thomas Vachuska
56d1a7005a Adding synchronous behaviour to the calendar REST API to wait until intent is in parked state. Needs testing.
Change-Id: I218bcc7f6a1cadbf4325d5e4976a720752d26192
2014-11-11 19:16:35 -08:00
Thomas Vachuska
52cc9a7097 Merge "added demo rest api for adding and withdrawing intents in a mesh" 2014-11-11 18:29:04 -08:00
alshabib
fd23d3136a added demo rest api for adding and withdrawing intents in a mesh
Change-Id: Ic68a9054c8a1a3d4223e75845f78205d8703ae56
2014-11-11 18:14:47 -08:00
Pavlin Radoslavov
0a297b160b Cleanup in the SDN-IP related configuration files:
* The (deployed) Interface addresses configuration file "addresses.json"
   from the apps/config application is expected to be found in the
   /opt/onos/config directory

 * The (deployed) SDN-IP configuration file "sdnip.json" is expected
   to be found in the /opt/onos/config directory

 * All configuration files (i.e., addresses.json and sdnip.json) should
   be stored in the tools/package/config directory before deployment
   (i.e., before running onos-config)

 * Removed the apps/config/src/main/resources/config.json sample configuration
   file, because it was incorrect, and replaced it with "addresses.json"
   file in the same directory

 * Updated the text in files tools/package/config/README and
   apps/sdnip/src/main/resources/config-examples/README

 * Minor code cleanup in SdnIpConfigReader.java and NetworkConfigReader.java

Change-Id: I8af75e62a94e4fb701e2c6a09cde93cd8461e255
2014-11-11 16:11:41 -08:00
Jonathan Hart
857b9e005b Fix error in README
Change-Id: I08752eafa885eaef11a40d0357a22ac7370f7b68
2014-11-11 12:08:15 -08:00
Pavlin Radoslavov
49eb64d444 Added support for parsing and handling BGP Confederation related AS Path
attributes.
Note: BGP Confedertions are not supported (yet).

Also, updated/simplified the MED comparison in the BGP Path Comparison
implementation.

Change-Id: Iabe01facffd2c6912f33f647841c1244d85282f3
2014-11-10 17:14:57 -08:00
Pavlin Radoslavov
0c84da8299 Added SDN-IP CLI command to show the BGP neighbors:
onos:bgp-neighbors
OR
  onos:bgp-neighbors -n <NeighborID>
  onos:bgp-neighbors --neighbor <NeighborID>

Change-Id: I4e4185d9484384d9e3aa5304c897410b23a24238
2014-11-07 17:54:25 -08:00
Pavlin Radoslavov
e6015265a2 Updated/fixed the SDN-IP BGP unit tests after some of the BGP-related
code whas changed.

Change-Id: Ie36ad03e3ae7544e7883e2b2aca4c94537750321
2014-11-07 13:08:53 -08:00
Pavlin Radoslavov
2ce1c52b42 Updates to the SDN-IP CLI:
* Added command options to show summary of the routes:
   - "onos:routes -s" or "onos:routes --summary"
     shows summary of the SDN-IP routes
   - "onos:bgp-routes -s" or "onos:bgp-routes --summary"
     shows summary of the BGP routes

 * Implemented displaying JSON output for the "onos:routes" and
   "onos:bgp-routes" commands (and the routes summary)

Also, added static methods BgpConstants.Update.AsPath.typeToString()
and BgpConstants.Update.Origin.typeToString() to return the
BGP AS_PATH type and BGP UPDATE ORIGIN type as a string.

Change-Id: I505c55a924721838bbbaf4ffccc30ffd61e90120
2014-11-07 10:32:37 -08:00
Yuta HIGUCHI
1fea0b6fca Foo bugfix
Change-Id: Id2db1cbf7bee61c0bd0178d62891d1f859ce31be
2014-11-07 00:38:35 -08:00
Yuta HIGUCHI
c6b8f611e6 checkstyle
Change-Id: Ie794af1b06777c4c4332c4047ad88ecbe1b2f550
2014-11-06 19:04:13 -08:00
Yuta HIGUCHI
361664ee4e Add sample accessing database service to Foo
Change-Id: I514c57a278dea368448d284eb5bf0d41bb0013e3
2014-11-06 18:06:12 -08:00
Pavlin Radoslavov
3a46e48fd9 Updated each of the metrics applications (Intent and Topology Metrics)
to register with the ONOS core services as an application.

Change-Id: If1d9eb3d79909d519673e751a9e047263efa1431
2014-11-06 15:57:06 -08:00
Pavlin Radoslavov
6b570737c4 Updated SDN-IP to use Ip4Address and Ip4Prefix instead of IpAddress and
IpPrefix, because so far we haven't implemented IPv6.
Also, some of the BGP-related attributes (e.g., BGP Speaker ID)
are IPv4 by definition.

The following components are updated:
 * BGP implementation
 * Router component and relevant state (e.g., RouteEntry)

Other components (e.g., configuration) will continue to use
the more generic IpAddress and IpPrefix.

Change-Id: I1936ca9871fd5a9709cb4f2c2850d78ebc1472c4
2014-11-06 13:16:45 -08:00
Praseed Balakrishnan
6a01c2fb67 Merge branch 'master' of ssh://gerrit.onlab.us:29418/onos-next 2014-11-06 12:29:19 -08:00
Praseed Balakrishnan
0bb2d7ddec Preparing for not loading optical config .. and use rest to push config 2014-11-06 12:29:09 -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
01a6ec0a5e Fixing reactive forwarding not to forward LLDP & BDDP.
Change-Id: Iea03aaeeb0679f2732246329e72306cc47bec5c1
2014-11-05 14:44:52 -08:00
Pingping
32fa30cce1 port SdnIpTest.java to onos-next
Change-Id: Iec9de810b168e3fbc8f1aa447778d3883fba03a1
2014-11-05 10:43:38 -08:00
Jonathan Hart
739c835e55 Cleaned up SDN-IP config reader
Change-Id: I98100a77b7460eeba848c2b7016f51cdcfef072a
2014-11-04 18:53:45 -08:00
Brian O'Connor
0a5c9c4622 adding version to shade in oecfg/pom.xml
Change-Id: I406196c84949fc0a6dabf529deea0aab388b2011
2014-11-04 18:50:33 -08:00
Thomas Vachuska
b14c77af79 Fixed a number of javadoc warnings and cleaned up aggregate javadocs. 2014-11-04 18:08:01 -08:00
Yuta HIGUCHI
5c94727a3c javadoc fixes
Change-Id: I3b4fc2d99f42b2413a535fb411b9c19bdd186ad8
2014-11-03 21:39:21 -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
Hongtao Yin
621c57aebf update
added modify and teardown cases
worked with external app for UC1 demo

Change-Id: Ia4c71cb006ff9f9eb7b7ebd43753509e7ad0763b
2014-11-03 15:32:38 -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
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