188 Commits

Author SHA1 Message Date
Pavlin Radoslavov
0af11c1ecf * Add unit tests for the BGP route preference comparison mechanism
This addresses ONOS-134
* Refactor existing BGP unit tests

Change-Id: Ia0ad7954632ec6b856d1a8a972f1837179121abb
2014-12-11 18:33:52 +00:00
Pavlin Radoslavov
64c1ed1f72 Renamed bgpRoutes field in Router class to ribTable.
No functional changes.

Change-Id: I1b5de1b93dc1264adfcd7c4cad9c2a315c1b8992
2014-12-10 18:10:55 -08:00
Jonathan Hart
b834920a2a Renamed SDN-IP test so it will be picked up by Surefire
Change-Id: I58cd3827fe0922f699c4044ff51beaced889a429
2014-12-10 19:31:42 +00:00
Pavlin Radoslavov
55b5f51d4d Refined the methods waiting for BGP routes in the BgpSessionManagerTest
unit test. This reduces the typical run time for the unit tests from
2-3 seconds to 0.6-0.7 seconds.

Change-Id: I7a31f837da5838c20d2b43de23de77d378e9f900
2014-12-08 10:01:11 -08:00
alshabib
ab98466b10 adding license to ALL files
Change-Id: I9df3277760d79732317816fe5b2f1f482e9f5375
2014-12-05 05:05:32 +00:00
Jonathan Hart
e9ef4f3fd1 Changed TODOs to NOTEs
Change-Id: I17a0f5099bd6931c50189794596c742f6ddc5b5a
2014-12-05 01:58:41 +00:00
Jonathan Hart
7dd4a33de3 Remove SDN-IP TODOs
Change-Id: I59b510ba95d4f76600d23d79a81964c2ef290a56
2014-12-04 17:37:05 -08:00
Pavlin Radoslavov
dfde7ab392 Cleanup the SDN-IP CLI:
* Updated/cleanup the "routes" and "bgp-rotues" commands output formatting
 * Fixed/updated the help description for the "routes" and "bgp-routes"
 * Added optional argument "-n <nbr>" or "-neighbor <nbr>" argument
   to the "bgp-routes" command to print the routes from a single BGP neighbor

Change-Id: I65afd00772bc8e097468ae2ed0dd3fd41bd27f25
2014-12-04 14:06:39 -08:00
Jonathan Hart
de08912143 Minor refactoring
Change-Id: I57198890b5fd833ba0f3368197d074a5fdc1d3e1
2014-12-03 22:33:14 -08:00
Jonathan Hart
51372183ce Javadoc and code cleanup for SDN-IP
Change-Id: I4b2cd853cb2c91ace2c710b215a7b2dca9301c28
2014-12-04 06:21:50 +00:00
Jonathan Hart
9fd6bfc475 Made SDN-IP's BGP listen port configurable
Change-Id: I98bb6bb2d500087757b57bf0ed9f5c709d459aef
2014-12-04 00:28:54 +00:00
Pavlin Radoslavov
0a714720a0 Added missing BgpSession.exceptionCaught() method to handle
exceptions on the Netty channel.

Change-Id: I9b927abfb21f87d52575158cbecc193d6102f094
2014-12-03 21:50:59 +00:00
Jonathan Hart
ff071a2749 Fix for BGP sessions not timing out
Change-Id: I57975fefe6d54934cbbde95b6d22e03bea835289
2014-12-03 12:10:20 -08:00
Pavlin Radoslavov
d6755ba9d0 Removed leftover local fields that are not needed anymore.
Change-Id: Ib12abffadaadc64ed7b32108731ff27b625d55a9
2014-12-03 02:25:16 -08:00
Brian O'Connor
abafb50f58 Changing org.onlab.onos package to org.onosproject
Change-Id: Ic81421faa27acdcff045add47d9e0a715cd4f575
2014-12-02 22:26:20 -08:00
Brian O'Connor
03defe7939 Moving org/onlab/onos to org/onosproject
Change-Id: I742627fe0862cac78391cf70010f99dc26dce1e6
2014-12-02 22:22:39 -08:00
Pavlin Radoslavov
8049bb8bb0 Lowered the level of some of the SDN-IP log messages (per route)
from DEBUG to TRACE.

