ovsdb.git
9 years agoImplemented port/interface delete command to delete interface from ovsdb bridge 69/17869/8
Anil Vishnoi [Tue, 7 Apr 2015 18:27:07 +0000 (23:57 +0530)]
Implemented port/interface delete command to delete interface from ovsdb bridge
*.*Fixed tp-ip : We should not append bridge id to the tp-id, as it's already
augmented on bridge node. Also removed the utility method to avoid further
uses.
*.* removed attached-to from termination-point attributes
*.* Fixed restconf
*.* Rebased patch

Change-Id: Iedd87b386a3b2c6acd2e33ab26d17fbeec6f35ff
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
9 years agoMerge "Update netvirt.impl unit tests."
Sam Hague [Wed, 8 Apr 2015 18:04:34 +0000 (18:04 +0000)]
Merge "Update netvirt.impl unit tests."

9 years agoUpdate netvirt.impl unit tests. 49/17949/2
Alexis de Talhouët [Wed, 8 Apr 2015 17:33:58 +0000 (13:33 -0400)]
Update netvirt.impl unit tests.

Basically I added tests, mainly Mockito.verify(). And I refactored, updated and cleaned up the classes.

Change-Id: I1d3f2c7966a7edb1ad7d41d53cdba1e37cb1082c
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoMerge "Add support for bridge external-ids."
Sam Hague [Wed, 8 Apr 2015 17:21:13 +0000 (17:21 +0000)]
Merge "Add support for bridge external-ids."

9 years agoModified postman collection to test vlan-mode. 37/17937/3
Gabriel Robitaille-Montpetit [Wed, 8 Apr 2015 15:34:35 +0000 (11:34 -0400)]
Modified postman collection to test vlan-mode.

Change-Id: I8efe63a272e14cff270678c8dacec3011e2f3dc0
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
9 years agoMerge topic 'unification'
Sam Hague [Wed, 8 Apr 2015 15:07:03 +0000 (15:07 +0000)]
Merge topic 'unification'

* changes:
  Switch to generic extract methods in TransactUtils
  Use SouthboundMapper.getRandomUUID() in TerminationPoints

9 years agoMerge "Add JUnit testing for FWaasHandler class."
Flavio Fernandes [Wed, 8 Apr 2015 14:13:41 +0000 (14:13 +0000)]
Merge "Add JUnit testing for FWaasHandler class."

9 years agoMerge "Add JUnit testing for LBaaSHandler class."
Flavio Fernandes [Wed, 8 Apr 2015 14:12:12 +0000 (14:12 +0000)]
Merge "Add JUnit testing for LBaaSHandler class."

9 years agoModify test case testProcessEvent() for FloatingIPHandlerTest class. 25/17925/1
Alexis de Talhouët [Wed, 8 Apr 2015 13:53:52 +0000 (09:53 -0400)]
Modify test case testProcessEvent() for FloatingIPHandlerTest class.

Change-Id: I3cea00cabe74a3d893c848a654bc77278a1afdaf
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for LBaaSHandler class. 23/17923/1
Alexis de Talhouët [Wed, 8 Apr 2015 13:47:38 +0000 (09:47 -0400)]
Add JUnit testing for LBaaSHandler class.

Change-Id: Ie0aba32878c1643920a8df9441fc1ebce311d6ce
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoMerge topic 'unification'
Sam Hague [Wed, 8 Apr 2015 11:16:01 +0000 (11:16 +0000)]
Merge topic 'unification'

* changes:
  Remove need for termination-point to have bridge-name
  Step 2: Migrate termination point stuff under the same transact as bridge stuff.

9 years agoAdd support for bridge external-ids. 08/17808/3
Sharad Mishra [Mon, 6 Apr 2015 08:47:35 +0000 (01:47 -0700)]
Add support for bridge external-ids.

updated the yang model and impl to use "bridge-external-ids".

Change-Id: I6fbf9383557ddf115408fe398a4ba2aeb7134738
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
Add support for bridge external-ids

Change-Id: I850d32c55485acf566b5b419aaf22e782af37df7
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoSwitch to generic extract methods in TransactUtils 89/17889/1
Ed Warnicke [Wed, 8 Apr 2015 03:15:42 +0000 (20:15 -0700)]
Switch to generic extract methods in TransactUtils

