netvirt.git
8 years agoUse odlparent checkstyle
Sam Hague [Mon, 28 Sep 2015 21:21:34 +0000 (17:21 -0400)]
Use odlparent checkstyle

Patch set 2: Remove ovsdb_checks.xml from parent pom
Patch set 3: Remove ovsdb_checks.xml from directory
Patch set 4: Add hwvtepsouthbound

Change-Id: Iccc680728e19967f9977453bb75c9c64b1a53e0c
Signed-off-by: Sam Hague <shague@redhat.com>
8 years agoMerge "Fix sonar integration test reporting"
Sam Hague [Sat, 3 Oct 2015 23:09:00 +0000 (23:09 +0000)]
Merge "Fix sonar integration test reporting"

8 years agoFix sonar integration test reporting
Sam Hague [Sat, 3 Oct 2015 01:20:10 +0000 (21:20 -0400)]
Fix sonar integration test reporting

Change-Id: Icb238c6442a8d15ae144d6e9abbaabf9fd011570
Signed-off-by: Sam Hague <shague@redhat.com>
8 years agoAdded postman collection and postman environment
Anil Vishnoi [Sat, 3 Oct 2015 01:33:33 +0000 (07:03 +0530)]
Added postman collection and postman environment
files for Southbound plugin to test in Single and 3 Node cluster environment

Change-Id: I144801f0200d607013b3fa839cabf1de7c3bf1d0
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoMerge topic/master/clustering to master branch
Anil Vishnoi [Fri, 2 Oct 2015 17:08:10 +0000 (22:38 +0530)]
Merge topic/master/clustering to master branch
Squashed commit of the following:

commit e9e3a762ee75844b930d8251f44d2718a3358445
Merge: 2adbc25 83cfd5b
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Oct 2 19:54:23 2015 +0530

    Merge branch 'master' into topic/master/clustering

    Change-Id: I3c26c3f4095b78d869cae271b01fa1ab2609cf89
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 2adbc25b474d46f394e8f956c818383425570600
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Oct 2 07:22:44 2015 +0530

    Addressed following issuses:
    1) Fixed entity unregisteration
    2) Implemented logic for southbound provider to participate
    in entityOwnership service, Southbound plugin instance as an entity
    This will avoid all the instances to do initiatize the operational
    and config topology, only master instance (who got ownership) will do that.
    3) Properly closing listener registration for OvsdbConnectionManager listerner.

    Change-Id: I73693b4faa8a6409c81c33647836516002b4b2fd
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 193f145796924c051b36c61974df4253e68efb7e
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Thu Oct 1 16:54:41 2015 +0530

    Addressed following issues:
    1) Handled ownership change notifications for the device that is not registered by the instance.
    2) If there is no owner of the device hasOwner=false, then clean up the operational data store,
    3) For switch initiated connections, generate iid by fetching the openvswtich table row from the device.

    Change-Id: I03158a616e7c020ce8f851b8251e4162f38ba622
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit c26d79561555c23f4aec894418537cf059a1f85a
Merge: 740d21a 7848a77
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Thu Oct 1 14:42:00 2015 -0400

    Merge branch 'master' into topic/master/clustering

    Change-Id: I191e71030d6523a3d7a11765010cc1b81b9405f3
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 740d21afacb5a652a3a1d78ceff2c0d998492add
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Wed Sep 30 02:15:26 2015 +0530

    Fixed iid issue for switch initiated connections
    and refactored the code a bit

    Patch 2:Fixed unit tests.
    Conflicts:
     southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionInstance.java
     southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java

    Change-Id: I9f8adfba4a4f866d423503b24f400c40bd43131b
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 9079eb260e123c00625dc13e63a6f55d9bc42aea
Merge: b203967 0179232
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Tue Sep 29 12:58:54 2015 -0400

    Merge branch 'master' into topic/master/clustering

    Change-Id: I02c771238cd7447dbaa326516467259516868aa6
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit b203967504c1de8814c32e7c7c8015ebb749e154
Author: Sharad Mishra <sharad.d.mishra@intel.com>
Date:   Mon Sep 28 06:19:38 2015 -0700

    OVSDB cluster device ownership

    Only allow device owner to update device.
    Patch 2: Fixed unit test

    Change-Id: Id942a2ba16a83b19807e135a9b67f8a7eb7da003
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 218785ea03b74287de86395d1e57471ce02fe5e4
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Wed Sep 23 09:55:06 2015 -0400

    Use EntityOwnershipService to get ownership on the device.
    If ownership is granted then *this* instance of southbound
    plugin can perform actions to configure the device, rest
    two southbound plugin instanceses in the cluster will just
    hole the connection with them and won't do any operation
    of configuring the device or reading from the device.
    For controller initiated connections, all the southbound
    plugin instance will attempt to connect to the device and
    contest for ownership of the device and selected owner of
    the device will do CRUD operations. For switch initiated
    connection, only instance of southbound plugin that received
    connection from switch will contest for ownership.

    Change-Id: I349699ae0630e12bdbe18b6bd2588a651edd1f81
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit da209a4aad67400a3c938329fb393ec6f7e2439e
Merge: ec7827c 11c0865
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 29 00:44:50 2015 +0530

    Merge branch 'master' into topic/master/clustering

    Change-Id: I44ac4d66f731c0c0f56d746c563c6210eeceb978
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit ec7827c688340fa85c42942ba6559201da07286a
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Mon Sep 21 17:57:02 2015 -0400

    Add hasDeviceOwnership flag to OvsdbConnectionInstance

    Patch set 4: fix ut

    Change-Id: Id7da9071374938c16b086b0d67059aec0a7cc3a0
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 3cc32fd3d007b4c91dfbadee3920b9ae61a9283c
Author: Flavio Fernandes <ffernand@redhat.com>
Date:   Fri Sep 25 17:02:13 2015 -0400

    Set bridge controller(s) based on ovsdb node manager(s)

    Change-Id: I10bcc04aed78f874cbb8a7d9a82e59cf1b80ec82
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
commit 628749e43002c4aa9fc8bfdf7c827cba0532eb6b
Merge: 3d7ce06 360d519
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Sat Sep 26 01:27:28 2015 +0530

    Merge branch 'master' into topic/master/clustering

    Change-Id: I20e84a6971466357c6819c7dba5d51809f9b2878
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 3d7ce0660d25080dd1a5e3927eda6d071e085d12
Merge: 8a90856 708c8c3
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Fri Sep 25 06:07:23 2015 +0530

    Merge branch 'master' into topic/master/clustering

    Change-Id: I35038c6d7b2150d2efc9692a02d5e94bd97a8dba
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 8a908569f4e8e19e7f03f08f97d0704f9ca46cc9
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 22 01:52:42 2015 +0530

    Enable remote notification for southbound plugin

    (cherry picked from commit 01f0737be6abacaf56721731f6a19dcb13e291f0)

    Change-Id: Ida036244f3861e4d07437b49179bbf2851a212a5
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
commit 7747c272e6ad5f52ebcae97fd14e05762bc8f790
Author: Anil Vishnoi <vishnoianil@gmail.com>
Date:   Tue Sep 22 00:05:49 2015 +0530

    Wire entity ownership service to OVSDB southbound plugin

    Change-Id: I8baa3b31f9762c4b5656b399a1a7f705c1aed9c1
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Change-Id: Iec7a1c3055dac748c81b470a3d2286b42e32397e
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoMerge "Use the memorized service reference"
Sam Hague [Fri, 2 Oct 2015 13:10:04 +0000 (13:10 +0000)]
Merge "Use the memorized service reference"

