Flavio Fernandes [Sat, 25 Jul 2015 01:20:46 +0000 (01:20 +0000)]
Merge "Indicate that RefType values need to be lower-case" into stable/lithium
Isaku Yamahata [Fri, 24 Jul 2015 02:15:53 +0000 (19:15 -0700)]
BUG #4045 net-virt-provider: workaround: ipv6 is not supported yet
At this point, ipv6 is not supported yet. But openstack neutron does.
Ignore ipv6 address for now. Otherwise exception as blow is thrown.
This patches works around BUG #4045.
TODO: implement ipv6 and then remove this work around
> 2015-07-21 17:22:14,077 | ERROR | ntDispatcherImpl | EventDispatcher | 400 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.0.SNAPSHOT | Exception in dispatching event NorthboundEvent [handler=NEUTRON_PORT, action=ADD, port=NeutronPort [portUUID=
c625a77a-4720-4115-beb4-
fd48bcd36727, networkUUID=
dbe6f7d4-695f-45cc-a71c-
1454057a4928, name=, adminStateUp=true, status=null, macAddress=FA:16:3E:39:9C:53, fixedIPs=[Neutron_IPs{ipAddress='fdbe:bc75:a195::1', subnetUUID='
9a1077b9-a35f-46fe-a2d7-
1536301979e8'}], deviceID=
76751b66-0e7c-402d-9196-
fac1d8c34627, deviceOwner=network:router_interface, tenantID=
be9da0d68e28424db03bfb32574c78e5, floatingIPMap={}, securityGroups=[], bindinghostID=, bindingvnicType=normal, bindingvnicType=normal], subnet=null, router=null, routerInterface=null, floatingIP=null, network=null, loadBalancer=null, loadBalancerPool=null, loadBalancerPoolMember=null]
> java.lang.IllegalArgumentException: Supplied value "fdbe:bc75:a195:0:0:0:0:1/64" 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.openstack.netvirt.providers.openflow13.services.RoutingService.programRouterInterface(RoutingService.java:85)[401:org.opendaylight.ovsdb.openstack.net-virt-providers:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programRouterInterfaceStage2(NeutronL3Adapter.java:855)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programRouterInterfaceStage1(NeutronL3Adapter.java:833)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programFlowForNetworkFromExternal(NeutronL3Adapter.java:720)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.programFlowsForNeutronRouterInterface(NeutronL3Adapter.java:688)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronRouterInterfaceEvent(NeutronL3Adapter.java:227)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.impl.NeutronL3Adapter.handleNeutronPortEvent(NeutronL3Adapter.java:186)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.doNeutronPortCreated(PortHandler.java:68)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.PortHandler.processEvent(PortHandler.java:164)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.dispatchEvent(EventDispatcherImpl.java:96)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl.access$100(EventDispatcherImpl.java:30)[400:org.opendaylight.ovsdb.openstack.net-virt:1.2.0.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.impl.EventDispatcherImpl$1.run(EventDispatcherImpl.java:59)[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: I5db1bc9ad9f008c984c4ab4fa34569a3baffe310
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Stephen Kitt [Fri, 24 Jul 2015 13:21:16 +0000 (15:21 +0200)]
Indicate that RefType values need to be lower-case
Sonar complains that RefType's values should be upper-cased (as
constants), but since they match JSON values they need to be lower-case.
While we're at it, drop an unnecessary null declaration, remove the
redundant static modifier from RefType, and merge two if statements.
Change-Id: I98c7baf63cf42784ba40416bff96259ae8327084
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Flavio Fernandes [Wed, 22 Jul 2015 14:15:30 +0000 (14:15 +0000)]
Merge "Allow SouthboundIT to determine its southbound-karaf version" into stable/lithium
Stephen Kitt [Wed, 22 Jul 2015 13:22:18 +0000 (15:22 +0200)]
Allow NetvirtIT to determine its karaf version
Pax Exam needs a dependency on karaf so
AbstractConfigTestBase::getKarafDistro() can determine the appropriate
version.
Change-Id: I7edd30e4698ec5aa9f417e396e38f5408d7b2645
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Wed, 22 Jul 2015 09:11:47 +0000 (11:11 +0200)]
Allow SouthboundIT to determine its southbound-karaf version
Since AbstractConfigTestBase::getKarafDistro() now uses
versionAsInProject(), Pax Exam needs a dependency on southbound-karaf so
it can determine the appropriate version.
Change-Id: Icbfaab256ef9500982dcf13dbf2a2b68334bcda0
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Mon, 20 Jul 2015 14:49:37 +0000 (16:49 +0200)]
Remove all redundant public modifiers in interfaces
The public modifier is unnecessary in interfaces, their contents are
public by default.
Change-Id: Id307c25a9a704332dc75032432d1d2755bb3360e
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Sam Hague [Tue, 21 Jul 2015 13:27:27 +0000 (13:27 +0000)]
Merge "Sonar clean-up: OF13Provider" into stable/lithium
Stephen Kitt [Fri, 17 Jul 2015 13:30:06 +0000 (15:30 +0200)]
Sonar clean-up: OF13Provider
This class contains lots of methods with unused parameters, but they
follow a pattern so override that instead of cleaning up the
parameters.
Dead-code elimination (unused methods, unnecessary initialisations).
Code which corresponds to comment method calls is marked as such so
it no longers causes Sonar warnings (with a TODO added to check the
call sites).
getTunnelReadinessStatus() appears unused but is tested for in the
corresponding unit-test class, so keep it for now and override the
unused warning.
Long dpid -> long dpid.
if (!local) {} if (local) {} -> if (!local) {} else {} (the value of
local doesn't change in the first block).
networkingProviderManager is initialised and used in a single method,
so convert it to a local variable and adjust the corresponding test.
Return value simplification (? true : false isn't necessary).
<> operator in OF13ProviderTest.
Change-Id: Ibf74d332257f063ffc603e663b1707829ddaa6e3
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit
4bacbbca7d0d501acbefd6f70358dd9c68121b56)
Stephen Kitt [Tue, 21 Jul 2015 12:26:13 +0000 (14:26 +0200)]
Add libvirt support
Set up memory sizes with libvirt. I'm not familiar enough with Ruby to
know if there's a way of combining the :virtualbox and :libvirt
stanzas...
(The box images still need to be mutated manually.)
Change-Id: Ic2d2531f4e696127155cf1522899591f61c7fa6e
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit
74dde8f7067b5d30a6eb48bd73697c64feadc0c2)
Sam Hague [Fri, 17 Jul 2015 18:53:09 +0000 (18:53 +0000)]
Merge "Bug 3378 - ovsdb netvirt needs help in getting mac for a given ip in br-ex" into stable/lithium
Sam Hague [Fri, 17 Jul 2015 16:55:40 +0000 (16:55 +0000)]
Merge "Fix it failure: Error resolving artifact" into stable/lithium
Flavio Fernandes [Fri, 17 Jul 2015 16:14:22 +0000 (12:14 -0400)]
Fix it failure: Error resolving artifact
Fix the following issue:
error: java.io.IOException: Error resolving artifact org.opendaylight.ovsdb:southbound-karaf:zip:1.1.0-SNAPSHOT
In it builds, such as:
https://jenkins.opendaylight.org/releng/view/ovsdb/job/ovsdb-daily-full-lithium-integration/OVS_VERSION=2.3.0,jdk=openjdk7,nodes=dynamic_docker/
Change-Id: I91daf9655879369eb3512e653223b0c4c1e084bb
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Anil Vishnoi [Tue, 7 Jul 2015 23:50:43 +0000 (16:50 -0700)]
Bug 3378 - ovsdb netvirt needs help in getting mac for a given ip in br-ex
This patch, does not do periodic refresh of gateway mac. Will push that in next gerrit.
Change-Id: Ie1a5a81fb7f196874f87bfbe0095ea595756a0a4
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Flavio Fernandes [Fri, 17 Jul 2015 14:28:16 +0000 (14:28 +0000)]
Merge "Add showOvsdbMdsal.py tool" into stable/lithium
Flavio Fernandes [Fri, 10 Jul 2015 13:48:35 +0000 (09:48 -0400)]
Add showOvsdbMdsal.py tool
This tool can provide useful info in regards to ovsdb's mdsal structures.
It looks at the operational or config trees in mdsal, depending on the
parameter '--config':
Patch set 2: code review
$ ./showOvsdbMdsal.py -h
Usage: showOvsdbMdsal.py [options]
Options:
--version show program's version number and exit
-h, --help show this help message and exit
-d, --debug Verbosity. Can be provided multiple times for more
debug.
-n, --noalias Do not map nodeId of bridges to an alias
-i ODLIP, --ip=ODLIP opendaylights ip address
-t ODLPORT, --port=ODLPORT
opendaylights listening tcp port on restconf
northbound
-u ODLUSERNAME, --user=ODLUSERNAME
opendaylight restconf username
-p ODLPASSWORD, --password=ODLPASSWORD
opendaylight restconf password
-c, --config parse mdsal restconf config tree instead of
operational tree
-f, --hide-flows hide flows
Examples of what to expect:
https://gist.githubusercontent.com/anonymous/
3a952cec49ef92461752/raw/
7abfedcd7790acc5b5cef07a2c08da0405f303c6/gistify465337.txt
Change-Id: Ica94e00a14d17682acdedad3b495833de330afc4
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
(cherry picked from commit
e70bd1c97dec07da71569dd2635515fff411654f)
Stephen Kitt [Fri, 17 Jul 2015 09:22:49 +0000 (11:22 +0200)]
Sonar clean-up: braces for control statements
Add braces for if, while, for statements. (Automated, thanks IntelliJ!)
In a few cases a different change was more appropriate:
* ConfigurationServiceImpl.java: in unsetOvsdbConfigurationService(),
the if is redundant, we might as well set to null unconditionnally.
* ConnectionServiceImpl.java: likewise
* OvsdbLibraryIt.java: instead of
if (...) { return true; } return false;
just
return ...;
* OvsdbVswitchdSchemaConstants.java: likewise
Change-Id: Ib35b395a64c3caa17c32a3f51c763d8a2f88b093
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Aswin Suryanarayanan [Mon, 6 Jul 2015 14:39:52 +0000 (20:09 +0530)]
Added fixed DHCP security rules, which will be added on a VM create.
Change-Id: I8652c986acf3488ddf661ed265bff4cf6fb5ed1e
Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>
(cherry picked from commit
8565b7700aa90efbf849472d10e9b4c41a403abe)
Stephen Kitt [Thu, 16 Jul 2015 14:37:00 +0000 (16:37 +0200)]
Clean-up in BridgeOperationalState
The main fix is moving null-checks on iid before their first use.
db and changes are only used in the constructor, they don't need to
be in the instance; since the class isn't serializable removing the
fields doesn't change anything external.
Java 7 improvements: <> operator and merged exceptions.
Use Optional.fromNullable() to simplify some Optional creation code
and avoid double calls to getAugmentation().
Change-Id: Id6b8a13c46d2b38b23f215f200314151b9eb2b0a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
(cherry picked from commit
a51497fb73ba88ab096e7b375aab66b83c740db5)
Flavio Fernandes [Mon, 13 Jul 2015 19:17:35 +0000 (19:17 +0000)]
Merge "Update README to reflect LBaaS postman collection." into stable/lithium
Flavio Fernandes [Mon, 13 Jul 2015 19:17:21 +0000 (19:17 +0000)]
Merge "Add postman collection to interact with LBass." into stable/lithium
Alexis de Talhouët [Thu, 9 Jul 2015 16:28:17 +0000 (12:28 -0400)]
Add postman collection to interact with LBass.
This postman contains queries to interact with:
- pool
- pool member
- loadbalancer
It also contains queries to create a network, a subnet and two ports, in order to have a proper network topology for testing purposes.
Change-Id: I9bc1fd6e7d59abea5b22bb8260d79b9fa11e9dc9
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
(cherry picked from commit
14ebdac49fb00c68a861acf3bcf6be8bdd50e62d)
Hsin-Yi Shen [Mon, 6 Jul 2015 21:00:37 +0000 (14:00 -0700)]
Change log level of raw json rpc message
When hypervisor/hardware vtep are not implemented in the right way and sending jsonrpc message with wrong format, the log of raw json rpc message helps debugging.
Signed-off-by: Hsin-Yi Shen <syshen66@gmail.com>
Change-Id: I033abdb251065dd19c8ee198417f04bcd152e761
Alexis de Talhouët [Fri, 10 Jul 2015 19:53:39 +0000 (15:53 -0400)]
Update README to reflect LBaaS postman collection.
Change-Id: I53057cd71fed174debbf1e6be579fb36e3d76b41
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Sam Hague [Thu, 9 Jul 2015 00:31:28 +0000 (00:31 +0000)]
Merge "Bug 3962: Event dispatcher found no handler for NorthboundEvent (part 1)" into stable/lithium
Flavio Fernandes [Wed, 8 Jul 2015 16:12:05 +0000 (12:12 -0400)]
Bug 3962: Event dispatcher found no handler for NorthboundEvent (part 1)
We cannot reproduce this locally, so this commit adds some better logs
to inform what handlers have this issue.
Patch set 2: code review.
Patch set 3: remove redundant param on the non-error path: ref.
Change-Id: I394984cf41f7e310919efdb7c4bbf394ba1fa89d
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Flavio Fernandes [Wed, 8 Jul 2015 17:48:57 +0000 (17:48 +0000)]
Merge "Sonar fixes." into stable/lithium
Flavio Fernandes [Wed, 8 Jul 2015 10:48:28 +0000 (10:48 +0000)]
Merge "Fix Javadoc errors." into stable/lithium
Andre Fredette [Mon, 6 Jul 2015 13:54:57 +0000 (09:54 -0400)]
Sonar fixes.
Change-Id: I03d18ba2dcaa76de565d53bc9dd68f9b28c2b240
Signed-off-by: Andre Fredette <afredette@redhat.com>
Alexis de Talhouët [Fri, 26 Jun 2015 14:21:16 +0000 (10:21 -0400)]
Fix Javadoc errors.
The build was failing due to those errors:
[ERROR] /ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/EgressAclProvider.java:13: error: @param name not found
--> doesn't exist
[ERROR] /ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/api/IngressAclProvider.java:22: error: @param name not found
--> doesn't exist
[ERROR] /ovsdb/openstack/net-virt-providers/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/providers/openflow13/AbstractServiceInstance.java:205: error: @param name not found
--> Node instead of node
Java version "1.8.0_45"
Change-Id: I386bb5ba6be41c134c6f843f78ef06147528fd61
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
(cherry picked from commit
68e3e2d5605d791616735fd06c246b267a4aff80)
Hsin-Yi Shen [Mon, 29 Jun 2015 20:42:01 +0000 (13:42 -0700)]
bug 3909: Disable SSLv3 connection for ovsdb server
SSLv3 has known vulnerability.
For security reason, we should disable sslv3 protocol for ovsdb server.
Signed-off-by: Hsin-Yi Shen <syshen66@gmail.com>
Change-Id: I1267711efe7cebcd3252d81f184aab8782b6d72d
Sam Hague [Mon, 6 Jul 2015 18:40:14 +0000 (18:40 +0000)]
Merge "Update NeutronL3Adapter UT" into stable/lithium
Alexis de Talhouët [Mon, 6 Jul 2015 16:21:18 +0000 (12:21 -0400)]
Update NeutronL3Adapter UT
Patch Set 1: initial commit
Patch Set 2: some more to go
Patch Set 3: some more tests - done with the class
Change-Id: I1081c7e70e7e437ac6260624c7f1b0cc4a5ceeae
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Raksha Madhava Bangera [Mon, 6 Jul 2015 16:24:05 +0000 (09:24 -0700)]
Sonar bug fix: block of commented-out lines of code should be removed
Signed-off-by: Raksha Madhava Bangera <raksha.madhava.bangera@intel.com>
(cherry picked from commit
4d3efc4896d1e5942863d19ab38b3875c49c4cc9)
Change-Id: I9192416d8fe62f4e4f856d2f9fe7cf941bb55ab3
Author: Sam Hague <shague@redhat.com>
Signed-off-by: Sam Hague <shague@redhat.com>
Alexis de Talhouët [Thu, 2 Jul 2015 20:57:06 +0000 (16:57 -0400)]
Update OF13Provider UT
Change-Id: Idba5421b9a4f6e63e713f368c8dd3011c5c11819
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Flavio Fernandes [Tue, 30 Jun 2015 15:58:50 +0000 (11:58 -0400)]
Bug 3893: provide well known url to know that net-virt topology is ready
With this change, one can check the following url and know that ovsdb's netvirt
is up and functional:
http://${ODL_IP}:8080/restconf/operational/network-topology:network-topology/topology/netvirt:1
Patch set 2: fix transaction
Patch set 3: code review, move new function to OvsdbInventoryServiceImpl
Patch set 4: typo (functional)
Change-Id: Ibe71d823b986fcdc9c12b6fa2a3994ae158fb696
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Thanh Ha [Thu, 25 Jun 2015 18:39:16 +0000 (14:39 -0400)]
Revert "Revert "Bug 3841 - wrong severity level: getTenantNetwork did not find network""
This reverts commit
bb1aac41d7e66c7712d6c46ea95b3404f4998834.
Change-Id: Ib993d37b2ea4efbd7ac27fbf57fd58d64e897ee5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Thu, 25 Jun 2015 18:38:58 +0000 (14:38 -0400)]
Revert "Revert "Bug-2094 : less is more remove redundant code""
This reverts commit
ea74c8f6d28a55558c25e4af8fe3c44e6d9cca19.
Change-Id: I6f120a0c086fcd684d08a60a694fa3689495727f
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Thu, 25 Jun 2015 18:38:34 +0000 (14:38 -0400)]
Bumping versions by 0.0.1 for next dev cycle
Change-Id: Id2e20f3032879d9f9014c42f78580174a0c41bf7
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Thu, 25 Jun 2015 18:38:14 +0000 (14:38 -0400)]
Release Lithium
Change-Id: Iabcc1701a1d3d557802e4526b8bb63f79a5a2c39
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Thu, 25 Jun 2015 18:36:26 +0000 (14:36 -0400)]
Revert "Bug-2094 : less is more remove redundant code"
This reverts commit
1a1a91b178b0e8e20f8a97a88ceca00e12cd3130.
Change-Id: I343f7f2144e0d920ed2baba336825f407673df88
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Thu, 25 Jun 2015 18:36:00 +0000 (14:36 -0400)]
Revert "Bug 3841 - wrong severity level: getTenantNetwork did not find network"
This reverts commit
572c724cc093b68600f9116fb26c8a34daf110cc.
Change-Id: I0a3072042995b41b2b39e10f6876c9d43ce57dd4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Flavio Fernandes [Tue, 23 Jun 2015 15:33:24 +0000 (11:33 -0400)]
Bug 3841 - wrong severity level: getTenantNetwork did not find network
when using normal ovsdb net-virt, I see benign logs like these:
WARN | ntDispatcherImpl | TenantNetworkManagerImpl | 271 - org.opendaylight.ovsdb.openstack.net-virt - 1.1.0.SNAPSHOT | getTenantNetwork did not find network for patch-int
these should be debug at best; not warning.
Patch set 2: add changes from code review
Change-Id: I6f0b0aa6880c2b6892e5b9974ce5df6c0d217bf5
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Flavio Fernandes [Tue, 23 Jun 2015 13:50:33 +0000 (09:50 -0400)]
Bug-2094 : less is more remove redundant code
In pipeline, there is no need to set register value to 0,
as that is the expected value upon classifier table.
Change-Id: Iea4c53c14be980713ff060c8c9df8869c60926df
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Eric Multanen [Mon, 22 Jun 2015 16:45:18 +0000 (09:45 -0700)]
Bug 3831 - ignore unknown OVS interface and datapath types
Ighore OVSDB interface or datapath types which are not
present in the MD-SAL southbound model (but are present
in the OVS nodes open_vswitch table iface-types or
datapath-types columns).
Tested by making a build of ODL which removed supported
types from the ODL code to varify the log warnings
were created.
Change-Id: I05e689fa2b2dc906e3083e4fc44ba60abdb1d352
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Eric Multanen [Mon, 22 Jun 2015 15:47:17 +0000 (08:47 -0700)]
Bug 3831 - add stt interface type to model
On a build from openvswitch master branch, there was an
interface type 'stt' which was not included in the ovsdb.yang
model for the southbound MD-SAL. When an OVSDB connection
was made to this OVS node, the operational md-sal failed
to populate.
Adding the 'stt' interface type to the model is a quick
fix. A better fix would ignore types not present in the model.
Change-Id: Idf259998f73d43be587d19de73794a174d4d81d3
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Sharon Aicler [Fri, 15 May 2015 19:04:03 +0000 (12:04 -0700)]
Remove frame size limit for scale OVS
Change-Id: I4f1c7e29c332964eea077fd6958453be34fa04a5
Signed-off-by: Sharon Aicler <saichler@cisco.com>
(cherry picked from commit
9825e1d942bffb4b49dd1aaee93fd265cd3fcc74)
Sharad Mishra [Mon, 22 Jun 2015 06:38:24 +0000 (23:38 -0700)]
Bug 3647 :Operational not set correctly when other-config is removed from switch.
similar to BZ 3647, but for other-config
Change-Id: I48f6636e5d3e67de024958a1e3b9e8efb7e6f8dc
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
(cherry picked from commit
2f57380e4621fadcf6a0ea8db008f157cda3046d)
Sharad Mishra [Thu, 18 Jun 2015 07:01:04 +0000 (00:01 -0700)]
Bug 3647 : Fix for bugzilla 3647
https://bugs.opendaylight.org/show_bug.cgi?id=3647
Change-Id: I504a7155050bb47e3eb768ab7420c8b5892af324
Signed-off-by: Sharad Mishra <sharad.d.mishra@intel.com>
Flavio Fernandes [Fri, 19 Jun 2015 04:58:54 +0000 (00:58 -0400)]
Bug-2094 : L3 North-South does not work -- fix outbound rewrite
This set of changes will fix the outbound table (ie table 100) to
match on fixedIp associated with floatingIp, destined to neutron
router's mac. Packets that match the criteria will have rewrite
done, and be sent out of the patch-port in br-int.
Pat set 2: Fix copy and paste mistake in testProgramIpRewriteRule()
Change-Id: I2fc3f1f88b8cb9f26aaf0b69fda6836a1cebd264
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Flavio Fernandes [Thu, 18 Jun 2015 23:49:42 +0000 (23:49 +0000)]
Merge "Added Vagrant images to run CSIT." into stable/lithium
Flavio Fernandes [Wed, 17 Jun 2015 12:37:12 +0000 (08:37 -0400)]
Bug-2094 : L3 North-South does not work -- fix inbound rewrite
This set of changes will fix the inbound table (ie table 30) to use reg3
to track the ip rewrite. Also, changes added to routing table (talbe 60)
so that reg3 match can route packet into tenant segmentation.
Patch set 2: code review.
Patch set 3: fix test to account for removal of inboundIpRewriteExclusionCache.
Change-Id: I53b327da1631ac35aa7aaa519e0e9945d017fb3e
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Ben Eze [Thu, 18 Jun 2015 14:20:55 +0000 (10:20 -0400)]
Added Vagrant images to run CSIT.
Change-Id: I147cb90878f8f8af6d535b2b15988e9221777a4c
Signed-off-by: Gabriel Robitaille-Montpetit <grmontpetit@inocybe.com>
Signed-off-by: Ben Eze <beze@inocybe.ca>
Flavio Fernandes [Tue, 16 Jun 2015 00:42:36 +0000 (20:42 -0400)]
Bug-2094 : L3 North-South does not work -- fix ARP table
This set of changes will fix the ARP responder table (ie table 20) to properly
handle the responding of ARP queries made on br-ex for the associated floating
ip addresses.
Change-Id: I72c5f24d00a42fb011441849adfdb244ba01937b
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Flavio Fernandes [Tue, 16 Jun 2015 14:51:25 +0000 (10:51 -0400)]
Bug 3752 : NPE at SouthboundMapper.java -- createControllerEntries
Check that ovsdbBridgeAugmentation.getControllerEntry() is not
returning null
Change-Id: I2b91710e6d388309f524797a2a2584e37e1cc4de
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Sam Hague [Sat, 13 Jun 2015 16:26:08 +0000 (12:26 -0400)]
Bug 3379:java.lang.IllegalArgumentException: ControllerEntryKey
Change-Id: I60ff0485707445ac119d76a5046a708a63f302fa
Signed-off-by: Sam Hague <shague@redhat.com>
Sam Hague [Tue, 9 Jun 2015 19:50:00 +0000 (15:50 -0400)]
Bug 3379:java.lang.IllegalArgumentException: ControllerEntryKey
Problem: OVSDB Controller updates are indpendent of Bridge updates but the ovsdb.yang model includes the controller data in the OVsdbBridgeAugmentation. This existing code assumed that the Controller and Bridge updates would be together and thus would always have the OvsdbBridgeAugmentation to update. That is not the case since the Controller updates can be received without a Bridge update.
Solution: Add the ControllerEntry to the OvsdbBridgeAugmentation using the Bridge if it was included with the Controller update. Otherwise, find all the OvsdbBridgeAugmentations for the connection and update them if they are using the updated Controller.
Patch also includes updates to SouthboundIT and NetvirtIT. NetvirtIT was needed so that the isConnected=true case would be tested. Southbound does not include the openflowplugin but Netvirt does. The openflowplugin is needed to test when the switch connects to the openflow controller.
Other fixes were made to the existing testOvsdbBridgeControllerInfo(). That test was using the ovsdb node ip:port as the controller target but it should have been the controller's ip:port.
Change-Id: I30785dbdf955614ad6fc675507da048434c2485e
Signed-off-by: Sam Hague <shague@redhat.com>
Sam Hague [Sat, 13 Jun 2015 14:22:25 +0000 (14:22 +0000)]
Merge "Bug 3681 - Uncaught ConnectException leaves library in bad state" into stable/lithium
Sam Hague [Fri, 12 Jun 2015 00:05:19 +0000 (20:05 -0400)]
Bug 3681 - Uncaught ConnectException leaves library in bad state
Change-Id: I282162be62d9b6d8deb94906dddac9df766255eb
Signed-off-by: Sam Hague <shague@redhat.com>
(cherry picked from commit
62c1e396e21049464077d817c0dd61246bb9c2d9)
Sam Hague [Fri, 12 Jun 2015 00:05:09 +0000 (20:05 -0400)]
Bug 3681 - Uncaught ConnectException leaves library in bad state
Change-Id: Iccf9be6e7e08b0fd77f0ee47a71b92640890a9df
Signed-off-by: Sam Hague <shague@redhat.com>
(cherry picked from commit
d7fc4000910f177b36710613c3d6c3bd737bf0dd)
Alexis de Talhouët [Fri, 12 Jun 2015 13:14:07 +0000 (09:14 -0400)]
Fix Bug 3663: Wrong assert statement causing test failure.
Also remove a System.out than shouldn't have been there in a first place.
Change-Id: Iad4a3968451d57ff7fe4d37ea380f583ffc9d3c7
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Praveen Mala [Fri, 12 Jun 2015 01:06:27 +0000 (21:06 -0400)]
Adding test case to set-target controller for a bridge and verify if it is set in the bridge as expected
Change-Id: I85b29409178716920c6e0859580f035055a0901c
Signed-off-by: Praveen Mala <praveen.mala@intel.com>
(cherry picked from commit
a9b54c1f43f23e04e491d2b9b55a2a408d48fd20)
Sam Hague [Fri, 12 Jun 2015 00:40:36 +0000 (00:40 +0000)]
Merge "Fix Bug 3663: Update netvirt.provider UT" into stable/lithium
Sam Hague [Fri, 12 Jun 2015 00:38:14 +0000 (00:38 +0000)]
Merge "Bug 3141 - OVSDB southbound operational MDSAL stops getting populated after ovs-vsctl del-manager" into stable/lithium
Sam Hague [Thu, 11 Jun 2015 20:46:22 +0000 (16:46 -0400)]
Bug 3141 - OVSDB southbound operational MDSAL stops getting populated after ovs-vsctl del-manager
The symptom looked like the OvsdbDataChangeListener#onDataChanged() was not being called when the node was added back to config (after it was deleted from operational followed by deleted from config)
This was because of a AbstractFuture.get() was not returning. This was a get() for the transaction responses for ovsdb transactions. In this particular path the node was deleted from oeprational. Then the node is deleted from config. During the processing of the config update there was an expectation that some ovsdb updates would happen but there aren't any because the node was already removed from operational and there is no active connection to the ovsdb node. This caused the invoker thread to block on the future result.get(). Later when the node was added to config, the onDataChanged() was not called since the thread was still blocked on the get().
Solution: check if there were any ovsdb transactions and not call get() if there aren't any.
Change-Id: Id183aed2ae9b4f1d156cf89d7899a1868a6451f6
Signed-off-by: Sam Hague <shague@redhat.com>
(cherry picked from commit
90258bc94842739b4f319cc9e6a23387d70e75c8)
Sam Hague [Thu, 11 Jun 2015 20:45:53 +0000 (16:45 -0400)]
Bug 3676 - OvsdbNodeRemoveCommand .. had no OvsdbNodeAugmentation
Change-Id: I40684762bdd9f4933afbe67a58540e1cfc4b8a35
Signed-off-by: Sam Hague <shague@redhat.com>
(cherry picked from commit
3d950b93486b56f5a4ea55102d0d690bc0ba47f6)
Alexis de Talhouët [Thu, 11 Jun 2015 18:47:17 +0000 (14:47 -0400)]
Fix Bug 3663: Update netvirt.provider UT
This patch update all the test classes within the
org.opendaylight.ovsdb.openstack.netvirt.provider package
Change-Id: I40b73ae5efe472449b2b3a11e91dbef6d5bf24cc
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Sam Hague [Thu, 11 Jun 2015 15:17:18 +0000 (15:17 +0000)]
Merge "Fix Bug 3663: Update netvirt.impl UT" into stable/lithium
Alexis de Talhouët [Wed, 10 Jun 2015 16:18:48 +0000 (12:18 -0400)]
Fix Bug 3663: Update netvirt.impl UT
This patch update all the test classes within the
org.opendaylight.ovsdb.openstack.netvirt.impl package
Change-Id: If9864fc98385c602627b279653875875fdcf700c
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
(cherry picked from commit
3492b5d9c2c619c1085e9ccc5a534b650f37dc20)
Alexis de Talhouët [Tue, 9 Jun 2015 14:46:29 +0000 (10:46 -0400)]
Fix Bug 3663: Update netvirt UT
This patch update all the test classes within the
org.opendaylight.ovsdb.openstack.netvirt package
Change-Id: I8f747293f9283bc4f3c0823f4504a63dd59a03c0
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
(cherry picked from commit
c9cb904303957d3c9ef9423b9a83786b8581e13b)
Alexis de Talhouët [Wed, 10 Jun 2015 18:40:50 +0000 (14:40 -0400)]
Fix Bug 3665: Call the nodeCache.remove() by passing the NodeId.
Change-Id: I7b55ef7e86c76f473e9dc044f5441d989034a52b
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
(cherry picked from commit
73633264608ee0f772f5855a7a9e36d622b8e40f)
Alexis de Talhouët [Tue, 9 Jun 2015 15:04:04 +0000 (11:04 -0400)]
Change EventDispatcher field visibility of AbstractHandler to protected.
Instead of having EventDisptacher private, we set it as protected thus
all the classes that extends AbstractHandler can use the variable.
This patch remove:
- the setDispatcher() method from AbstractHandler
- the declared EventDispactcher field of the classes extending AbstractHandler
Change-Id: Idbd000def09aa91cc4e40976ac4a37274bfce762
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
(cherry picked from commit
12cd489735cf1b15b40054f9f7dff930dcd39d5c)
Flavio Fernandes [Wed, 3 Jun 2015 10:45:15 +0000 (06:45 -0400)]
Bug-2094 : L3 North-South does not work
Create br-ex and add patch port between br-int and br-ex when L3 fwd is enabled.
Patch set 2: Use consts for patch port names
Patch set 3: Use config to determine if l3 fwd is enabled
Patch set 4: Fix tests part 1 of 2
Patch set 5: Fix tests part 2 of 2
Patch set 6: Add changes from code review
Change-Id: I2425d83c68025617a50000f98c4e60b3a9a15ee8
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Also-by: Sam Hague <shague@redhat.com>
Sam Hague [Wed, 3 Jun 2015 02:12:12 +0000 (22:12 -0400)]
Add per test information
Change-Id: I4859e9977db5099485fe53c4bc663bd484a61ed5
Signed-off-by: Sam Hague <shague@redhat.com>
(cherry picked from commit
424a930e99a751cf2cfb742d98295159feea2766)
Anil Vishnoi [Wed, 3 Jun 2015 13:33:47 +0000 (19:03 +0530)]
Bug 3563 - Fix/clean methods that determine the OpenFlow Controller ip address
Change-Id: I420a10e769be016efa0a4e6c71d863fd39c12e23
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Eric Multanen [Thu, 21 May 2015 20:04:02 +0000 (13:04 -0700)]
Bug 3332: Fix connections made to an ODL instance
If an OVSDB connection is made via OVSDB SB MD-SAL
to self (same ODL) or another ODL instacne, the
OVSDB SB provider would hang or otherwise stop working.
This fixes by returning a null list to the 'list_dbs'
command.
v2 - remove white space
When an OVSDB connection is established,
the first request that the OVSDB Southbound makes is a
list_dbs command. By returning an empty db list, two
things occur:
1 - the request gets a response
2 - the empty db list signals an uninteresting connection
v3 - rebase for stable/lithium
Change-Id: I295dd47b821f7ec4ead0eb489a1b124cc574e8cf
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
shc411 [Tue, 2 Jun 2015 06:46:33 +0000 (15:46 +0900)]
Fix for bug 3538
in removeOutputPortFromInstructions function,
when reordering the actionList setKey should be used same key with order.
Change-Id: I3ab3b6c9bbf6bf0b3914dc0819501177f37dc31a
Signed-off-by: shc411 <jung33@gmail.com>
Ed Warnicke [Sat, 30 May 2015 18:02:57 +0000 (11:02 -0700)]
Bug 3310 Bug 3316: Fix for iids for termination points
Change-Id: I9174fe480fc95570e52095474c3e9ae78b8efd8e
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Sam Hague [Mon, 1 Jun 2015 18:50:59 +0000 (18:50 +0000)]
Merge "Bug 3310 Bug 3316: Fix for iids for bridges" into stable/lithium
Sam Hague [Mon, 1 Jun 2015 18:50:46 +0000 (18:50 +0000)]
Merge "Bug 3310 Bug 3316 Use iid stamp if we configured a connection, otherwise systemid" into stable/lithium
Sam Hague [Mon, 1 Jun 2015 18:50:37 +0000 (18:50 +0000)]
Merge "Slight refactoring of the lifecycle of data" into stable/lithium
Sam Hague [Mon, 1 Jun 2015 18:50:30 +0000 (18:50 +0000)]
Merge "Write iid of ovsdb-node to OpenVSwitch.externalIds" into stable/lithium
Sam Hague [Mon, 1 Jun 2015 18:50:21 +0000 (18:50 +0000)]
Merge "Switch from using OvsdbCreateCommand to using OpenVSwitchUpdateCommand" into stable/lithium
Sam Hague [Mon, 1 Jun 2015 18:50:02 +0000 (18:50 +0000)]
Merge "Pass OvsdbConnectionInstance to Commands instead of ConnectionInfo" into stable/lithium
Flavio Fernandes [Fri, 29 May 2015 15:12:02 +0000 (11:12 -0400)]
Bug-3425 : Cont. minor changes to incorporate the code review from Sam
Change-Id: I859864631f2842af48ad044ff7305ceeec5bf9ff
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Ed Warnicke [Thu, 21 May 2015 20:55:25 +0000 (13:55 -0700)]
Bug 3310 Bug 3316: Fix for iids for bridges
Change-Id: Ieabaa7040cbcdc8e72a2aae21a9181667c543880
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Ed Warnicke [Fri, 15 May 2015 16:42:36 +0000 (09:42 -0700)]
Bug 3310 Bug 3316 Use iid stamp if we configured a connection, otherwise systemid
This has been tested, and passes SB IT tests (all 21)
As well as manually tested beyond their coverage.
PatchSet3: Switch to using ovsdb://uuid/<uuid> for default
NodeKey for OPER nodes we discover that we did not configure.
Change-Id: I270a64e13a6fca257b49d2e2ff34f754698c2df4
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Ed Warnicke [Thu, 14 May 2015 15:13:56 +0000 (08:13 -0700)]
Slight refactoring of the lifecycle of data
With this patch, we change slightly the manner in which we handle
data change events (including connections)
Previously, when we got a DataChangeEvent we'd try the following
1) connect(changes) - do all the work for connecting, including
registeringCallbacks
2) connectionUpdate - handle connection updates
3) updateData - use transact to write any data changes to the ovsdb instance
4) disconnect - disconnect anything if needed
Now we have changed this so that
a) #1 (connect) - does *not* registerCallbacks
b) Added a 5) registerCallbacks
The reason this was done is so that the normal pipeline for writing data
can handle flushing the externalId for the OpenVSwitch table down to ovsdb
*before* we registerCallbacks and have it come back to the operational data
store.
Change-Id: I105dd01bf87b1be170e2c4082a7914fba2002249
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Ed Warnicke [Thu, 14 May 2015 04:31:54 +0000 (21:31 -0700)]
Write iid of ovsdb-node to OpenVSwitch.externalIds
Change-Id: I4fbdd5499b19d452f253a3600944aecced59dafc
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Ed Warnicke [Thu, 14 May 2015 02:51:28 +0000 (19:51 -0700)]
Switch from using OvsdbCreateCommand to using OpenVSwitchUpdateCommand
Have the initial registration of the ovsdb-node come from getting
the OpenVswitch table data come to use from the monitor command in the
initial db dump.
This passes all SB-IT tests:
Tests run: 21, Failures: 0, Errors: 0, Skipped: 0
Change-Id: If098081bb89292f0bac320659b41fa05994e195e
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Ed Warnicke [Thu, 14 May 2015 02:17:38 +0000 (19:17 -0700)]
Pass OvsdbConnectionInstance to Commands instead of ConnectionInfo
This is in preperation to have the adding of ovsdb-nodes handled
by the OpenVSwitchUpdateCommand, so it can write the iid to the
externalIds.
Change-Id: Ib478c776e0906e7424b5759422d0be986dccdc29
Signed-off-by: Ed Warnicke <hagbard@gmail.com>
Anil Vishnoi [Thu, 28 May 2015 19:56:35 +0000 (01:26 +0530)]
Bug-3425 : VM doesn't get the ip address from DHCP
server, if network is not attached to the router
This failure happens when net-virt don't find tunnel port in
the Node update from operational data store.
It tries to extract termination point from node update which
doesn't have tunnel port termination point. And because
there are other termination point exist, it doesn't go and
read from data store. ProgrammeTunnelPort() method iterate
through these existing termination points and it doesn't find the
tunnel port and it returns without installing the Local Ingress
Bridge Rules. This patch first try to create a tunnel configuration
on integration bridge of both end node of the tunnel and then
installs the tunnel flows. Also while installing tunnel flows
It specifically look for tunnel port in the nodes update and if
it doesn't find that it reads it from data store.
Change-Id: I61e70c230051908a12f6ea93b9b2d046b699eccb
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Flavio Fernandes [Thu, 28 May 2015 17:37:06 +0000 (13:37 -0400)]
Changing .gitreview to use the stable/lithium branch
Change-Id: I2f11c94f9123196170491dc86029c5c95b9fad21
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Flavio Fernandes [Thu, 28 May 2015 17:32:40 +0000 (17:32 +0000)]
Merge "Add sonar report to SouthboundIT"
Flavio Fernandes [Thu, 28 May 2015 17:32:30 +0000 (17:32 +0000)]
Merge "Modify testGetOvsdbNodes to allow multiple connected nodes"
Flavio Fernandes [Thu, 28 May 2015 17:10:24 +0000 (17:10 +0000)]
Merge "Enable sonar for netvirt and southbound"
Sam Hague [Thu, 28 May 2015 17:03:07 +0000 (13:03 -0400)]
Add sonar report to SouthboundIT
Change-Id: Ia99e9d322ba21de85fe570926647398d8ada7806
Signed-off-by: Sam Hague <shague@redhat.com>
Sam Hague [Thu, 28 May 2015 16:58:33 +0000 (12:58 -0400)]
Modify testGetOvsdbNodes to allow multiple connected nodes
Change-Id: Id5640716224e3d0803fcc26822c3d567e0c95f76
Signed-off-by: Sam Hague <shague@redhat.com>
Sam Hague [Thu, 28 May 2015 13:01:12 +0000 (09:01 -0400)]
Enable sonar for netvirt and southbound
Change-Id: I97177b841ab0cfac92fe705f0aa6a61a2ab5f1eb
Signed-off-by: Sam Hague <shague@redhat.com>
Flavio Fernandes [Thu, 28 May 2015 12:56:38 +0000 (08:56 -0400)]
Bug 3404: Check dstNode together with src and dst to make sure tunnel can be created
Patch 2: add code review request
Change-Id: Ia170452f4275fb665d0ecbd6da304af6d1233474
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>