ovsdb.git
9 years agoFix for exception thrown when no ovs_version set. 70/18970/1
Sharad Mishra [Thu, 23 Apr 2015 16:52:38 +0000 (09:52 -0700)]
Fix for exception thrown when no ovs_version set.

I am running a DPDK accelerated OVS that was manually built.
It does not have its ovs_version field set and ODL throws exception.

Not sure if we support such ovs ... is it a support statement issue or bug ??

Change-Id: I778c89e241120058b380c96b2b074eab255a85bd
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
9 years agoSouthboundIT for vlan, vlanmode and vlan trunks 50/18850/2
Ryan Goulding [Wed, 22 Apr 2015 15:03:58 +0000 (11:03 -0400)]
SouthboundIT for vlan, vlanmode and vlan trunks

Add integration tests to verify vlan, vlan mode and vlan trunks functionality.

Change-Id: I745ba976a244b42d7f38a9d43db8eacac77ba416
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
9 years agoMerge "additional southbound-it for port/interface"
Flavio Fernandes [Tue, 21 Apr 2015 19:51:11 +0000 (19:51 +0000)]
Merge "additional southbound-it for port/interface"

9 years agoadditional southbound-it for port/interface 63/18763/1
Ryan Goulding [Tue, 21 Apr 2015 15:43:34 +0000 (11:43 -0400)]
additional southbound-it for port/interface

Adds integration tests to verify ofPortRequest, termination point options,
interface external-ids, port external-ids, interface other-configs, and port
other-configs.

Change-Id: Ibf76a20a5844885e404b53d4a9c163452ca4084a
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
9 years agoUpdate poms for Maven Central Requirements 52/18752/1
Sam Hague [Tue, 21 Apr 2015 14:54:40 +0000 (10:54 -0400)]
Update poms for Maven Central Requirements

Change-Id: I73fa6324ea917594e5cd110acd8f7b68102b3ca1
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoofPort test in SouthboundIT 68/18668/1
Ryan Goulding [Mon, 20 Apr 2015 21:14:57 +0000 (17:14 -0400)]
ofPort test in SouthboundIT

Adds an integration test to verify ofPort functionality.  A helper method is
provided to create a new TerminationPoint for testing.

Change-Id: I4588b9c95dff067007ebec47ea268c0f4e1f1bdf
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
9 years agoFix ovsdb node disconnect - Removing ovsdb node from config data store 43/18643/2
Anil Vishnoi [Mon, 20 Apr 2015 15:28:20 +0000 (20:58 +0530)]
Fix ovsdb node disconnect - Removing ovsdb node from config data store
is not disconnecting the node.

Change-Id: I15012381814b80b887f4fb0cb5b62dbcbe9eb458
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
9 years agoAdd Unit tests for openstack/netvirt/providers/openflow13/OF13Provider.java 06/18606/1
Ben Eze [Sun, 19 Apr 2015 23:47:24 +0000 (19:47 -0400)]
Add Unit tests for openstack/netvirt/providers/openflow13/OF13Provider.java

Change-Id: I7b92343cfb7653e44755bb54afcc003b1adebcb9
Signed-off-by: Ben Eze <beze@inocybe.ca>
9 years agoFix broken SouthboundIT test 04/18604/2
Sam Hague [Sun, 19 Apr 2015 19:30:00 +0000 (15:30 -0400)]
Fix broken SouthboundIT test

The mdsalUtils field needs to be static becuase each @Test method is a totally new allocation and the value is reaallocated for each test.

Also added some extra debug logs.

Patchset 2: checkstyle

Change-Id: Ic75b5bc25cdf62b1c3daa4ee2fdea487804fb0a9
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "TerminationPointUpdate command to update termination point on ovsdb node"
Sam Hague [Sun, 19 Apr 2015 17:55:00 +0000 (17:55 +0000)]
Merge "TerminationPointUpdate command to update termination point on ovsdb node"

9 years agoTerminationPointUpdate command to update termination point on ovsdb node 65/18565/2
Prateek Garg [Fri, 17 Apr 2015 19:55:31 +0000 (12:55 -0700)]
TerminationPointUpdate command to update termination point on ovsdb node

Change-Id: I17c4bd890a120b4fbf74ff5288f97bf00fd224df
Signed-off-by: Prateek Garg <prategar@cisco.com>
9 years agoMerge "Remove .../distribution/opendaylight-karaf/. It is now .../karaf"
Sam Hague [Sat, 18 Apr 2015 01:22:37 +0000 (01:22 +0000)]
Merge "Remove .../distribution/opendaylight-karaf/. It is now .../karaf"