8 years agoMerge "UT for SouthboundUtil.java"
Sam Hague [Fri, 2 Oct 2015 13:08:23 +0000 (13:08 +0000)]
Merge "UT for SouthboundUtil.java"

8 years agoMerge "Bug 4277 - Deleted Network flow entries retained in br-int, if network associa...
Sam Hague [Fri, 2 Oct 2015 13:07:05 +0000 (13:07 +0000)]
Merge "Bug 4277 - Deleted Network flow entries retained in br-int, if network associated and disassociated from virutalrouter interface"

8 years agoFuture-proof OvsdbTypesIdResolver
Stephen Kitt [Fri, 2 Oct 2015 09:37:39 +0000 (11:37 +0200)]
Future-proof OvsdbTypesIdResolver

Instead of implementing TypeIdResolver directly, the recommended
approach is to extend TypeIdResolverBase; this ensures that upgrading
Jackson won't cause sudden build failures because of methods added to
TypeIdResolver (TypeIdResolverBase provides an appropriate default
implementation).

Change-Id: I6be57cc22a54e46e9e07ff835f7ccf9feec14c8f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoBug 4277 - Deleted Network flow entries retained in br-int, if network associated...
ravi_sabapathy [Mon, 28 Sep 2015 07:31:48 +0000 (00:31 -0700)]
Bug 4277 - Deleted Network flow entries retained in br-int, if network associated and disassociated from virutalrouter interface

        Remove the mac cache after deleting the DHCP neutron port l3 flows

Patch set 2: Move all other caches updated in delete into cleanupRouterCache()

Change-Id: I0c29ba4976ddfd484415d851ad5a2df97d61b19a
Signed-off-by: ravi_sabapathy <ravi_sabapathy@dell.com>
8 years agoUT for SouthboundUtil.java
rpujar [Tue, 29 Sep 2015 20:40:56 +0000 (16:40 -0400)]
UT for SouthboundUtil.java

Change-Id: I87e3577ab2f262ec7f50b6c185a41f49b1e607ed
Signed-off-by: rpujar <rpujar@inocybe.com>
8 years agoMerge "Speed up SouthboundIT through multi-threading test cases"
Sam Hague [Thu, 1 Oct 2015 12:20:42 +0000 (12:20 +0000)]
Merge "Speed up SouthboundIT through multi-threading test cases"

8 years agoMerge "Add yang for hwvtep"
Sam Hague [Thu, 1 Oct 2015 12:15:35 +0000 (12:15 +0000)]
Merge "Add yang for hwvtep"

8 years agoUse the memorized service reference
Stephen Kitt [Mon, 28 Sep 2015 16:06:54 +0000 (18:06 +0200)]
Use the memorized service reference

Currently when dispatching "event handler added" events we retrieve
the appropriate service reference from the bundle context, but this
seems to cause problems when multiple services are registered for the
same interfaces. Since we know the service reference we got when
registering the service involved, we can just pass that.

As a result, ConfigInterface::setDependencies() doesn't need a
BundleContext at all, and since we're no longer supposed to pass that
around, we can just remove it altogether.

Some more debugging information should help track down other issues of
this type.

Change-Id: Iac54595aed388165711a7c4a3d86577646c59d4f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoLess restriction on shared networks: it can be allowed on externals
Flavio Fernandes [Tue, 29 Sep 2015 14:57:03 +0000 (10:57 -0400)]
Less restriction on shared networks: it can be allowed on externals

Change-Id: I0a66758731eb35a73623c6f663792b9dffbfec08
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
8 years agoMerge "Added model for QoS and Queue."
Sam Hague [Tue, 29 Sep 2015 10:56:19 +0000 (10:56 +0000)]
Merge "Added model for QoS and Queue."

8 years agoUse common profiles among ovsdb it bundles
Sam Hague [Fri, 25 Sep 2015 20:40:20 +0000 (16:40 -0400)]
Use common profiles among ovsdb it bundles

Change-Id: I2636a15eb821e1be7edbebcdeef9d94cb0d783be
Signed-off-by: Sam Hague <shague@redhat.com>
8 years agoMerge "Remove unused integrationtest"
Sam Hague [Mon, 28 Sep 2015 14:30:05 +0000 (14:30 +0000)]
Merge "Remove unused integrationtest"

8 years agoRemove unused integrationtest
Sam Hague [Fri, 25 Sep 2015 19:41:15 +0000 (15:41 -0400)]
Remove unused integrationtest

Also add missing dependencies in library