Change-Id: I97eefe7550952c3c38976fcf4aa1f12274190868
2014-12-02 13:58:35 -08:00
Pavlin Radoslavov
23c05699c2 SDN-IP unit test fix: Increased the timeout waiting for a message to be
received from 2s to 5s. Eventually, this should address some rare
test failures.

Change-Id: Ifbf024023580ac93f10e1b7fb1b1f5dd2fe361f9
2014-12-02 21:32:18 +00:00
Jonathan Hart
9965d77a8e Cleaned up some commented code, javadocs and names in SDN-IP.
No functional changes.

Change-Id: Ic4421428ec468049f1d93ac457c08103543d5140
2014-12-02 20:49:09 +00:00
Pavlin Radoslavov
248c2ae78a Updated SDN-IP to use the Intent framework batch-based intents.
Also, created a local cache of IPv4-to-MAC address mapping,
to avoid relatively costly hostService.getHostsByIp() calls
per added route.

Change-Id: I8abed378985708e883fd99e85c54b01f38756515
2014-12-02 09:51:25 -08:00
Madan Jampani
8d21c790ee LeadershipService API change: Using NodeId in place of ControllerNode.
Change-Id: I6f688506c3672977456fc6921b26e98be2239632
2014-12-02 04:55:15 +00:00
Jonathan Hart
949c28455e Added a trivial implementation of the LeadershipService.
Also renamed SdnIpLeadershipService to HazelcastLeadershipService, and moved
it into the distributed core bundle.

This allows applications which depend on LeadershipService to be used with
the trivial core.

Change-Id: Ie71a946d95653a4d2209afd3af0e7f23b5a4f818
2014-11-30 18:17:15 -08:00
Yuta HIGUCHI
c2bf3d8fb9 IntentManager: use IntentStore batch APIs
Change-Id: Ie60f3e53f48fa6acbcaf5cf6837bdef12b36a98d
2014-12-01 00:26:30 +00:00
Brian O'Connor
72a034c863 Initial implementation of distributed intent batch queue
Change-Id: I7ffed03651569ade1be1e8dca905bfaf369b7e03
2014-11-28 22:42:44 +00:00
Pavlin Radoslavov
deb8a1098d Fix for bug ONOS-330:
Add missing "null" checks for IntentService.getIntentState()

Change-Id: Idd574227636f6cdd3a0dbae4c753ada6157e04e1
2014-11-26 13:32:57 -08:00
Pavlin Radoslavov
caf6337c46 Updated some of the SDN-IP log messages inside the IntentSynchronizer.
Also, fixed a typo in file TestIntentServiceHelper.java

Change-Id: I0c0f7ad0f5e02f80465fb643184e20924fd49153
2014-11-26 11:59:11 -08:00
Yuta HIGUCHI
f845cc3740 Give a name to each ThreadPool
Change-Id: Iec2b044fca542672608fd67ff43680f0d34b9da2
2014-11-25 20:44:10 -08:00
Pavlin Radoslavov
c91eebe810 Added Hazelcast-based Leadership implementation that is needed/used by SDN-IP.
This is a drop-in replacement until the generic ONOS Leadership service
is robust enough.

Change-Id: I72a84331dd948f98707eb59844dab425aa9d5c08
2014-11-25 19:39:26 -08:00
Pavlin Radoslavov
20be3e6bdc Don't withdraw the intents during SDN-IP shutdown, because this creates
flux in the dataplane during switchover to another SDN-IP instance being
the new SDN-IP leader.

Change-Id: I93e271770001678c3438637d5a804d934cd83848
2014-11-25 18:52:08 -08:00
Pavlin Radoslavov
f1288b8217 Removed bogus debug message in SDN-IP.
Change-Id: I61c3c06256508772c3e78f4ce61d1483f56107ca
2014-11-24 22:09:24 -08:00
Pavlin Radoslavov
97e8a8bd55 Fix the SDN-IP unit tests after changing the Intent IDs to use
explicit ID assignment.