9 years agoMerge "Add JUnit testing for L2RewriteService class."
Flavio Fernandes [Fri, 17 Apr 2015 21:20:46 +0000 (21:20 +0000)]
Merge "Add JUnit testing for L2RewriteService class."

9 years agoMerge "Add JUnit testing for L2FowardingService class."
Flavio Fernandes [Fri, 17 Apr 2015 21:20:35 +0000 (21:20 +0000)]
Merge "Add JUnit testing for L2FowardingService class."

9 years agoMerge "Add JUnit testing for LoadBalancerService class."
Flavio Fernandes [Fri, 17 Apr 2015 21:20:28 +0000 (21:20 +0000)]
Merge "Add JUnit testing for LoadBalancerService class."

9 years agoAdd JUnit testing for IngressAclService class. 47/18547/4
Alexis de Talhouët [Fri, 17 Apr 2015 14:40:10 +0000 (10:40 -0400)]
Add JUnit testing for IngressAclService class.

Change-Id: I44c088d640413d978cbbec9fa67c8a5d7d0aea8b
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for LoadBalancerService class. 60/18560/2
Alexis de Talhouët [Fri, 17 Apr 2015 18:46:27 +0000 (14:46 -0400)]
Add JUnit testing for LoadBalancerService class.

Change-Id: I18fb554389d4baa05e0f58a538243cdaa456cc5a
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for L2FowardingService class. 54/18554/4
Alexis de Talhouët [Fri, 17 Apr 2015 17:18:09 +0000 (13:18 -0400)]
Add JUnit testing for L2FowardingService class.

Change-Id: I1d7b565f1cfa81b78423827d277e8cd5929dd51a
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for L2RewriteService class. 62/18562/3
Alexis de Talhouët [Fri, 17 Apr 2015 19:08:38 +0000 (15:08 -0400)]
Add JUnit testing for L2RewriteService class.

Change-Id: I902ce652c3edb0857cca697ead04a9ffd475db67
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoRemove .../distribution/opendaylight-karaf/. It is now .../karaf 66/18566/1
Flavio Fernandes [Fri, 17 Apr 2015 20:44:46 +0000 (16:44 -0400)]
Remove .../distribution/opendaylight-karaf/. It is now .../karaf

Change-Id: I7287ac40e9a2cfc25e3551662cde4a32bf0b88e8
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoMerge "Move ovsdb distribution to use karaf-parent"
Sam Hague [Fri, 17 Apr 2015 20:20:25 +0000 (20:20 +0000)]
Merge "Move ovsdb distribution to use karaf-parent"

9 years agoMove ovsdb distribution to use karaf-parent 64/18564/1
Sam Hague [Fri, 17 Apr 2015 19:31:27 +0000 (15:31 -0400)]
Move ovsdb distribution to use karaf-parent

Change-Id: Ief6939eb8f1cc15f1042ecc1fd7e549c60de57cc
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Add JUnit testing for OutboundNatService class."
Flavio Fernandes [Fri, 17 Apr 2015 18:43:07 +0000 (18:43 +0000)]
Merge "Add JUnit testing for OutboundNatService class."

9 years agoMerge "Add JUnit testing for L3FowardingService class."
Flavio Fernandes [Fri, 17 Apr 2015 18:42:58 +0000 (18:42 +0000)]
Merge "Add JUnit testing for L3FowardingService class."

9 years agoMerge "Add JUnit testing for EgressAclService class."
Flavio Fernandes [Fri, 17 Apr 2015 18:42:17 +0000 (18:42 +0000)]
Merge "Add JUnit testing for EgressAclService class."

9 years agoMerge "Add JUnit testing for RoutingService class."
Flavio Fernandes [Fri, 17 Apr 2015 18:40:36 +0000 (18:40 +0000)]
Merge "Add JUnit testing for RoutingService class."

9 years agoMerge "Fix for TerminationPointCreateCommand to insert a termination point, if not...
Flavio Fernandes [Fri, 17 Apr 2015 18:40:11 +0000 (18:40 +0000)]
Merge "Fix for TerminationPointCreateCommand to insert a termination point, if not present already in operational store"

9 years agoMerge "Workaround for busted controller opendaylight-karaf-empty"
Flavio Fernandes [Fri, 17 Apr 2015 18:38:47 +0000 (18:38 +0000)]
Merge "Workaround for busted controller opendaylight-karaf-empty"