Change-Id: I120a20ffb76f8d18bb54b1b72a69e752922974e4
Signed-off-by: Sam Hague <shague@redhat.com>
8 years agoAdded model for QoS and Queue.
Gabriel Robitaille-Montpetit [Mon, 3 Aug 2015 23:11:04 +0000 (19:11 -0400)]
Added model for QoS and Queue.

Change-Id: I0d254ea9648dee2298a62523d6a10b64dcc88297
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
8 years agoMerge "Added Security Rule for Custom ICMP"
Sam Hague [Mon, 28 Sep 2015 12:51:01 +0000 (12:51 +0000)]
Merge "Added Security Rule for Custom ICMP"

8 years agoMerge "Remove unused northbound"
Flavio Fernandes [Fri, 25 Sep 2015 19:49:08 +0000 (19:49 +0000)]
Merge "Remove unused northbound"

8 years agoMerge "Controller initiated connections always connect to one manager listening in...
Sam Hague [Fri, 25 Sep 2015 19:48:28 +0000 (19:48 +0000)]
Merge "Controller initiated connections always connect to one manager listening in ptcp: mode. In clustered mode, all the three controller will connect to the device, and in case any of the connection will flip that instance will remove OvsdbNode from operational data store because it will see only one manager in manager list. But because switch is listening in passive mode, there can be multiple connection to same manager. To handle this scenario, this patch adds number_of_connection attribute to OvsdbNodeAugmentation to maintain the number of active connection to specific manager. In case of switch initiated connection this value is going to be 1 for each manager, but in case switch listening in passive mode, this value will represent active connections (extraced from Manager tables status column n_connections attributes)."

8 years agoMerge "Bug 3989 -- Fix the original patch. Original patch can break the functioning...
Flavio Fernandes [Fri, 25 Sep 2015 19:45:20 +0000 (19:45 +0000)]
Merge "Bug 3989 -- Fix the original patch. Original patch can break the functioning if there are more then one data change and the first data change is OvsdbNodeAugmentation for which connection already exist. It will return out of OnDataChanged() when it see that connection already exist, without processing rest of the data"

8 years agoMerge "Move OvsdbClient it under library-it"
Flavio Fernandes [Fri, 25 Sep 2015 19:31:30 +0000 (19:31 +0000)]
Merge "Move OvsdbClient it under library-it"

8 years agoBug 3989 -- Fix the original patch. Original patch can break
Anil Vishnoi [Fri, 25 Sep 2015 17:34:02 +0000 (23:04 +0530)]
Bug 3989 -- Fix the original patch. Original patch can break
the functioning if there are more then one data change and
the first data change is OvsdbNodeAugmentation for which connection
already exist. It will return out of OnDataChanged() when it see
that connection already exist, without processing rest of the
data

Change-Id: Icec9fdcc241fb9f1b823d73cbe2dfdd1f5c3def7
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoMove OvsdbClient it under library-it
Sam Hague [Fri, 25 Sep 2015 18:46:59 +0000 (14:46 -0400)]
Move OvsdbClient it under library-it

A following commit will remove the integrationtest dir. With this commit here there
are no longer any tests in integrationtest. They have all been moved into the respective
bundles.

Change-Id: I40e7dccd6e5ee7ea362d75a422610fbdfe5e55cc
Signed-off-by: Sam Hague <shague@redhat.com>
8 years agoController initiated connections always connect to one manager
Anil Vishnoi [Fri, 25 Sep 2015 04:19:01 +0000 (09:49 +0530)]
Controller initiated connections always connect to one manager
listening in ptcp: mode. In clustered mode, all the three controller
will connect to the device, and in case any of the connection will flip
that instance will remove OvsdbNode from operational data store because
it will see only one manager in manager list. But because switch is
listening in passive mode, there can be multiple connection to same manager.
To handle this scenario, this patch adds number_of_connection attribute
to OvsdbNodeAugmentation to maintain the number of active connection to
specific manager. In case of switch initiated connection this value is
going to be 1 for each manager, but in case switch listening in passive
mode, this value will represent active connections (extraced from
Manager tables status column n_connections attributes).

Change-Id: I910104a5109b5bed6af7786a7692c617bd4305b7
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoRemove unused northbound
Sam Hague [Fri, 25 Sep 2015 15:27:44 +0000 (11:27 -0400)]
Remove unused northbound

Change-Id: I8ac5ae92315d2558a7563a35bdd67c0d816ccc68
Signed-off-by: Sam Hague <shague@redhat.com>
8 years agoFix ovsdb node update in clustered environment
Anil Vishnoi [Wed, 23 Sep 2015 18:08:06 +0000 (23:38 +0530)]
Fix ovsdb node update in clustered environment
In cluster environment same switch can be connected to multiple
controller instance running southbound plugin. In the existing implementation
if device disconnect from any of the controller instances OVSDB-SB remove
OvsdbNode from operational data store. In cluster environment that will
break contract with customer, given that device is still connected to
atleast one of the two controller instances running. This patch modifying the
behavior where controller will see if its the only connected controller,
then it will delete the data from operational data store, else it will skip
any clean up from operational data store, because other instances will anyway
update about the disconnected controller manager entry in the managers list.

Change-Id: Iaa043f6632eb2de660b623604e8f8e0938dbc4d5
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
(cherry picked from commit 6051e15c6f929c08f152417b1f19373b10e93647)

8 years agoMerge "Remove unused mdsal-plugin-adapter code"
Anil Vishnoi [Fri, 25 Sep 2015 15:06:17 +0000 (15:06 +0000)]
Merge "Remove unused mdsal-plugin-adapter code"

8 years agoSpeed up SouthboundIT through multi-threading test cases
Ryan Goulding [Wed, 26 Aug 2015 18:25:37 +0000 (14:25 -0400)]
Speed up SouthboundIT through multi-threading test cases

This speeds up SouthboundIT without losing coverage through the use of parallel
test cases.  On my VM,ExecutorSer this reduced test time from ~12 to ~4.5 minutes.

Aggregates the testing work for certain test cases into corresponding
Runnables.  For each set of test input data, a Runnable is spawned and
submitted to a fixed thread pool.  The thread pool size may be altered
through the NUM_THREADS constant.  The default is 4 since raising this
number causes issues with MD-SAL.