Change-Id: I50bc20188922193cfa47bf0ec324a69929744745
2014-11-25 06:05:29 +00:00
Brian O'Connor
520c052e36 Changing Intent Ids to use explicit id assignment
Change-Id: I5a4bff87842c37a869e7691b353529eaefc929db
2014-11-25 05:49:35 +00:00
Pavlin Radoslavov
93ae832fed Updated the debug log messages for SDN-IP IntentSynchronizer.
Change-Id: I74ababe18113489ad64a2ca4a63bc1c63211a3ee
2014-11-24 20:54:36 -08:00
Pavlin Radoslavov
dde22ae5f4 Updates related to SDN-IP submitting intent operations:
* Updated IntentSynchronizer.submitPeerIntents() to use intent batch
    operation

  * Refactored the SDN-IP unit tests:
    The verification for intent service operations is moved to a new class
    TestIntentServiceHeler

Change-Id: Id6766ebb4d6bf492e8f9787c2c2247ac38d42964
2014-11-24 13:33:04 -08:00
Pavlin Radoslavov
a7243cca5c Updates for SDN-IP:
* Use the new Leadership Service instead of Distributed Lock to
   elect the SDN-IP Leader
 * Reimplement the SDN-IP Intent Synchronizer. In the new implementation
   the Point-to-Point Peer intents are also synchronized by and pushed
   only by the Leader (same as the Multipoint-to-SinglePoint Route intents)
 * Minor cleanups

Change-Id: I8e142781211a1d0f2d362875bc28fd05d843cd4b
2014-11-23 15:17:45 -08:00
Madan Jampani
71582edbe7 1. DatabaseManager activate will attempt to listTables to ensure store is in good shape.
2. lock and tryLock can now throw InterruptedExceptions.

Change-Id: Ifa766ad441f677a4071b68d8f6caa564cf320869

Change-Id: I318ff762a96b261737831f6bd7c200b384c638e9

Change-Id: I0f509703520b3187931fa3669cd8213a91e85c96
2014-11-19 15:39:30 -08:00
Pavlin Radoslavov
8b75244c38 Added SDN-IP Leader election mechanism based on the Global Lock service.
NOTE: This is a short-term solution until the Leadership Service is
implemented.

Change-Id: Id1f21c06e67e08efb444ebec4e45eeca360e613d
2014-11-18 15:56:44 -08:00
Pavlin Radoslavov
a071b1e9a9 Moved the BGP Route Intent synchronization mechanism from the Router class
to the new class IntentSynchronizer.

Also, minor cleanup in some of the method names and access scope.

Change-Id: I38257cd1d9516ef3b3dd50f23c28015054c73d70
2014-11-17 15:47:00 -08:00
Thomas Vachuska
112c703dc5 Fixing javadocs and adding missing package javadocs.
Also marked a few packages and classes as deprecated.

Change-Id: I8629ad001f218f92c35721daa3b7c0ebe0916c27
2014-11-16 11:05:14 -08:00
Jonathan Hart
6ec682909c Rafactored PeerConnectivityManager for code reuse between the two path types.
Change-Id: Ib05f676d071ef1c545e93244a9ed5ed89672113f
2014-11-14 15:10:31 -08:00
Jonathan Hart
a42deeafc9 Fix for setting up peer paths where BGP speakers don't peer with all peers.
Returning prevents any further paths being set up, even though this isn't
an error condition.

Change-Id: I13eb4b3021c78f437dcfd2fa715bb4568e6046d1
2014-11-13 21:46:33 -08:00
Pavlin Radoslavov
7e19094616 Refactor the SDN-IP BGP code so the BGP routes are withdrawn if
the onos-app-sdnip feature is uninstalled.

Change-Id: I49c40ee172a06d5809da69f736648fa639745975
2014-11-13 21:39:34 -08:00
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
Pavlin Radoslavov
3066cf6c94 Removed leftover TODO comment, that was done in the past.
Change-Id: If4e89a19248a7915f11c408355bad9fc39442992
2014-11-12 10:38:30 -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