9 years agoAdd JUnit testing for L3FowardingService class. 57/18557/1
Alexis de Talhouët [Fri, 17 Apr 2015 17:50:51 +0000 (13:50 -0400)]
Add JUnit testing for L3FowardingService class.

Change-Id: Icb067fabb217511a5aca155f668b492d0d823ae5
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for OutboundNatService class. 56/18556/1
Alexis de Talhouët [Fri, 17 Apr 2015 17:44:02 +0000 (13:44 -0400)]
Add JUnit testing for OutboundNatService class.

Change-Id: Ic3da229c61af4a412ab9031d735c1f5a5fb1cc2f
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for RoutingService class. 55/18555/2
Alexis de Talhouët [Fri, 17 Apr 2015 17:32:10 +0000 (13:32 -0400)]
Add JUnit testing for RoutingService class.

Change-Id: Ie40d1009a840f646260c676b5338088d926b73bc
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoWorkaround for busted controller opendaylight-karaf-empty 51/18551/2
Sam Hague [Fri, 17 Apr 2015 16:33:42 +0000 (12:33 -0400)]
Workaround for busted controller opendaylight-karaf-empty

Somehow the controller opendaylight-karaf-empty is busted with all the recent karaf 3.0.3 migration. Luckily we will a local distribution that doesn't seem to have the same issues.

Change-Id: I8f90981ba684dd68c17cadf6513ef4046a5b9cfb
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoFix for TerminationPointCreateCommand to insert a termination point, if not present... 49/18549/2
Prateek Garg [Fri, 17 Apr 2015 14:06:48 +0000 (07:06 -0700)]
Fix for TerminationPointCreateCommand to insert a termination point, if not present already in operational store

Change-Id: I8ed209033986d8338cc65589d8f497a152dd2011
Signed-off-by: Prateek Garg <prategar@cisco.com>
9 years agoAdd JUnit testing for EgressAclService class. 43/18543/2
Alexis de Talhouët [Fri, 17 Apr 2015 13:57:17 +0000 (09:57 -0400)]
Add JUnit testing for EgressAclService class.

Change-Id: I9e2e0e6174a381c4a49bb667c33ec1a593dc597a
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoAdd JUnit testing for InboundNatService class. 44/18544/2
Alexis de Talhouët [Fri, 17 Apr 2015 14:21:51 +0000 (10:21 -0400)]
Add JUnit testing for InboundNatService class.

Change-Id: Ia2a80aa73c7cabcfe91acb1fa1ab3f6718f08ca0
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoMerge changes Ifb9ee4a4,Id0a7512b
Flavio Fernandes [Fri, 17 Apr 2015 13:48:38 +0000 (13:48 +0000)]
Merge changes Ifb9ee4a4,Id0a7512b

* changes:
  Correct spelling of getBrideTermiationPoint()
  Add bridge integration test

9 years agoCorrect spelling of getBrideTermiationPoint() 37/18537/1
Sam Hague [Fri, 17 Apr 2015 12:27:11 +0000 (08:27 -0400)]
Correct spelling of getBrideTermiationPoint()

Change-Id: Ifb9ee4a4793a57a854f685cd0afce79d1ca96d2f
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Add Unit Tests for openstack.net-virt-providers.openflow13 - FlowCapableNodeDa...
Sam Hague [Fri, 17 Apr 2015 12:22:55 +0000 (12:22 +0000)]
Merge "Add Unit Tests for openstack.net-virt-providers.openflow13 - FlowCapableNodeDataChangeListener.java and MdsalConsumerImpl.java"

9 years agoMerge "Add JUnit testing for ArpResponderService class."
Sam Hague [Fri, 17 Apr 2015 12:21:26 +0000 (12:21 +0000)]
Merge "Add JUnit testing for ArpResponderService class."

9 years agoAdd bridge integration test 35/18535/1
Sam Hague [Fri, 17 Apr 2015 11:36:16 +0000 (07:36 -0400)]
Add bridge integration test

Change-Id: Id0a7512bc4fb08c6bec4533eb35447cf4ba57be1
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd Unit Tests for openstack.net-virt-providers.openflow13 - FlowCapableNodeDataChang... 04/18504/1
Ben Eze [Fri, 17 Apr 2015 02:05:45 +0000 (22:05 -0400)]
Add Unit Tests for openstack.net-virt-providers.openflow13 - FlowCapableNodeDataChangeListener.java and MdsalConsumerImpl.java

Change-Id: Icc614719be95e5b945a2bb686d509712a956c703
Signed-off-by: Ben Eze <beze@inocybe.ca>
9 years agoMerge "Add OpenFlow ID to ovsdb-bridge-attributes."
Flavio Fernandes [Thu, 16 Apr 2015 23:42:59 +0000 (23:42 +0000)]
Merge "Add OpenFlow ID to ovsdb-bridge-attributes."