These test cases can be multi-threaded because they each utilize a distinct
bridge.  In other words, each thread is manipulating a different bridge in the
operating system.

Change-Id: Icd8ca69171e996fbf4000ef632c9446bb6c89ed6
Signed-off-by: Ryan Goulding <ryandgoulding@gmail.com>
8 years agoRemove unused mdsal-plugin-adapter code
Sam Hague [Fri, 25 Sep 2015 14:08:18 +0000 (10:08 -0400)]
Remove unused mdsal-plugin-adapter code

Change-Id: I161b63c1c5b4cff39388d8342052920e245e3796
Signed-off-by: Sam Hague <shague@redhat.com>
8 years agoMerge "Mdsal utils bundle"
Flavio Fernandes [Fri, 25 Sep 2015 00:36:38 +0000 (00:36 +0000)]
Merge "Mdsal utils bundle"

8 years agoMerge "Initial pass at netvirt model"
Anil Vishnoi [Thu, 24 Sep 2015 16:32:26 +0000 (16:32 +0000)]
Merge "Initial pass at netvirt model"

8 years agoMdsal utils bundle
Sam Hague [Mon, 21 Sep 2015 01:45:11 +0000 (21:45 -0400)]
Mdsal utils bundle

Patch set 2: Renamed to MdsalUtils and matched the strucure of
the other bundles in the utils dir.

This commit adds a Mdsal utils bundle that has all the mdsal methods to read,
write, delete and merge to the datastore. This is so that other bundles can
reuse the same methods.

Change-Id: Ida83ed957f74155224b007b54e3e80bfb1e29a71
Signed-off-by: Sam Hague <shague@redhat.com>
8 years agoMerge "Added UT for OvsdbDataChangeListener.java"
Sam Hague [Thu, 24 Sep 2015 14:32:05 +0000 (14:32 +0000)]
Merge "Added UT for OvsdbDataChangeListener.java"

8 years agoAdded UT for OvsdbDataChangeListener.java
rpujar [Wed, 23 Sep 2015 15:39:48 +0000 (11:39 -0400)]
Added UT for OvsdbDataChangeListener.java

Also added code to test new method in OvsdbConnectionManager.java

Change-Id: I75faec2f20305c9ac806087042136d09d1048d49
Signed-off-by: rpujar <rpujar@inocybe.com>
8 years agoInitial pass at netvirt model
Sam Hague [Mon, 21 Sep 2015 01:43:59 +0000 (21:43 -0400)]
Initial pass at netvirt model

Patch set 2: Renamed netvirtmodel to net-virt-sfc.
Patch set 3: Add net-virt-sfc to the root pom so it is built

Change-Id: Ia8b21b538e38463e860148abb4bf055ae3020761
Signed-off-by: Sam Hague <shague@redhat.com>
8 years agoClean up dependencies and features
Stephen Kitt [Wed, 23 Sep 2015 16:24:32 +0000 (18:24 +0200)]
Clean up dependencies and features

Remove more plugin-related code.
Correct a couple of netconf dependencies.
Remove obsolete dependencies on controller features which are no
longer provided upstream.

Change-Id: Ia8f68200e997c11375414cd3071fe605b9025cd4
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoAdd YangInstanceIdentifer to InstanceIdentifier converter method
Anil Vishnoi [Wed, 23 Sep 2015 15:37:41 +0000 (21:07 +0530)]
Add YangInstanceIdentifer to InstanceIdentifier converter method

Change-Id: I540772d6461ccf9a281b738a3ba8d6601abffafb
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoFixed unit test testDisconnect in OvsdbConnectionmanagerTest
Anil Vishnoi [Wed, 23 Sep 2015 18:49:12 +0000 (00:19 +0530)]
Fixed unit test testDisconnect in OvsdbConnectionmanagerTest

Change-Id: I2b2eca244036dc7567c24e85a71bd968f04ac587
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoMerge "hwvtepsb: Fixed restconf migration build issues"
Anil Vishnoi [Wed, 23 Sep 2015 14:02:48 +0000 (14:02 +0000)]
Merge "hwvtepsb: Fixed restconf migration build issues"

8 years agohwvtepsb: Fixed restconf migration build issues
Vishal Thapar [Wed, 23 Sep 2015 12:34:51 +0000 (18:04 +0530)]
hwvtepsb: Fixed restconf migration build issues

restconf migration from controller to netconf was done while
hwvtep bundle creation was in progress, so those were not done
for hwvtepsouthbound which is causing build failure.

Change-Id: Ib32c591e0dd197730f1bc50d7e92b38018c0fd7f
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
8 years agoMerge "Unit Test for ovsdb southbound OvsdbConnectionManager.java"
Flavio Fernandes [Wed, 23 Sep 2015 12:15:39 +0000 (12:15 +0000)]
Merge "Unit Test for ovsdb southbound OvsdbConnectionManager.java"

8 years agoMerge "Added manager list to Ovsdb Node. For application southbound plugin only give...
Flavio Fernandes [Wed, 23 Sep 2015 12:15:07 +0000 (12:15 +0000)]
Merge "Added manager list to Ovsdb Node. For application southbound plugin only give a device level view and not a connection level view. To make net-virt cluster aware, it needs to the managers of the ovsdb server, so that when it creates ovs bridges, it can connect them to the same controllers through OF plugin"

8 years agoAdded manager list to Ovsdb Node.
Anil Vishnoi [Tue, 22 Sep 2015 22:06:50 +0000 (03:36 +0530)]
Added manager list to Ovsdb Node.
For application southbound plugin only give a device level view and not a connection level view.
To make net-virt cluster aware, it needs to the managers of the ovsdb server, so that
when it creates ovs bridges, it can connect them to the same controllers through OF plugin

Tests:
ovs-vsctl set-manager tcp:ip:6640
ovs-vsctl set-manager tcp:ip:6640 tcp:ip2:6640
ovs-vsctl set-manager tcp:ip:6640
ovs-vsctl del-manager