Change-Id: I97c9479f1ef52a852113cce6a28c33ef2112851e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoUse SouthboundMapper.getRandomUUID() in TerminationPoints 88/17888/1
Ed Warnicke [Wed, 8 Apr 2015 02:39:13 +0000 (19:39 -0700)]
Use SouthboundMapper.getRandomUUID() in TerminationPoints

Change-Id: I539bbc7b2431dbb935f3b1df6941769a890525aa
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoRemove need for termination-point to have bridge-name 86/17886/1
Ed Warnicke [Wed, 8 Apr 2015 02:29:45 +0000 (19:29 -0700)]
Remove need for termination-point to have bridge-name

bridge-name can be dug out of the change event :)

Change-Id: I0e8b3177258ad32e2010ada44c4d112aae469a63
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Add test case for enqueueEvent() for AbstractHandler class."
Sam Hague [Wed, 8 Apr 2015 00:46:31 +0000 (00:46 +0000)]
Merge "Add test case for enqueueEvent() for AbstractHandler class."

9 years agoStep 2: Migrate termination point stuff under the same transact as bridge stuff. 81/17881/1
Ed Warnicke [Tue, 7 Apr 2015 23:50:42 +0000 (16:50 -0700)]
Step 2: Migrate termination point stuff under the same transact as bridge stuff.

Change-Id: I8ac105de3a62ad8ad46d29a6aca26b51ba937b4b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "First step in unifying datachange events"
Sam Hague [Tue, 7 Apr 2015 22:50:42 +0000 (22:50 +0000)]
Merge "First step in unifying datachange events"

9 years agoFirst step in unifying datachange events 70/17870/3
Ed Warnicke [Tue, 7 Apr 2015 18:39:49 +0000 (11:39 -0700)]
First step in unifying datachange events

What works:
OVSDB connect/disconnect
Bridge Create/Delete
TerminationPoint Create

Change-Id: I15cf4a5fc3b6d3d514575c035d44675b2737afe7
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Added model for vlan mode."
Sam Hague [Tue, 7 Apr 2015 17:57:52 +0000 (17:57 +0000)]
Merge "Added model for vlan mode."

9 years agoAdded model for vlan mode. 61/17861/1
Gabriel Robitaille-Montpetit [Tue, 7 Apr 2015 15:50:05 +0000 (11:50 -0400)]
Added model for vlan mode.

Change-Id: Idbce7831aa30ba3943297fbd4077667023e80339
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
9 years agoAdd test case for enqueueEvent() for AbstractHandler class. 39/17839/1
Alexis de Talhouët [Tue, 7 Apr 2015 13:27:08 +0000 (09:27 -0400)]
Add test case for enqueueEvent() for AbstractHandler class.

Change-Id: I7f0b1e9a6fc1b43aef4012f7d478eaadb7b36aed
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for FWaasHandler class. 09/17809/2
Alexis de Talhouët [Mon, 6 Apr 2015 20:53:11 +0000 (16:53 -0400)]
Add JUnit testing for FWaasHandler class.

Change-Id: I0c2fa6a3e1e9d361d3b2999201a3d2e46557e4b0
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoInterface options operational data store persistence 14/17814/2
Ryan Goulding [Mon, 6 Apr 2015 23:13:12 +0000 (19:13 -0400)]
Interface options operational data store persistence

Stores the interface options to the operational data store.

Change-Id: I8e6956036f2a43ee404c0e30e19e7264ad345138
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
9 years agoOpenFlow port values are uint32, correcting the size in the model for that 03/17803/2
Ed Warnicke [Mon, 6 Apr 2015 18:07:14 +0000 (11:07 -0700)]
OpenFlow port values are uint32, correcting the size in the model for that

Change-Id: I1c810137d5c2f103b2679a4aa15cf32fa38e019e
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Small fix to handle the fact that ovsdb sometimes returns ofport of -1"
Flavio Fernandes [Mon, 6 Apr 2015 17:30:44 +0000 (17:30 +0000)]
Merge "Small fix to handle the fact that ovsdb sometimes returns ofport of -1"

9 years agoMerge "Check for trunks (if not present, don't throw an NPE ;) )"
Flavio Fernandes [Mon, 6 Apr 2015 17:21:32 +0000 (17:21 +0000)]
Merge "Check for trunks (if not present, don't throw an NPE ;) )"

9 years agoSmall fix to handle the fact that ovsdb sometimes returns ofport of -1 94/17794/2
Ed Warnicke [Mon, 6 Apr 2015 16:30:41 +0000 (09:30 -0700)]
Small fix to handle the fact that ovsdb sometimes returns ofport of -1