9 years agoMerge "BUG 3005: WORKAROUND issue where match cannot differ only on extensions portion"
Flavio Fernandes [Thu, 16 Apr 2015 23:42:10 +0000 (23:42 +0000)]
Merge "BUG 3005: WORKAROUND issue where match cannot differ only on extensions portion"

9 years agoMerge "Add JUnit testing for ClassifierService class."
Flavio Fernandes [Thu, 16 Apr 2015 23:41:45 +0000 (23:41 +0000)]
Merge "Add JUnit testing for ClassifierService class."

9 years agoMerge "Update gogo versions to account for new karaf 3.0.3 constraints"
Flavio Fernandes [Thu, 16 Apr 2015 23:40:53 +0000 (23:40 +0000)]
Merge "Update gogo versions to account for new karaf 3.0.3 constraints"

9 years agoUpdate gogo versions to account for new karaf 3.0.3 constraints 33/18433/3
Sam Hague [Thu, 16 Apr 2015 13:46:03 +0000 (09:46 -0400)]
Update gogo versions to account for new karaf 3.0.3 constraints

Change-Id: Id062a95990a903873ab4b1f06408889f786f50fb
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd JUnit testing for ClassifierService class. 71/18471/1
Alexis de Talhouët [Thu, 16 Apr 2015 19:11:05 +0000 (15:11 -0400)]
Add JUnit testing for ClassifierService class.

Change-Id: I4f00ae666cc28ad3d438f879da4b5780c2b1ab7c
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoBUG 3005: WORKAROUND issue where match cannot differ only on extensions portion 63/18463/2
Flavio Fernandes [Thu, 16 Apr 2015 17:40:52 +0000 (13:40 -0400)]
BUG 3005: WORKAROUND issue where match cannot differ only on extensions portion

The details on the original issue were discovered by Anil Vishnoi:

BUG-2757 : Openflowplugin manager doesn't use match extensions while comparing two flows
Ovsdb installs two flows which is different from each other just by the match extension (reg0) (actions are not used in comparison).

cookie=0x0, duration=255.353s, table=110, n_packets=8, n_bytes=648, priority=16384,reg0=0x1,tun_id=0x1,dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=output:1,output:2
cookie=0x0, duration=256.115s, table=110, n_packets=9, n_bytes=1464, priority=16384,reg0=0x2,tun_id=0x1,dl_dst=01:00:00:00:00:00/01:00:00:00:00:00 actions=output:1

So statistics manager assign the same id internally to both the flows and that's causing the repeated error message about duplicate id.
Adding match extension in flow comparison is not trivial and we cannot implement it in this release.

Change-Id: I9d9986628fcb4996a7b7aac7af327df59201904a
Also-By: Anil Vishnoi <vishnoianil@gmail.com>
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoAdd JUnit testing for ArpResponderService class. 49/18449/2
Alexis de Talhouët [Thu, 16 Apr 2015 15:52:27 +0000 (11:52 -0400)]
Add JUnit testing for ArpResponderService class.

Change-Id: Id4509b10ca30250c83ce588ed41016b920fa0afd
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoCleanup sb it 88/18388/1
Sam Hague [Thu, 16 Apr 2015 01:32:26 +0000 (21:32 -0400)]
Cleanup sb it

- Removed duplicated tests
- Added options to modify logging
- Added options to add extra features to load

Change-Id: I52b68e5e35b5b7b3a52da89941410d344f654ba5
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoCleanup some logging in sb. 87/18387/1
Sam Hague [Thu, 16 Apr 2015 01:11:31 +0000 (21:11 -0400)]
Cleanup some logging in sb.

Change-Id: I0dfd06163bce69e863cec2804662350cc4c44b42
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoFix for not finding client(key) 79/18379/1
Sam Hague [Wed, 15 Apr 2015 22:36:29 +0000 (18:36 -0400)]
Fix for not finding client(key)

The connectioninfo brought in using the connectioninfo as the key for the clients. The application using the sb only have access to the remote ip and port so the key didn't match if it was using the remote ip:port and local ip:port.

Change-Id: If61faac9bb2be571c08faa95f3beb5190499a54b
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Add IT for getting Open_vSwitch other_config:local_ip"
Sam Hague [Wed, 15 Apr 2015 20:25:30 +0000 (20:25 +0000)]
Merge "Add IT for getting Open_vSwitch other_config:local_ip"