Change-Id: I8b68fef9583f4fbcc330a0e9fc239015851b3f7c
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoRemoving the old unused plugin and ovsdb-plugin-compatibility-layer
Anil Vishnoi [Wed, 19 Aug 2015 12:22:17 +0000 (17:52 +0530)]
Removing the old unused plugin and ovsdb-plugin-compatibility-layer
OVSDB stopped using these module in Lithium release. These modules were kept for VTN project, because they didn't had time to migrate
VTN component that relies on these module to MD-SAL.
We will merge this patch after one month on 19th Sep.

Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoFixed binding-parent groupId. It was causing build failure
Anil Vishnoi [Wed, 23 Sep 2015 01:40:21 +0000 (07:10 +0530)]
Fixed binding-parent groupId. It was causing build failure

Patch2: Fix library module to use odl-mdsal-models feature rather then deprecated odl-yangtools-models
Patch3: Fix hwvtep southbound module to use odl-mdsal-models feature as well. Also disable hwvtepsouthbound-karaf
 and hwvtepsouthbound-it features. They are causing the build break.

Change-Id: Ia2261af7f21fb4dbff2958a5e3a01283c4c43f23
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoMerge "Revert "Use the library config bundle in southbound""
Flavio Fernandes [Tue, 22 Sep 2015 17:09:02 +0000 (17:09 +0000)]
Merge "Revert "Use the library config bundle in southbound""

8 years agoRevert "Use the library config bundle in southbound"
Stephen Kitt [Tue, 22 Sep 2015 15:07:25 +0000 (15:07 +0000)]
Revert "Use the library config bundle in southbound"

This reverts commit c031f4be42abdbee58417a0c0af3ea14f74b2e95, which fails IT currently.

Change-Id: Ib1dd8daf9005fccc886ebaa6b831aa89cfa78597
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Use the library config bundle in southbound"
Sam Hague [Tue, 22 Sep 2015 11:36:53 +0000 (11:36 +0000)]
Merge "Use the library config bundle in southbound"

8 years agoUnit Test for ovsdb southbound OvsdbConnectionManager.java
rpujar [Wed, 16 Sep 2015 13:07:53 +0000 (09:07 -0400)]
Unit Test for ovsdb southbound OvsdbConnectionManager.java

Change-Id: I272d716e3d8b3df9bdaea5fc0009c809c8e25933
Signed-off-by: rpujar <rpujar@inocybe.com>
8 years agoAdd yang for hwvtep
Vishal Thapar [Tue, 14 Jul 2015 04:46:22 +0000 (10:16 +0530)]
Add yang for hwvtep

1. Addressed some review comments
2. Added some new fields
3. Moved file to hwvtepsouthbound-api
4. Fix for key mac-entry-key issue

Change-Id: I37945123170621dc8dacf187d2a47ff744fdceb5
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
8 years agoMerge "SecGroup: Handle cases when security group has empty rules"
Sam Hague [Thu, 17 Sep 2015 11:51:13 +0000 (11:51 +0000)]
Merge "SecGroup: Handle cases when security group has empty rules"

8 years agoBug 3989: clear the connection info
Stephen Kitt [Thu, 17 Sep 2015 10:01:38 +0000 (12:01 +0200)]
Bug 3989: clear the connection info

When disconnecting, we need to clear the connection info to avoid
thinking we're still connected later.

Add assertions in the southbound IT tests to make sure we don't
connect twice.

Change-Id: I778a2cb9ab957db02146f5a2b3a6658129ba7219
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoSecGroup: Handle cases when security group has empty rules
Flavio Fernandes [Thu, 17 Sep 2015 05:13:45 +0000 (01:13 -0400)]
SecGroup: Handle cases when security group has empty rules

Change-Id: I54ef43f6a4afd9fc571c8dcf9bf843007452c968
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
8 years agoMerge "Initial bundle creation for HWTEP SB"
Anil Vishnoi [Wed, 16 Sep 2015 17:11:06 +0000 (17:11 +0000)]
Merge "Initial bundle creation for HWTEP SB"

8 years agoMerge "A few cleanups"
Anil Vishnoi [Wed, 16 Sep 2015 12:57:31 +0000 (12:57 +0000)]
Merge "A few cleanups"

8 years agoDocument how to use Docker Compose
Stephen Kitt [Wed, 16 Sep 2015 09:14:03 +0000 (11:14 +0200)]
Document how to use Docker Compose

Fig has been obsoleted by Docker Compose. Some distributions have now
replaced Fig entirely (e.g. Fedora 22); this patch documents Docker
Compose as an alternative to Fig.

Change-Id: Ia33bb8633e7c2f039857b98ba96e9b8b343d0394
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoA few cleanups
Flavio Fernandes [Wed, 16 Sep 2015 06:19:35 +0000 (02:19 -0400)]
A few cleanups

* use plain String concatenation instead of StringBuilder where appropriate
* simplify single-use return variables
* <> operator
* avoid calling new String()

Change-Id: I56e99426daeda620a37059417588e5ee4fb99c76
Also-By: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
8 years agoMerge "Revert "Use single-argument form of firstKeyOf()""
Flavio Fernandes [Wed, 16 Sep 2015 05:44:10 +0000 (05:44 +0000)]
Merge "Revert "Use single-argument form of firstKeyOf()""

8 years agoRevert "Use single-argument form of firstKeyOf()"
Anil Vishnoi [Tue, 15 Sep 2015 22:58:34 +0000 (22:58 +0000)]
Revert "Use single-argument form of firstKeyOf()"

This reverts commit e19e4e3f10f65054aba16a94c082180f24b9beb6.

This is breaking the net-virt code. Bridges are not getting created when OVSDB server connects to the controller. Probably happening because of single argument firstKeyOf() method.

Change-Id: I76ab5f86f7329f741e30fd21eaed436391f793b8
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
8 years agoInitial bundle creation for HWTEP SB
Vishal Thapar [Tue, 1 Sep 2015 09:32:08 +0000 (15:02 +0530)]
Initial bundle creation for HWTEP SB

1. Creating initial bundles for hwvtep southbound using Startup Project
archetype.
2. Adds hwvtepsouthbound bundle and entry in ovsdb/pom.xml