It turns out that sometimes ovsdb returns an ofport of -1 to indicate that
there is no associated ofport value.  We should represent that by *not*
having an ofport value

Change-Id: I2a28a34333ff1b92728286672499714079346444
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoCheck for trunks (if not present, don't throw an NPE ;) ) 98/17798/1
Ed Warnicke [Mon, 6 Apr 2015 16:58:34 +0000 (09:58 -0700)]
Check for trunks (if not present, don't throw an NPE ;) )

Change-Id: I9198ea669823e6ea36dc34fffc95269feedccf76
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoModified postman collection to test vlan-tag and trunks. 70/17670/3
Gabriel Robitaille-Montpetit [Mon, 6 Apr 2015 16:11:39 +0000 (12:11 -0400)]
Modified postman collection to test vlan-tag and trunks.

Change-Id: I54c089fc8c69bcf4d88d57f97a971b5538696a39
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
9 years agoMerge "Fixed if/else/for/while/do curly braces for LBaaSPoolMemberHandler.java"
Flavio Fernandes [Mon, 6 Apr 2015 15:45:31 +0000 (15:45 +0000)]
Merge "Fixed if/else/for/while/do curly braces for LBaaSPoolMemberHandler.java"

9 years agoMerge changes I99c0e84f,I0e035323
Flavio Fernandes [Mon, 6 Apr 2015 15:44:50 +0000 (15:44 +0000)]
Merge changes I99c0e84f,I0e035323

* changes:
  Add sonar for southbound
  Add copyright's to southbound-it files.

9 years agoAdded trunks code using Long 66/17666/8
Gabriel Robitaille-Montpetit [Thu, 2 Apr 2015 18:05:29 +0000 (14:05 -0400)]
Added trunks code using Long

Change-Id: Ib2cb185d3cc87ee34cbcf66dabd008c45001b52f
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
9 years agoAdd sonar for southbound 89/17789/1
Sam Hague [Mon, 6 Apr 2015 13:48:03 +0000 (09:48 -0400)]
Add sonar for southbound

Change-Id: I99c0e84f1b52e7d295f485b954160d1593d72c7d
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoFixed if/else/for/while/do curly braces for LBaaSPoolMemberHandler.java 76/17676/2
Leo Cavalcanti [Thu, 2 Apr 2015 22:37:41 +0000 (19:37 -0300)]
Fixed if/else/for/while/do curly braces for LBaaSPoolMemberHandler.java

This is also a try out for me just to make sure my Gerrit is ok.

Change-Id: I9efbc0a8cd2157d15b3f06ab2d0888c692d494c4
Signed-off-by: Leo Cavalcanti <leozinho@gmail.com>
9 years agoAdd copyright's to southbound-it files. 85/17785/2
Sam Hague [Mon, 6 Apr 2015 09:36:18 +0000 (05:36 -0400)]
Add copyright's to southbound-it files.

Change-Id: I0e0353233b068873bd1ba983eb11c7efde83bc1d
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Revert "Updated ovsdb.yang to include external-ids for bridges.""
Sam Hague [Mon, 6 Apr 2015 10:39:06 +0000 (10:39 +0000)]
Merge "Revert "Updated ovsdb.yang to include external-ids for bridges.""

9 years agoRevert "Updated ovsdb.yang to include external-ids for bridges." 88/17788/1
Sam Hague [Mon, 6 Apr 2015 10:38:46 +0000 (10:38 +0000)]
Revert "Updated ovsdb.yang to include external-ids for bridges."

This reverts commit e19e24bee91dca1e3d03420977e84e81d5240c4f.

Change-Id: Ibec4b568044929967dcc725aaa5dfa547b8e3b0e
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Updated ovsdb.yang to include external-ids for bridges."
Sam Hague [Sat, 4 Apr 2015 01:20:04 +0000 (01:20 +0000)]
Merge "Updated ovsdb.yang to include external-ids for bridges."

9 years agoMerge "support for Interface external_ids"
Sam Hague [Sat, 4 Apr 2015 00:36:31 +0000 (00:36 +0000)]
Merge "support for Interface external_ids"

9 years agosupport for Interface external_ids 18/17718/7
Ryan Goulding [Fri, 3 Apr 2015 16:38:09 +0000 (12:38 -0400)]
support for Interface external_ids

Adds support for Interface external_ids.  "external_ids" are configured on
Termination Point creation.  "external_ids" are persisted to the Operational
data store on Ovsdb Port update.  If external-id-value is not provided, the
port is still created as YANG has no way to enforce the field as mandatory.

Change-Id: Ibdac48f8d5144ddefd79278d5587c5a63bca0869
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
9 years agoUpdated ovsdb.yang to include external-ids for bridges. 43/17743/1
Sharad Mishra [Fri, 3 Apr 2015 16:54:04 +0000 (09:54 -0700)]
Updated ovsdb.yang to include external-ids for bridges.

Change-Id: Ia639165fe05be5f4e1f236893780b177465b0d9a
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoAdd external-ids and other-config to the OVSDB node model 30/17730/2
Eric Multanen [Tue, 31 Mar 2015 11:25:49 +0000 (04:25 -0700)]
Add external-ids and other-config to the OVSDB node model

Add external-ids and other-config to the OVSDB node
for capturing information in the Open_vSwitch table.

Added other-config as a grouping so it can be used
by other tables which need other-config.

v2 - move the external-ids and other-config to the
     ovsdb node (not the bridge node - for another patch)

Change-Id: I551f2a9e786460941cae23d1c3e3862c11d1bb07
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
9 years agoMerge "net-virt-providers: install flow twice unnecessarily"
Sam Hague [Fri, 3 Apr 2015 00:50:05 +0000 (00:50 +0000)]
Merge "net-virt-providers: install flow twice unnecessarily"

9 years agonet-virt-providers: install flow twice unnecessarily 78/17678/1
Isaku Yamahata [Thu, 2 Apr 2015 23:56:41 +0000 (16:56 -0700)]
net-virt-providers: install flow twice unnecessarily

some net-virt-providers installs flows twice unnecessarily.
It seems like copy-n-paste bug.
Remove unnecessary writeFlow() call.

Change-Id: Iaa73fac7eb09c45f598634257210a293c10f40b6
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
9 years agoMerge "Add JUnit testing for FloatingIPHandler class."
Flavio Fernandes [Thu, 2 Apr 2015 23:36:15 +0000 (23:36 +0000)]
Merge "Add JUnit testing for FloatingIPHandler class."

9 years agoMerge "Add IT for southbound"
Flavio Fernandes [Thu, 2 Apr 2015 23:35:30 +0000 (23:35 +0000)]
Merge "Add IT for southbound"

9 years agoMerge "ofport and ofport_request operational data store persistence"
Sam Hague [Thu, 2 Apr 2015 21:55:51 +0000 (21:55 +0000)]
Merge "ofport and ofport_request operational data store persistence"

9 years agoofport and ofport_request operational data store persistence 67/17467/7
Ryan Goulding [Thu, 2 Apr 2015 16:37:35 +0000 (12:37 -0400)]
ofport and ofport_request operational data store persistence

Persists ofport and ofport_request fields in the operational data store.  The
yang model utilizes uint16 for these fields, while the library code utilizes
Long for consistency reasons.

Change-Id: Ib9390d19736cd1aba5710161ee477799dc5ba466
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
9 years agoAdd IT for southbound 99/17599/2
Sam Hague [Thu, 2 Apr 2015 02:25:40 +0000 (22:25 -0400)]
Add IT for southbound

Change-Id: Iff82a08c08cae8013417031f48f32d6639b94b8c
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd JUnit testing for FloatingIPHandler class. 73/17673/1
Alexis de Talhouët [Thu, 2 Apr 2015 20:40:42 +0000 (16:40 -0400)]
Add JUnit testing for FloatingIPHandler class.

Change-Id: I1a5dc5fb7c7bc9b4a856925bb0ff731bf0d48e8b
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoMerge "Add JUnit tesing for NeutronL3Adapter class."
Flavio Fernandes [Thu, 2 Apr 2015 18:51:05 +0000 (18:51 +0000)]
Merge "Add JUnit tesing for NeutronL3Adapter class."

9 years agoMerge "Add JUnit testing for AbstractHandler class."
Flavio Fernandes [Thu, 2 Apr 2015 18:50:23 +0000 (18:50 +0000)]
Merge "Add JUnit testing for AbstractHandler class."

9 years agoMerge "Add JUnit testing for AbstractEvent class."
Flavio Fernandes [Thu, 2 Apr 2015 18:49:59 +0000 (18:49 +0000)]
Merge "Add JUnit testing for AbstractEvent class."

9 years agoMerge "Revert "Add break in iteration over vlan tags for a given ovsdbTerminationPoint""
Flavio Fernandes [Thu, 2 Apr 2015 18:01:10 +0000 (18:01 +0000)]
Merge "Revert "Add break in iteration over vlan tags for a given ovsdbTerminationPoint""

9 years agoRevert "Add break in iteration over vlan tags for a given ovsdbTerminationPoint" 53/17653/1
Flavio Fernandes [Thu, 2 Apr 2015 15:28:06 +0000 (15:28 +0000)]
Revert "Add break in iteration over vlan tags for a given ovsdbTerminationPoint"

This reverts commit 38c634b2cada040ccd98d91c11d21326a4eba197.

The break is actually out of place; removing it.

Ref: https://gist.github.com/3d1dab38f9dde757fe83

Change-Id: If0d91bd762450d79d9c897947ba1fe48bbb854df
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoAdd JUnit tesing for NeutronL3Adapter class. 49/17649/2
Alexis de Talhouët [Thu, 2 Apr 2015 15:21:56 +0000 (11:21 -0400)]
Add JUnit tesing for NeutronL3Adapter class.

Change-Id: Icb54db19c31a222ad7a4c8e8a4a5de82d28471f4
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for AbstractHandler class. 45/17645/1
Alexis de Talhouët [Thu, 2 Apr 2015 14:52:39 +0000 (10:52 -0400)]
Add JUnit testing for AbstractHandler class.

Change-Id: If172dff7ad5d98a6cabdb78a6c4067c3327e1f10
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for AbstractEvent class. 37/17637/1
Alexis de Talhouët [Thu, 2 Apr 2015 14:03:33 +0000 (10:03 -0400)]
Add JUnit testing for AbstractEvent class.

Change-Id: Iebc184f92e724887ed6e796cd0f0beefbd467352
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoMerge "Model update to add external-id to port/interface."
Sam Hague [Thu, 2 Apr 2015 00:15:18 +0000 (00:15 +0000)]
Merge "Model update to add external-id to port/interface."

9 years agoMerge "Add break in iteration over vlan tags for a given ovsdbTerminationPoint"
Sam Hague [Thu, 2 Apr 2015 00:13:59 +0000 (00:13 +0000)]
Merge "Add break in iteration over vlan tags for a given ovsdbTerminationPoint"

9 years agoFix: bug wherein the bridge with name having a - cannot be created. e.g. br-int canno... 94/17594/1
Prateek Garg [Wed, 1 Apr 2015 23:31:27 +0000 (16:31 -0700)]
Fix: bug wherein the bridge with name having a - cannot be created. e.g. br-int cannot be created

Change-Id: I620f8255100fdfcd9cef57a926280c58520d76fa
Signed-off-by: Prateek Garg <prategar@cisco.com>
9 years agoAdd break in iteration over vlan tags for a given ovsdbTerminationPoint 88/17588/1
Flavio Fernandes [Wed, 1 Apr 2015 22:03:41 +0000 (18:03 -0400)]
Add break in iteration over vlan tags for a given ovsdbTerminationPoint

Since we expect no more than a single vlan tag for a given termination point,
there is no need to call setVlanTag multiple times on termination point builder.
Added a TODO to mark the fact that the iteration/builder will need to be enhanced
if more than a single vlan tag support is needed.

Change-Id: I1ff45ccea8fb2b061157ca7b9af0ad2e072abdcb
Ref: https://gist.github.com/1e07ddc7e663710c2ac7
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoadding Interface type for dpdkvhostuser interfaces in yang and southboundConstants 77/17577/1
Praveen Mala [Wed, 1 Apr 2015 18:30:09 +0000 (14:30 -0400)]
adding Interface type for dpdkvhostuser interfaces in yang and southboundConstants

Change-Id: I5731264de24fca852d282b60719f0f4bf1924a8d
Signed-off-by: Praveen Mala <praveen.mala@intel.com>
9 years agoFix bug when a bridge is removed. 70/17570/1
Ed Warnicke [Wed, 1 Apr 2015 17:05:10 +0000 (13:05 -0400)]
Fix bug when a bridge is removed.

The external_ids opendaylight-iid was not being used
for bridge remove.  Now it is.

Change-Id: I2cde45a07f255bbc5f1efb7d2c3b1bd2b63f98f5
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix for case when datapath/iface types are not supported 67/17567/1
Ed Warnicke [Wed, 1 Apr 2015 16:46:01 +0000 (12:46 -0400)]
Fix for case when datapath/iface types are not supported

If we attempt to get datapath/iface types from ovs
versions prior to their support, an exception is thrown,
this patch handles it correctly.

Change-Id: I8315bf3a2f250c412cdf51c385754be409dc2257
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Revert "Added trunks code to go with the model.""
Sam Hague [Wed, 1 Apr 2015 16:06:28 +0000 (16:06 +0000)]
Merge "Revert "Added trunks code to go with the model.""

9 years agoRevert "Added trunks code to go with the model." 62/17562/1
Gabriel Robitaille-Montpetit [Wed, 1 Apr 2015 15:54:43 +0000 (15:54 +0000)]
Revert "Added trunks code to go with the model."

This reverts commit 436e0cbe741db71cd645bda565a7a83a8f722cad.

Change-Id: If9ba1d0c7ef7a30d6d0aef3575e240f52a180780
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
9 years agoModel update to add external-id to port/interface. 79/17579/3
Sharad Mishra [Wed, 1 Apr 2015 10:52:34 +0000 (03:52 -0700)]
Model update to add external-id to port/interface.

Change-Id: I099111e7ef09428516473ad4fb998d88835e321c
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoMerge "Added trunks code to go with the model."
Sam Hague [Wed, 1 Apr 2015 10:00:08 +0000 (10:00 +0000)]
Merge "Added trunks code to go with the model."

9 years agoRevert: Revert "Add JUnit testing for ConfigurationServiceImpl class." 08/17508/1
Flavio Fernandes [Tue, 31 Mar 2015 21:08:13 +0000 (17:08 -0400)]
Revert: Revert "Add JUnit testing for ConfigurationServiceImpl class."

This commit re-introduces commit eb362a3e296c10ad8ac7b5cb626cd2466f4d558b.

The issue was a minor tweak missing in pom.xml, so that powermock would
stop generating npe.

Change-Id: I4b3b7aa6fa8a597a3d0d84e648e2c0dd21038c68
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Also-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoRevert "Add JUnit testing for ConfigurationServiceImpl class." 00/17500/2
Flavio Fernandes [Tue, 31 Mar 2015 19:54:34 +0000 (19:54 +0000)]
Revert "Add JUnit testing for ConfigurationServiceImpl class."

This reverts commit eb362a3e296c10ad8ac7b5cb626cd2466f4d558b.

This is to stop regression introduced, where hit the following failure:

https://jenkins.opendaylight.org/releng/view/ovsdb/job/ovsdb-daily-full-integration/OVS_VERSION=1.9.0,jdk=openjdk7,nodes=dynamic_docker/23/consoleFull

apiTests(org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT)
Tests run: 3, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 53.545 sec <<< FAILURE! - in org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT
testInventoryListeners(org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT)  Time elapsed: 10.368 sec  <<< ERROR!
java.lang.NullPointerException: null
at org.mockito.internal.exceptions.stacktrace.StackTraceFilter.<clinit>(StackTraceFilter.java:21)
at org.mockito.internal.exceptions.stacktrace.ConditionalStackTraceFilter.<init>(ConditionalStackTraceFilter.java:17)
at org.mockito.exceptions.base.MockitoException.filterStackTrace(MockitoException.java:30)
at org.mockito.exceptions.base.MockitoException.<init>(MockitoException.java:19)
at org.mockito.exceptions.misusing.MockitoConfigurationException.<init>(MockitoConfigurationException.java:18)
at org.mockito.internal.configuration.ClassPathLoader.loadImplementations(ClassPathLoader.java:145)
at org.mockito.internal.configuration.ClassPathLoader.findPluginImplementation(ClassPathLoader.java:110)
at org.mockito.internal.configuration.ClassPathLoader.findPlatformMockMaker(ClassPathLoader.java:106)
at org.mockito.internal.configuration.ClassPathLoader.<clinit>(ClassPathLoader.java:59)
at org.mockito.internal.util.MockUtil.<clinit>(MockUtil.java:21)
at org.mockito.internal.MockitoCore.<init>(MockitoCore.java:40)
at org.mockito.Mockito.<clinit>(Mockito.java:932)
at org.opendaylight.ovsdb.integrationtest.plugin.OvsdbPluginIT.testInventoryListeners(OvsdbPluginIT.java:171)

Change-Id: I13d0c3193e297eb9b825bd657478955fc7876733
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoAdded trunks code to go with the model. 75/17375/8
Gabriel Robitaille-Montpetit [Mon, 30 Mar 2015 18:01:04 +0000 (14:01 -0400)]
Added trunks code to go with the model.

Change-Id: I514f8d8ad7d786901061b14909735cee9bb412f6
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
9 years agoAdd <relativePath/> to ensure Maven pulls artifact from Nexus 69/17469/1
Thanh Ha [Tue, 31 Mar 2015 15:48:37 +0000 (11:48 -0400)]
Add <relativePath/> to ensure Maven pulls artifact from Nexus

Needed by autorelease to be able to find and replace this value
prebuild.

Change-Id: Ifad9a6c514c2aa47e52d18ebbfeb1bf71b121496
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoSmall fix to insure correct running offline. 44/17444/2
Ed Warnicke [Tue, 31 Mar 2015 14:03:37 +0000 (10:03 -0400)]
Small fix to insure correct running offline.

The southbound-impl features depend on the config file, not
just on the southbound-impl bundle.

<groupId>org.opendaylight.ovsdb</groupId>
<artifiactId>southbound-impl</artifactId>

is the *bundle* dependency.

<groupId>org.opendaylight.ovsdb</groupId>
<artifiactId>southbound-impl</artifactId>
<type>xml</type>
<classifier>config</classifier>

is a distinct artifact for the config file.

By failing to depend on the config file, the
southbound-impl feature will not work correctly in
offline mode.

Change-Id: Iab4ba7225f30aac19b45267da33c3a6219488b4a
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Add datapath types to vswitch."
Flavio Fernandes [Tue, 31 Mar 2015 13:06:20 +0000 (13:06 +0000)]
Merge "Add datapath types to vswitch."

9 years agoMerge "Add multiple options to port via MDSAL"
Flavio Fernandes [Tue, 31 Mar 2015 13:03:52 +0000 (13:03 +0000)]
Merge "Add multiple options to port via MDSAL"

9 years agoAdd multiple options to port via MDSAL 01/17401/1
Eric Multanen [Mon, 30 Mar 2015 23:29:15 +0000 (16:29 -0700)]
Add multiple options to port via MDSAL

Only one option was getting added to the port when
multiple options were supplied in the MDSAL config
operation.  This patch adds all of them to the
port.

Change-Id: Iee139510d6d396c410641130b5aeee1fedca4c72
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
9 years agoAllow port to be added via MDSAL without VLAN tag 00/17400/1
Eric Multanen [Mon, 30 Mar 2015 21:44:26 +0000 (14:44 -0700)]
Allow port to be added via MDSAL without VLAN tag

Check if VLAN tag was provided before trying to add
it when creating a port to prevent a null pointer exception.

Change-Id: Iac0582ee5e151e446383130d108ef8c0e182f34d
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
9 years agoUse dependencyManagement imports 74/17374/2
Robert Varga [Mon, 30 Mar 2015 18:00:54 +0000 (20:00 +0200)]
Use dependencyManagement imports

Some upstream projects already provide artifacts, so use them to
simplify poms.

Change-Id: I58a45b3bcd8301383fd6c7a6a4bdea2e3e7838f4
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoMerge "Remove port/interface from operational datastore."
Flavio Fernandes [Mon, 30 Mar 2015 21:24:21 +0000 (21:24 +0000)]
Merge "Remove port/interface from operational datastore."

9 years agoMerge "Enabled the use of opendaylight-iid as external_ids for bridges"
Flavio Fernandes [Mon, 30 Mar 2015 21:21:38 +0000 (21:21 +0000)]
Merge "Enabled the use of opendaylight-iid as external_ids for bridges"

9 years agoMerge "Add ability to serialize/deserialize iids to/from Strings"
Sam Hague [Mon, 30 Mar 2015 21:07:01 +0000 (21:07 +0000)]
Merge "Add ability to serialize/deserialize iids to/from Strings"

9 years agoEnabled the use of opendaylight-iid as external_ids for bridges 82/17382/2
Ed Warnicke [Mon, 30 Mar 2015 17:59:13 +0000 (13:59 -0400)]
Enabled the use of opendaylight-iid as external_ids for bridges

Change-Id: Ie95bedab4fc0bc367e0581a64c1084c807bd390c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoAdd ability to serialize/deserialize iids to/from Strings 81/17381/2
Ed Warnicke [Mon, 30 Mar 2015 17:43:22 +0000 (13:43 -0400)]
Add ability to serialize/deserialize iids to/from Strings

Change-Id: I17df9cb64f53f7084bf439b4d6ae2203af8a2e19
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Add JUnit testing for ConfigurationServiceImpl class."
Sam Hague [Mon, 30 Mar 2015 20:25:41 +0000 (20:25 +0000)]
Merge "Add JUnit testing for ConfigurationServiceImpl class."

9 years agoAdded code for vlan-tags on termination points. 56/17256/6
Gabriel Robitaille-Montpetit [Fri, 27 Mar 2015 17:44:09 +0000 (13:44 -0400)]
Added code for vlan-tags on termination points.

Change-Id: Id57d5b157e505a1b6a73cb8b32022be0d64e4d2b
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
9 years agoAdd JUnit testing for ConfigurationServiceImpl class. 37/17237/6
Alexis de Talhouët [Fri, 27 Mar 2015 14:09:53 +0000 (10:09 -0400)]
Add JUnit testing for ConfigurationServiceImpl class.

I had to add dependency to PowerMockito in the pom file in order to mock final class and static method.

Change-Id: Ib5de1a79acc78b4c42e27cbcbbc9e137fa963b46
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoMerge "Fail build on checkstyle errors"
Flavio Fernandes [Mon, 30 Mar 2015 17:08:44 +0000 (17:08 +0000)]
Merge "Fail build on checkstyle errors"

9 years agoMerge "Added trunk model."
Sam Hague [Mon, 30 Mar 2015 16:32:07 +0000 (16:32 +0000)]
Merge "Added trunk model."

9 years agoAdd datapath types to vswitch. 92/17392/1
Sharad Mishra [Mon, 30 Mar 2015 15:24:45 +0000 (08:24 -0700)]
Add datapath types to vswitch.

Change-Id: If19b5d42361b1af291d79ec3f83920a97a16981e
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoFail build on checkstyle errors 68/17368/1
Sam Hague [Mon, 30 Mar 2015 15:59:13 +0000 (11:59 -0400)]
Fail build on checkstyle errors

Change-Id: Ib4015597e55291754278e56810f6676f408fd03f
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoRemove port/interface from operational datastore. 80/17380/1
Sharad Mishra [Mon, 30 Mar 2015 11:05:41 +0000 (04:05 -0700)]
Remove port/interface from operational datastore.

Change-Id: Id28b6129de6879d3e9b2b141ae801ba0741bdb7e
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoRemove uneeded version property from distribution pom 14/17314/1
Flavio Fernandes [Sun, 29 Mar 2015 23:20:48 +0000 (19:20 -0400)]
Remove uneeded version property from distribution pom

Change-Id: I0e7732a2e3d1fe63c59ecf38fe4dc3274e244c10
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoUpdates due to using latest checkstyle 84/17284/1
Sam Hague [Sat, 28 Mar 2015 14:34:53 +0000 (10:34 -0400)]
Updates due to using latest checkstyle

Change-Id: I5e38107256902e29bb07d88e08dac7e72d1745b0
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoUse latest checktyle version 83/17283/1
Sam Hague [Sat, 28 Mar 2015 14:33:44 +0000 (10:33 -0400)]
Use latest checktyle version

Some generics warnings were fixed in the latest version.

Change-Id: I57520444a183152e0b90b1b287915730814d5c39
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoUpdate libary with checkstyle corrections 68/17268/1
Sam Hague [Fri, 27 Mar 2015 23:45:49 +0000 (19:45 -0400)]
Update libary with checkstyle corrections

Change-Id: I4408dd37290495a2df949ed538b9bf53090415a8
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoUse local checkstyle rules to allow incremental corrections 67/17267/1
Sam Hague [Fri, 27 Mar 2015 23:44:23 +0000 (19:44 -0400)]
Use local checkstyle rules to allow incremental corrections

Change-Id: I03481afe0f224b6133bdb0b3b6e4beca1f2d3c0e
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdded trunk model. 64/17264/2
Gabriel Robitaille-Montpetit [Fri, 27 Mar 2015 21:24:43 +0000 (17:24 -0400)]
Added trunk model.

Change-Id: I81270948e49f291c5d8927a64c3b5466cd9d02c5
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
9 years agoUpdate doc of class EventDispatcherImplTest. 58/17258/1
Alexis de Talhouët [Fri, 27 Mar 2015 18:19:25 +0000 (14:19 -0400)]
Update doc of class EventDispatcherImplTest.

Change-Id: Ib781c519f2be1e99764de1358c0ab087f77cb36b
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>