9 years agoMerge "Add constant class for shared strings in SouthboundIT"
Sam Hague [Wed, 15 Apr 2015 20:25:23 +0000 (20:25 +0000)]
Merge "Add constant class for shared strings in SouthboundIT"

9 years agoAdd IT for getting Open_vSwitch other_config:local_ip 66/18366/5
Sam Hague [Wed, 15 Apr 2015 18:02:22 +0000 (14:02 -0400)]
Add IT for getting Open_vSwitch other_config:local_ip

Patchset 5: Rebase woes

Change-Id: If713ef7401cb56e571b12741dbd7a5d30d08e042
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd constant class for shared strings in SouthboundIT 65/18365/5
Sam Hague [Wed, 15 Apr 2015 17:59:22 +0000 (13:59 -0400)]
Add constant class for shared strings in SouthboundIT

patchset 3: fix checkstyle error

Change-Id: If0c4441848ccf7e002f1bf43a6186465431c7d8a
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Adding Unit Tests for netvirt/providers/openflow13/PipelineOrchestratorImpl"
Flavio Fernandes [Wed, 15 Apr 2015 19:34:01 +0000 (19:34 +0000)]
Merge "Adding  Unit Tests for netvirt/providers/openflow13/PipelineOrchestratorImpl"

9 years agoAdd OpenFlow ID to ovsdb-bridge-attributes. 92/18292/7
Alexis de Talhouët [Tue, 14 Apr 2015 20:59:07 +0000 (16:59 -0400)]
Add OpenFlow ID to ovsdb-bridge-attributes.

Change-Id: I93e26ab56f2d6b543012f4a494f6bcfff5c0e156
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoReturn correct ovs_version 54/18354/2
Sam Hague [Wed, 15 Apr 2015 14:44:05 +0000 (10:44 -0400)]
Return correct ovs_version

The existing code was reading the table version uuid instead of the ovs-version row of the Open_vSwitch table.

Change-Id: I5f5a5a13d26c718a95a7c16c7420e831f72f0bdf
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoAdd schema db_version to ovsdb model. 52/18352/2
Sam Hague [Wed, 15 Apr 2015 14:27:38 +0000 (10:27 -0400)]
Add schema db_version to ovsdb model.

Change-Id: I3b5e61c98137b869744f5bb98861cf95440dc080
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoCheck for null OVsdbNodeAugmentation 48/18348/2
Sam Hague [Wed, 15 Apr 2015 13:38:35 +0000 (09:38 -0400)]
Check for null OVsdbNodeAugmentation

While testing I found cases where the OvsdbNodeAugmentation was not found. Added this warning log to be clear about the issue.

Change-Id: I4f29581b9bcbdc6c8c33484bdb4166bbfe898f9f
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoTemporary workaround to get jenkins jobs working 57/18357/1
Sam Hague [Wed, 15 Apr 2015 15:14:21 +0000 (11:14 -0400)]
Temporary workaround to get jenkins jobs working

The ovsdb distribution build is failing because of missing artifacts. It looks like those projects are not pushing artifacts to nexus for some reason.

This temporary workaround simply does not build the ovsdb karaf distribution.

Change-Id: I5a59ab05cca9c3af43daf1822adbe6a3e3118bd3
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoMerge "Added model for is-connected on controller attributes."
Sam Hague [Wed, 15 Apr 2015 08:52:44 +0000 (08:52 +0000)]
Merge "Added model for is-connected on controller attributes."

9 years agoAdded model for is-connected on controller attributes. 95/18295/1
Gabriel Robitaille-Montpetit [Tue, 14 Apr 2015 21:24:06 +0000 (17:24 -0400)]
Added model for is-connected on controller attributes.

Change-Id: I07859c1a8246b143bc31967c808fef23a38e7f61
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
9 years agoAdd JUnit testing for AbstractServiceInstance class. 85/18285/1
Alexis de Talhouët [Tue, 14 Apr 2015 18:13:06 +0000 (14:13 -0400)]
Add JUnit testing for AbstractServiceInstance class.

Change-Id: I5555f90a4a25ecdc4482be3ea41969d5c67d3bb2
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agonet-virt.providers: Add Mockito and PowerMockito dependencies for unit test purposes... 15/18215/6
Alexis de Talhouët [Mon, 13 Apr 2015 19:30:29 +0000 (15:30 -0400)]
net-virt.providers: Add Mockito and PowerMockito dependencies for unit test purposes to the pom file