PatchSet2:
1. Addressed review comments and added hwvtepsouthbound-it

PatchSet3:
1. Fixed IT failure.

PatchSet4:
Fixed minor issue in southbound/default-config.xml

Change-Id: Ib185c1a9a90b08dc84f64231b8fee414d1e209a0
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
8 years agoMerge "Use single-argument form of firstKeyOf()"
Flavio Fernandes [Tue, 15 Sep 2015 11:49:11 +0000 (11:49 +0000)]
Merge "Use single-argument form of firstKeyOf()"

8 years agoUse single-argument form of firstKeyOf()
Stephen Kitt [Tue, 15 Sep 2015 09:55:29 +0000 (11:55 +0200)]
Use single-argument form of firstKeyOf()

A few other clean-ups in the affected files:
* use plain String concatenation instead of StringBuilder where appropriate
* simplify single-use return variables
* <> operator
* avoid calling new String()

Change-Id: I3e1891509f21211c489cabb64868d78e4dddec10
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoDrop obsolete dependencies
Stephen Kitt [Mon, 14 Sep 2015 15:47:42 +0000 (17:47 +0200)]
Drop obsolete dependencies

commons.httpclient, containermanager.it.implementation and
protocol_plugins.stub are no longer built by controller, and
don't appear to be used in ovsdb.

Change-Id: I49f0afc0333368a1e660942e2cabd501c89126db
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoAdded Security Rule for Custom ICMP
sangeeta.maurya [Thu, 10 Sep 2015 22:41:15 +0000 (04:26 +0545)]
Added Security Rule for Custom ICMP

Change-Id: I5f813b3695c2fd21e03a0ccf215e49b891059154
Signed-off-by: sangeeta.maurya <sangeeta.maurya@hp.com>
8 years agoMerge "Migration to use MD-SAL Project"
Sam Hague [Thu, 10 Sep 2015 17:51:38 +0000 (17:51 +0000)]
Merge "Migration to use MD-SAL Project"

8 years agoMerge "Sonar clean-ups"
Sam Hague [Thu, 10 Sep 2015 16:04:04 +0000 (16:04 +0000)]
Merge "Sonar clean-ups"

8 years agoMigration to use MD-SAL Project
Tony Tkacik [Wed, 2 Sep 2015 14:13:30 +0000 (16:13 +0200)]
Migration to use MD-SAL Project

Change-Id: Id34e216f57308f96139e95483b92df0e16e8c60a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
8 years agoMerge "getDHCPServerPort is modified to address Bug 4206"
Sam Hague [Thu, 10 Sep 2015 15:30:17 +0000 (15:30 +0000)]
Merge "getDHCPServerPort is modified to address Bug 4206"

8 years agoSonar clean-ups
Stephen Kitt [Thu, 10 Sep 2015 12:40:14 +0000 (14:40 +0200)]
Sonar clean-ups

Starting from source files containing collapsible ifs:
* merge collapsible ifs;
* remove unused parameters;
* remove unused exceptions;
* remove unused fields;
* rename shadowing variables;
* add private constructors for utility classes;
* use more specific exceptions than RuntimeException;
* clean up "if () return true; else return false;";
* some Java 7 <> operators;
* add missing "static" for constants;
* remove unused private methods (except in OF13Provider);
* move some inline comments above the corresponding source line;
* used boolean instead of Boolean for Map::contains();
* replace foreach-style constructs examining the first element only
  with explicit "if (...hasNext()) ... = ... next()";
* prohibit overriding methods called from constructors;
* remove useless casts.

Reverse the order of node augmentation handling in SouthboundUtil so
that the augmentation case can actually trigger.

Change-Id: Ie4fc662bdcc0e2133fdd4f57b783723466b1f2a9
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoUse the library config bundle in southbound
Stephen Kitt [Wed, 9 Sep 2015 15:21:52 +0000 (17:21 +0200)]
Use the library config bundle in southbound

Change-Id: I07d5c24e3052716018dacffab35f96828a5d6223
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agogetDHCPServerPort is modified to address Bug 4206
Aswin Suryanarayanan [Thu, 10 Sep 2015 02:28:43 +0000 (07:58 +0530)]
getDHCPServerPort is modified to address Bug 4206

Change-Id: I121f91dadb370543664f4a235cf5d0eef6f8b932
Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>
8 years agoMerge "Migrate restconf dependencies"
Sam Hague [Wed, 9 Sep 2015 21:05:26 +0000 (21:05 +0000)]
Merge "Migrate restconf dependencies"

8 years agoMerge "Updating fix for bug 3989 based on discussion in OVSDB meeting"
Sam Hague [Wed, 9 Sep 2015 20:54:57 +0000 (20:54 +0000)]
Merge "Updating fix for bug 3989 based on discussion in OVSDB meeting"

8 years agoMerge "Drop the #1997-related sleep"
Sam Hague [Wed, 9 Sep 2015 19:38:23 +0000 (19:38 +0000)]
Merge "Drop the #1997-related sleep"

8 years agoMigrate restconf dependencies
Tomas Cere [Fri, 4 Sep 2015 12:29:26 +0000 (14:29 +0200)]
Migrate restconf dependencies

Change-Id: I15dca264d53a6af9c80e46bc02c8cfab4709e0ee
Signed-off-by: Tomas Cere <tcere@cisco.com>
8 years agoUpdating fix for bug 3989 based on discussion in OVSDB meeting
Raksha Madhava Bangera [Thu, 27 Aug 2015 20:40:11 +0000 (13:40 -0700)]
Updating fix for bug 3989 based on discussion in OVSDB meeting

Signed-off-by: Raksha Madhava Bangera <raksha.madhava.bangera@intel.com>
Updating the patch as per review comments

Signed-off-by: Raksha Madhava Bangera <raksha.madhava.bangera@intel.com>
Removing whitespace

Signed-off-by: Raksha Madhava Bangera <raksha.madhava.bangera@intel.com>
8 years agoAdded missing dependency on library-features.
Shigeru Yasuda [Mon, 7 Sep 2015 09:03:27 +0000 (18:03 +0900)]
Added missing dependency on library-features.

features-ovsdb needs to have a dependency on library-features for
feature repository reference.

Change-Id: I52c741fb7a1dda6bf0f33b1717da9b05677ff1bb
Signed-off-by: Shigeru Yasuda <s-yasuda@da.jp.nec.com>
8 years agoClean up plugin management
Stephen Kitt [Fri, 4 Sep 2015 16:38:20 +0000 (18:38 +0200)]
Clean up plugin management

A number of plugins are managed by odlparent, so use that instead of
variables (even inherited) and remove unnecessary entries (i.e.
specified identically in odlparent).

Change-Id: I1d6d4072cfdfa59e6891b8bee29a9cb562f93335
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Switch from Felix to config-driven dependencies"
Flavio Fernandes [Thu, 3 Sep 2015 20:26:09 +0000 (20:26 +0000)]
Merge "Switch from Felix to config-driven dependencies"

8 years agoSwitch from Felix to config-driven dependencies
Stephen Kitt [Thu, 20 Aug 2015 12:04:01 +0000 (14:04 +0200)]
Switch from Felix to config-driven dependencies

The library module was regenerated using
opendaylight-startup-archetype 1.1.0-SNAPSHOT.

The ovsdb version is now 1.2.1-SNAPSHOT to make sure none of the
old 1.2.0-SNAPSHOT artefacts are used.

The library-dependent integration tests (at an OSGi level) are now in
library-it, apart from the plugin tests which are just ignored since
they're going away.

Change-Id: Ic6fb1c14f98b1557b9c87a702b20ef8a3173daf7
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoMerge "Use mdsal's base IT classes"
Flavio Fernandes [Wed, 2 Sep 2015 13:09:12 +0000 (13:09 +0000)]
Merge "Use mdsal's base IT classes"

8 years agoBug 4045 - ipv6 work around
Isaku Yamahata [Tue, 25 Aug 2015 22:45:28 +0000 (15:45 -0700)]
Bug 4045 - ipv6 work around

When running tempest, the following exceptions occurs because
ipv6 is not supported yet. This patch is work around for now.
TODO: support IPv6 and remove this work around

> 2015-08-25 15:00:12,428 | ERROR | ntDispatcherImpl | EventDispatcher                  | 400 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.0.SNAPSHOT | Exception in dispatching event NorthboundEvent [handler=NEUTRON_ROUTER, action=DELETE, port=null, subnet=null, router=NeutronRouter [id=55dc4fd2-0e5f-4ec8-b589-18616dfaa6a1, name=tempest-router--44999886, adminStateUp=false, status=ACTIVE, tenantID=86d8df7573f24bc68e0a75846812839d, external_gateway_info=NeutronRouterNetworkReference [networkID=7d526ede-cfd0-45ec-897f-607471dd801e enableSNAT=true externalFixedIPs=[Neutron_IPs{ipAddress='172.24.4.62', subnetUUID='9a799aec-5f1f-4a2d-b3ed-a109f6c89bcb'}, Neutron_IPs{ipAddress='2001:db8::3e', subnetUUID='5178fb71-6683-4cf6-a1e7-095da5b9962a'}]], distributed=false, gw_port_id=2419ec70-21e8-4a3b-aa52-82ec9dd7f698, routes=[], interfaces={}], routerInterface=NeutronRouterInterface [subnetUUID=009ab797-30df-4c55-87f4-5142a9f8b444, portUUID=900abbc5-4db9-4bec-8777-0018f2950751, id=55dc4fd2-0e5f-4ec8-b589-18616dfaa6a1, tenantID=86d8df7573f24bc68e0a75846812839d], floatingIP=null, network=null, loadBalancer=null, loadBalancerPool=null, loadBalancerPoolMember=null]
> java.lang.IllegalArgumentException: Supplied value "fdfd:7da6:14e6:0:f816:3eff:fe43:c114/32" does not match required pattern "^(([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])\.){3}([0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])/(([0-9])|([1-2][0-9])|(3[0-2]))$"
>         at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145)[39:com.google.guava:18.0.0]
>         at org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Prefix.<init>(Ipv4Prefix.java:49)[49:org.opendaylight.yangtools.model.ietf-inet-types:2010.9.24.8-SNAPSHOT]
>         at org.opendaylight.ovsdb.utils.mdsal.openflow.MatchUtils.iPv4PrefixFromIPv4Address(MatchUtils.java:1133)[401:org.opendaylight.ovsdb.openstack.net-virt-providers:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.providers.openflow13.services.L3ForwardingService.programForwardingTableEntry(L3ForwardingService.java:64)[401:org.opendaylight.ovsdb.openstack.net-virt-providers:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programL3ForwardingStage2(NeutronL3Adapter.java:689)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programL3ForwardingStage1(NeutronL3Adapter.java:670)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.updateL3ForNeutronPort(NeutronL3Adapter.java:640)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronRouterInterfaceEvent(NeutronL3Adapter.java:310)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.RouterHandler.processEvent(RouterHandler.java:208)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.dispatchEvent(EventDispatcherImpl.java:95)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.access$200(EventDispatcherImpl.java:28)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl$1.run(EventDispatcherImpl.java:57)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
>         at java.util.concurrent.Executors$RunnableAdapter.call(Executors.java:471)[:1.7.0_79]
>         at java.util.concurrent.FutureTask.run(FutureTask.java:262)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1145)[:1.7.0_79]
>         at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:615)[:1.7.0_79]
>         at java.lang.Thread.run(Thread.java:745)[:1.7.0_79]

Change-Id: If886c3867665660c8f90a72f567420f48f3fd6ad
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
8 years agoMerge "Added unit tests for ovsdb/southbound"
Flavio Fernandes [Mon, 31 Aug 2015 15:00:42 +0000 (15:00 +0000)]
Merge "Added unit tests for ovsdb/southbound"

8 years agoMerge "Fix for defect 4135"
Anil Vishnoi [Fri, 28 Aug 2015 17:02:22 +0000 (17:02 +0000)]
Merge "Fix for defect 4135"