Change-Id: I67c10c83a339bfc61ca11273a96b7c6beec3bc84
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
9 years agoFix Southbound-IT with ConnectionInfo class. 78/18278/3
Gabriel Robitaille-Montpetit [Tue, 14 Apr 2015 16:09:30 +0000 (12:09 -0400)]
Fix Southbound-IT with ConnectionInfo class.

Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
Change-Id: I9d212312988e377899d3bb0ad6c843d15556815f

9 years agoAdding Unit Tests for netvirt/providers/openflow13/PipelineOrchestratorImpl 86/18286/1
Ben Eze [Tue, 14 Apr 2015 15:21:26 +0000 (11:21 -0400)]
Adding  Unit Tests for netvirt/providers/openflow13/PipelineOrchestratorImpl

Change-Id: Ie1bd6844ec64171a7d338bab495b010a31cf8420
Signed-off-by: beze <beze@inocybe.ca>
9 years agoMerge "Remove unused service interfaces"
Sam Hague [Tue, 14 Apr 2015 15:08:22 +0000 (15:08 +0000)]
Merge "Remove unused service interfaces"

9 years agoMerge "Do not send bridge name in update"
Sam Hague [Tue, 14 Apr 2015 15:05:02 +0000 (15:05 +0000)]
Merge "Do not send bridge name in update"

9 years agoMerge "Deprecated OvsdbClientKey and replaced with ConnectionInfo"
Sam Hague [Tue, 14 Apr 2015 15:04:56 +0000 (15:04 +0000)]
Merge "Deprecated OvsdbClientKey and replaced with ConnectionInfo"

9 years agoMerge "Hook southbound integration in normal build process"
Sam Hague [Tue, 14 Apr 2015 15:02:39 +0000 (15:02 +0000)]
Merge "Hook southbound integration in normal build process"

9 years agoDo not send bridge name in update 36/18236/1
Ed Warnicke [Tue, 14 Apr 2015 05:00:32 +0000 (22:00 -0700)]
Do not send bridge name in update

It turns out...bridge name is immutable and OVSDB really doesn't
like it when you send it.

Change-Id: I8d8b16fe728ea4a386ca481624643dc260d01f29
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoDeprecated OvsdbClientKey and replaced with ConnectionInfo 32/18232/2
Ed Warnicke [Tue, 14 Apr 2015 01:31:33 +0000 (18:31 -0700)]
Deprecated OvsdbClientKey and replaced with ConnectionInfo

Since ConnectionInfo is basically the same info only better.

Change-Id: Icbf8a8946f26ffd971b006595a6933e9ddf020ab
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoIntroducing ConnectionInfo 29/18229/1
Ed Warnicke [Mon, 13 Apr 2015 23:38:50 +0000 (16:38 -0700)]
Introducing ConnectionInfo

Added a ConnectionInfo with remote/local ip/port to
the model.

Change-Id: I77fc3d8f9efbce0a07fc8106ec0487eeca4e09e6
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoRemove unused service interfaces 22/18222/2
Sam Hague [Mon, 13 Apr 2015 22:16:35 +0000 (18:16 -0400)]
Remove unused service interfaces

There are various places where dependency injection is used to get service interfaces. The ones removed in this patch were unsused. This will make it easier to implement the southbound equivalent of the services since these removed ones can be ignored.

Patch set 2: Modify unit tests verify clauses to not expect certain methods to have been called.

Change-Id: I2fd815d92631039a7dc923bf35c3aa863d19e47a
Signed-off-by: Sam Hague <shague@redhat.com>
9 years agoHook southbound integration in normal build process 91/18191/2
Anil Vishnoi [Mon, 13 Apr 2015 12:57:47 +0000 (18:27 +0530)]
Hook southbound integration in normal build process

Integration test won't be triggered with normal verify build.
-Pintegrationtest option will be required to trigger the integration build.

Change-Id: I49b62f945f5707befa95b8470918b40841c729e6
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
9 years agoMerge "Renamed BridgeCreateCommand to BridgeUpdateCommand"
Sam Hague [Mon, 13 Apr 2015 18:08:03 +0000 (18:08 +0000)]
Merge "Renamed BridgeCreateCommand to BridgeUpdateCommand"

9 years agoMerge "BridgeCreateCommand now correctly handles updates."
Sam Hague [Mon, 13 Apr 2015 18:07:56 +0000 (18:07 +0000)]
Merge "BridgeCreateCommand now correctly handles updates."

9 years agoMerge "Cleaned up BridgeCreateCommand"
Sam Hague [Mon, 13 Apr 2015 18:07:49 +0000 (18:07 +0000)]
Merge "Cleaned up BridgeCreateCommand"