8 years agoAdded unit tests for ovsdb/southbound
rpujar [Fri, 28 Aug 2015 14:32:15 +0000 (10:32 -0400)]
Added unit tests for ovsdb/southbound

Change-Id: Iab67bab14a90ef39678756e7bd9c8852bf111f40
Signed-off-by: rpujar <rpujar@inocybe.com>
8 years agoMerge "Added Unit Tests for ovsdb/southbound"
Flavio Fernandes [Thu, 27 Aug 2015 12:40:16 +0000 (12:40 +0000)]
Merge "Added Unit Tests for ovsdb/southbound"

8 years agoBug 4160 - null pointer exception in getDHCPServerPort() (cont)
Flavio Fernandes [Wed, 26 Aug 2015 15:09:55 +0000 (11:09 -0400)]
Bug 4160 - null pointer exception in getDHCPServerPort() (cont)

Avoid null pointer exception in when neutronPortCache.getPort() returns null.

Patch set 2..4: Add logs to make code same as what is in stable/lithium

Co-Authored-By: Isaku Yamahata <isaku.yamahata@intel.com>
Change-Id: I41630cd978e68cbd135634646f3e3155f14715c7
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
8 years agoBug 4160 - null pointer exception in getDHCPServerPort() (re-do)
Flavio Fernandes [Wed, 26 Aug 2015 14:46:35 +0000 (10:46 -0400)]
Bug 4160 - null pointer exception in getDHCPServerPort() (re-do)

null pointer exception in SecurityServicesImpl.getDHCPServerPort()
because neutronPortCache.getPort() may return null. It needs null check.
NOTE: the order of neutron port creation/deletion via neutron northbound
api and ovs port creation/deletion is not deterministic. Either order can
happen. SecurityServicesImpl seems to be fixed to be aware of it.
it's another story. This patch addresses only null pointer exception
for now.

This is a redo, to fix a merge mistake introduced in
https://git.opendaylight.org/gerrit/#/c/24579/8..9

Original-Change-Id: I40f78b1477f1c2a6ad3e23b2e60e21be6d9abc23
Change-Id: Ib929bf774426d6240934ea406189e25be1ecf536
Co-Authored-By: Isaku Yamahata <isaku.yamahata@intel.com>
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
8 years agoReplace StringBuilder with more efficient String concatenation (re-do)
Flavio Fernandes [Wed, 26 Aug 2015 14:32:15 +0000 (10:32 -0400)]
Replace StringBuilder with more efficient String concatenation (re-do)

Just replaces the StringBuilder with a more efficient/readable
String concatenation operation.

This is a redo, to fix a merge mistake introduced in
https://git.opendaylight.org/gerrit/#/c/24579/8..9

Original-Change-Id: Idce8fed3d4e207ff1a95cf24267a41fa8682a08a
Change-Id: I9aa8d648398e532ad9eacd9a07b99b672ebfebd6
Signed-off-by: Flavio Fernandes <ffernand@redhat.com
Co-Authored-By: Ryan Goulding <ryandgoulding@gmail.com>
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
8 years agofix up of 474eb2a9d61bb1f2f4664d12c23042ab3699260b
Isaku Yamahata [Thu, 20 Aug 2015 21:25:09 +0000 (14:25 -0700)]
fix up of 474eb2a9d61bb1f2f4664d12c23042ab3699260b

The changeset of 474eb2a9d61bb1f2f4664d12c23042ab3699260b
Change-Id: I442745135b5ccb778b1f0b11962f50b1f2d5ff5b
silently reverted the patch of d3d11112b0496535a85ba9dee3831c341c5e4054
Change-Id: I900e3ab959917fda35dd5f073b0cf89b32edc031
This patch introduce the fix again.

Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
8 years agoFix for defect 4135
Sharad Mishra [Wed, 12 Aug 2015 17:53:14 +0000 (13:53 -0400)]
Fix for defect 4135

https://bugs.opendaylight.org/show_bug.cgi?id=4135

If integration bridge or external bridge exist prior to
connecting to ODL, then the pre-existing bridge is not added.
But the side effect is that the controller is not set on
this bridge.
Current code checks to see if the bridge already exists on the node. This
patch adds a check to see if the bridge exists on CONFIG datastore. If the
bridge does not exist on config, it indicates that the bridge existed prior
to ODL connection, and it adds the bridge.

Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
8 years agoAdded Unit Tests for ovsdb/southbound
rpujar [Tue, 25 Aug 2015 15:57:49 +0000 (11:57 -0400)]
Added Unit Tests for ovsdb/southbound

InstanceIdentifierCodecTest.java and OvsdbSchemaContantsTest.java

Change-Id: I91e356dfc6bfc41bac081b9792ff99bfc931c3ae
Signed-off-by: rpujar <rpujar@inocybe.com>
8 years agoUse mdsal's base IT classes
Stephen Kitt [Tue, 25 Aug 2015 14:45:45 +0000 (16:45 +0200)]
Use mdsal's base IT classes

Change-Id: I25138bbe1565cf6e33ab67e847ef878b39a624f7
Signed-off-by: Stephen Kitt <skitt@redhat.com>
8 years agoAdded IPV4, Custom TCP and UDP SG rules.
Aswin Suryanarayanan [Tue, 28 Jul 2015 20:55:53 +0000 (02:25 +0530)]
Added IPV4, Custom TCP and UDP SG rules.

Patch set 9: undo mess in patch set 8, making it the same as patch set 7

Change-Id: I442745135b5ccb778b1f0b11962f50b1f2d5ff5b
Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>
8 years agoMerge "Bug 4163 - null pointer exception NeutronL3Adapter.getExternalNetworkSubnet"
Flavio Fernandes [Mon, 24 Aug 2015 14:44:41 +0000 (14:44 +0000)]
Merge "Bug 4163 - null pointer exception NeutronL3Adapter.getExternalNetworkSubnet"

8 years agoMerge "Replace StringBuilder with more efficient String concatenation"
Flavio Fernandes [Mon, 24 Aug 2015 14:27:18 +0000 (14:27 +0000)]
Merge "Replace StringBuilder with more efficient String concatenation"