9 years agoMerge "Fix latent NPE issues."
Sam Hague [Mon, 13 Apr 2015 18:07:43 +0000 (18:07 +0000)]
Merge "Fix latent NPE issues."

9 years agoMerge "Break out Protocol Update and Remove into seperate commands"
Sam Hague [Mon, 13 Apr 2015 18:07:35 +0000 (18:07 +0000)]
Merge "Break out Protocol Update and Remove into seperate commands"

9 years agoMerge "Fix so that operational store correctly removes bridge-other-configs"
Sam Hague [Mon, 13 Apr 2015 18:07:27 +0000 (18:07 +0000)]
Merge "Fix so that operational store correctly removes bridge-other-configs"

9 years agoMerge "Fix so that operational store correctly removes bridge-external-ids"
Sam Hague [Mon, 13 Apr 2015 18:07:21 +0000 (18:07 +0000)]
Merge "Fix so that operational store correctly removes bridge-external-ids"

9 years agoMerge "Fix so that operational store correctly removes protocol entries"
Sam Hague [Mon, 13 Apr 2015 18:07:13 +0000 (18:07 +0000)]
Merge "Fix so that operational store correctly removes protocol entries"

9 years agoMerge "Fix so that operational store correctly removes controller entries"
Sam Hague [Mon, 13 Apr 2015 18:06:48 +0000 (18:06 +0000)]
Merge "Fix so that operational store correctly removes controller entries"

9 years agoRenamed BridgeCreateCommand to BridgeUpdateCommand 71/18171/4
Ed Warnicke [Sun, 12 Apr 2015 19:44:52 +0000 (12:44 -0700)]
Renamed BridgeCreateCommand to BridgeUpdateCommand

As it now handles Update as well as simple create.

Change-Id: I6fb1db60cbce5553a7a5350e34cb8119d28de736
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBridgeCreateCommand now correctly handles updates. 70/18170/3
Ed Warnicke [Sun, 12 Apr 2015 19:42:45 +0000 (12:42 -0700)]
BridgeCreateCommand now correctly handles updates.

Change-Id: I7ee6907b81174d732aadc0fa1b10ea44f1544f9c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoCleaned up BridgeCreateCommand 60/18160/4
Ed Warnicke [Sun, 12 Apr 2015 03:18:52 +0000 (20:18 -0700)]
Cleaned up BridgeCreateCommand

Inspired by the good work of  Ryan Goulding in these patches:
https://git.opendaylight.org/gerrit/#/c/18135/
https://git.opendaylight.org/gerrit/#/c/18138/

I cleaned up BridgeCreateCommand... because I was getting lost
in there ;)

Change-Id: Ia4b4e95f99749e75a038cd8062ad74b790598179
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix latent NPE issues. 59/18159/3
Ed Warnicke [Sun, 12 Apr 2015 02:37:12 +0000 (19:37 -0700)]
Fix latent NPE issues.

I didn't trip on these, but I tripped on their analog with
protocols... so fixing them here.

Change-Id: I23bf647988bade95d66a8c9ecbf7bd32b7980ce1
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBreak out Protocol Update and Remove into seperate commands 58/18158/3
Ed Warnicke [Sun, 12 Apr 2015 02:29:32 +0000 (19:29 -0700)]
Break out Protocol Update and Remove into seperate commands

In addition, they now have the necessary logic to handle
Updates as well as Creates.

Change-Id: Id19e51a7e8951123d3b08c510a61cbef84328c9d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix so that operational store correctly removes bridge-other-configs 56/18156/4
Ed Warnicke [Sun, 12 Apr 2015 00:06:02 +0000 (17:06 -0700)]
Fix so that operational store correctly removes bridge-other-configs

Before, if a bridge-other-configs entry was removed on ovsdb, we didn't
remove it from the operational store.

This is an artifact of using *merge* rather than *put*.
Using merge is *still* a good idea for us, but what was happening
was basically this.

Say we got a report in the operational store of

[bridge-other-configs1, bridge-other-configs2]

which we dutifully merged.

Then we got a report of
[bridge-other-configs2]

when that is *merged*... the protocol1 entry is left dangling,
because its a *merge*.  To compensate, we have to be *very*
specific about wanting to remove bridge-other-configs1.

Change-Id: Ic94b67b341bf7233c881e324f494c6701b622131
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix so that operational store correctly removes bridge-external-ids 55/18155/5
Ed Warnicke [Sat, 11 Apr 2015 23:33:31 +0000 (16:33 -0700)]
Fix so that operational store correctly removes bridge-external-ids

Before, if a bridge-external-ids entry was removed on ovsdb, we didn't
remove it from the operational store.

This is an artifact of using *merge* rather than *put*.
Using merge is *still* a good idea for us, but what was happening
was basically this.

Say we got a report in the operational store of

[bridge-external-ids1, bridge-external-ids2]

which we dutifully merged.

Then we got a report of
[bridge-external-ids2]

when that is *merged*... the protocol1 entry is left dangling,
because its a *merge*.  To compensate, we have to be *very*
specific about wanting to remove bridge-external-ids1.

Change-Id: I7bb7e3264176604f3a01f90231cae99026148f2f
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix so that operational store correctly removes protocol entries 54/18154/5
Ed Warnicke [Sat, 11 Apr 2015 23:04:19 +0000 (16:04 -0700)]
Fix so that operational store correctly removes protocol entries

    Before, if a protocol entry was removed on ovsdb, we didn't
    remove it from the operational store.

    This is an artifact of using *merge* rather than *put*.
    Using merge is *still* a good idea for us, but what was happening
    was basically this.

    Say we got a report in the operational store of

    [protocol1, protocol1]

    which we dutifully merged.

    Then we got a report of
    [protocol2]

    when that is *merged*... the protocol1 entry is left dangling,
    because its a *merge*.  To compensate, we have to be *very*
    specific about wanting to remove protocol1.

Change-Id: I17f8b9b26cea4e894d74b534335dc55f0097d8c8
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoFix so that operational store correctly removes controller entries 52/18152/6
Ed Warnicke [Sat, 11 Apr 2015 22:13:25 +0000 (15:13 -0700)]
Fix so that operational store correctly removes controller entries

Before, if a controller entry was removed on ovsdb, we didn't
remove it from the operational store.

This is an artifact of using *merge* rather than *put*.
Using merge is *still* a good idea for us, but what was happening
was basically this.

Say we got a report in the operational store of

[controller1, controller2]

which we dutifully merged.

Then we got a report of
[controller2]

when that is *merged*... the controller1 entry is left dangling,
because its a *merge*.  To compensate, we have to be *very*
specific about wanting to remove controller1.

This is accomplished by factoring out an OvsdbControllerUpdateCommand
and OvsdbControllerRemoveCommand.

Change-Id: I2e38e0e175cef5f848f28501cfaeecc1cb162151
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoOvsdbPortUpdateCommand actually add entries to tplist 86/18186/1
Ryan Goulding [Mon, 13 Apr 2015 10:58:58 +0000 (06:58 -0400)]
OvsdbPortUpdateCommand actually add entries to tplist

Missed a step in refactoring;  adding here.

Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
9 years agoMerge "Cleaned up OvsdbBridgeUpdateCommand"
Sam Hague [Mon, 13 Apr 2015 00:38:50 +0000 (00:38 +0000)]
Merge "Cleaned up OvsdbBridgeUpdateCommand"

9 years agoClean up TerminationPointCreateCommand.java 38/18138/3
Ryan Goulding [Fri, 10 Apr 2015 22:22:11 +0000 (18:22 -0400)]
Clean up TerminationPointCreateCommand.java

This change abstracts the different steps involved in the
TerminationPointCreateCommand.execute() method so that the code is more
readable. The individual steps have been put into appropriate private helper
methods.

Change-Id: I65f0c8bc5da3a2509f42479a57fd0392c14baa5f
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
9 years agoCleaned up OvsdbBridgeUpdateCommand 49/18149/3
Ed Warnicke [Sat, 11 Apr 2015 20:32:59 +0000 (13:32 -0700)]
Cleaned up OvsdbBridgeUpdateCommand

Inspired by the good work of  Ryan Goulding in these patches:
https://git.opendaylight.org/gerrit/#/c/18135/
https://git.opendaylight.org/gerrit/#/c/18138/

I cleaned up OvsdbBridgeUpdateCommand... because I was getting lost
in there ;)

Change-Id: Id7dafa333978031815dc5072fb2c02d1dd1cc75c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoClean up OvsdbPortUpdateCommand.java 35/18135/4
Ryan Goulding [Fri, 10 Apr 2015 20:26:15 +0000 (16:26 -0400)]
Clean up OvsdbPortUpdateCommand.java

This change abstracts the different steps involved in the
OvsdbPortUpdateCommand.execute() method so that the code is more readable. The
individual steps have been put into the appropriate private helper methods.

Change-Id: Ifacdc0fe44f0555da690ca1c306b0462d34bc24e
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>