Stephen Kitt [Tue, 8 Dec 2015 08:07:26 +0000 (09:07 +0100)]
Extract neutron-utils from mdsal-utils
NeutronModelsDataStoreHelper adds a dependency on neutron, so it
should really be in its own bundle.
Change-Id: I051b304c77aeee9cbe5a1309bb2f512d87d7387a
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Peng Zhang [Fri, 4 Dec 2015 14:41:30 +0000 (22:41 +0800)]
Create UcastMacs by Listening DS Changes
PathSet 1:
1. create UcastMacsLocal/Remote command
2. add UcastMacs restconf api to postman collection
3. delete physical locator update/remove command
PatchSet 2:
1. change according review comments
PathSet 3:
1. change according review comments
Change-Id: If926651a84d4ae4bac496eb9ca76b36f67b0a3f3
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>
Sam Hague [Sat, 5 Dec 2015 02:43:03 +0000 (02:43 +0000)]
Merge "standalone demo fixes for SFC model changes"
Flavio Fernandes [Sat, 5 Dec 2015 02:32:48 +0000 (02:32 +0000)]
Merge "BUG 4718 - null pointer exception in NeutronSubnetChangeListener.java"
Sam Hague [Fri, 4 Dec 2015 22:36:01 +0000 (17:36 -0500)]
standalone demo fixes for SFC model changes
Change-Id: I8b9d6fac59f3c3002e7af8843df2fcb1d5ab43d8
Signed-off-by: Sam Hague <shague@redhat.com>
Sam Hague [Fri, 4 Dec 2015 16:19:25 +0000 (16:19 +0000)]
Merge "Use a logger instead of printStackTrace"
Flavio Fernandes [Fri, 4 Dec 2015 16:05:15 +0000 (16:05 +0000)]
Merge "Fix updatedUMacsRemoteRows null check"
Sam Hague [Fri, 4 Dec 2015 14:52:29 +0000 (14:52 +0000)]
Merge "update IT for new SFC model changes for DPLs"
Sam Hague [Fri, 4 Dec 2015 13:43:32 +0000 (13:43 +0000)]
Merge "OVSDB QoS - move QoS and Queue lists to OVSDB Node"
Sam Hague [Fri, 4 Dec 2015 13:38:43 +0000 (13:38 +0000)]
Merge "Create Physical Port By Listening on DS changes"
Sam Hague [Wed, 2 Dec 2015 23:13:34 +0000 (18:13 -0500)]
update IT for new SFC model changes for DPLs
Change-Id: Ia9f13fb72da10d21d521e5ba1d7746f6980356fe
Signed-off-by: Sam Hague <shague@redhat.com>
Stephen Kitt [Fri, 4 Dec 2015 11:36:00 +0000 (12:36 +0100)]
Use a logger instead of printStackTrace
Drop commented code.
local_ip -> localIp to follow conventions.
Change-Id: I6b6f674d70af3eb894819d15fb80b762678e3742
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Fri, 4 Dec 2015 10:25:54 +0000 (11:25 +0100)]
Fix updatedUMacsRemoteRows null check
The null check confuses Sonar; since the member variables are never
null (TyperUtils.extractRowsUpdated never returns null), and are only
initialised in the constructor, make them final and drop the null
check. The isEmpty() check is redundant with the for loop.
Remove the logger which isn't used.
Clean up some whitespace issues.
Change-Id: Ia234546957ff11901300149a5bac45c7bc0c9c96
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Isaku Yamahata [Thu, 3 Dec 2015 22:00:20 +0000 (14:00 -0800)]
BUG 4718 - null pointer exception in NeutronSubnetChangeListener.java
When subnet are created/deleted, the following null pointer exception
occurs.
Although the bug highlights only neutron subnet case, this patch
synchronizes null pointer checks in org.opendaylight.ovsdb.openstack.
netvirt.translator.iaware.impl.Neutron*ChangeListener.fromMd() to
the corresponding ones in
org.opendaylight.neutron.transcriber.Neutron*Interface.fromMd()
> 2015-12-03 10:18:45,889 | TRACE | lt-dispatcher-32 | NeutronSubnetChangeListener | 267 - org.opendaylight.ovsdb.openstack.net-virt - 1.2.1.SNAPSHOT | Data changes : Translated
> DataChangeEvent{created={KeyedInstanceIdentifier{targetType=interface org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet, pat
> h=[org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.rev150712.Neutron, org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.Subnets, org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.subnets.rev150712.subnets.attributes.subnets.Subnet[key=SubnetKey [_uuid=Uuid [_value=
0c103011-92f2-4e88-985a-
10dd56b67a95]]]]}=Subnet{getAllocationPools=[AllocationPools{getEnd=10.100.0.14, getStart=10.100.0.1, augmentations={}}], getCidr=10.100.0.0/28, getDnsNameservers=[], getIpVersion=class org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.constants.rev150712.IpVersionV4, getName=, getNetworkId=Uuid [_value=
17ce32b1-455e-4c2f-8819-
b5a1374637ed], getTenantId=Uuid [_value=
dee4a5dd-9482-4cf5-9c26-
fc492cef01a2], getUuid=Uuid [_value=
0c103011-92f2-4e88-985a-
10dd56b67a95], isEnableDhcp=true, augmentations={}}}, updated={}, removed=[], dom=DOMImmutableDataChangeEvent [created=[/(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}]/ip-version, /(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}]/enable-dhcp, /(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}]/network-id, /(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}], /(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}]/allocation-pools, /(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}]/tenant-id, /(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}]/uuid, /(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}]/name, /(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}]/dns-nameservers, /(urn:opendaylight:neutron?revision=2015-07-12)neutron/subnets/subnet/subnet[{(urn:opendaylight:neutron?revision=2015-07-12)uuid=
0c103011-92f2-4e88-985a-
10dd56b67a95}]/cidr], updated=[], removed=[]]}
> 2015-12-03 10:18:45,889 | ERROR | lt-dispatcher-32 | DataChangeListener | 140 - org.opendaylight.controller.sal-distributed-datastore - 1.3.0.SNAPSHOT | Error notifying listener org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.impl.NeutronSubnetChangeListener
> java.lang.NullPointerException
> at org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.impl.NeutronSubnetChangeListener.fromMd(NeutronSubnetChangeListener.java:145)[267:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.impl.NeutronSubnetChangeListener.createSubnet(NeutronSubnetChangeListener.java:97)[267:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
> at org.opendaylight.ovsdb.openstack.netvirt.translator.iaware.impl.NeutronSubnetChangeListener.onDataChanged(NeutronSubnetChangeListener.java:87)[267:org.opendaylight.ovsdb.openstack.net-virt:1.2.1.SNAPSHOT]
> at org.opendaylight.controller.md.sal.binding.impl.AbstractForwardedDataBroker$TranslatingDataChangeInvoker.onDataChanged(AbstractForwardedDataBroker.java:143)[115:org.opendaylight.controller.sal-binding-broker-impl:1.3.0.SNAPSHOT]
> at org.opendaylight.controller.cluster.datastore.DataChangeListener.dataChanged(DataChangeListener.java:66)[140:org.opendaylight.controller.sal-distributed-datastore:1.3.0.SNAPSHOT]
> at org.opendaylight.controller.cluster.datastore.DataChangeListener.handleReceive(DataChangeListener.java:39)[140:org.opendaylight.controller.sal-distributed-datastore:1.3.0.SNAPSHOT]
> at org.opendaylight.controller.cluster.common.actor.AbstractUntypedActor.onReceive(AbstractUntypedActor.java:34)[136:org.opendaylight.controller.sal-clustering-commons:1.3.0.SNAPSHOT]
> at akka.actor.UntypedActor$$anonfun$receive$1.applyOrElse(UntypedActor.scala:167)[125:com.typesafe.akka.actor:2.3.14]
> at akka.actor.Actor$class.aroundReceive(Actor.scala:467)[125:com.typesafe.akka.actor:2.3.14]
> at akka.actor.UntypedActor.aroundReceive(UntypedActor.scala:97)[125:com.typesafe.akka.actor:2.3.14]
> at akka.actor.ActorCell.receiveMessage(ActorCell.scala:516)[125:com.typesafe.akka.actor:2.3.14]
> at akka.actor.ActorCell.invoke(ActorCell.scala:487)[125:com.typesafe.akka.actor:2.3.14]
> at akka.dispatch.Mailbox.processMailbox(Mailbox.scala:238)[125:com.typesafe.akka.actor:2.3.14]
> at akka.dispatch.Mailbox.run(Mailbox.scala:220)[125:com.typesafe.akka.actor:2.3.14]
> at akka.dispatch.ForkJoinExecutorConfigurator$AkkaForkJoinTask.exec(AbstractDispatcher.scala:397)[125:com.typesafe.akka.actor:2.3.14]
> at scala.concurrent.forkjoin.ForkJoinTask.doExec(ForkJoinTask.java:260)[122:org.scala-lang.scala-library:2.10.4.v20140209-180020-VFINAL-
b66a39653b]
> at scala.concurrent.forkjoin.ForkJoinPool$WorkQueue.runTask(ForkJoinPool.java:1339)[122:org.scala-lang.scala-library:2.10.4.v20140209-180020-VFINAL-
b66a39653b]
> at scala.concurrent.forkjoin.ForkJoinPool.runWorker(ForkJoinPool.java:1979)[122:org.scala-lang.scala-library:2.10.4.v20140209-180020-VFINAL-
b66a39653b]
> at scala.concurrent.forkjoin.ForkJoinWorkerThread.run(ForkJoinWorkerThread.java:107)[122:org.scala-lang.scala-library:2.10.4.v20140209-180020-VFINAL-
b66a39653b]
Change-Id: Icc0957fc961aae7ef277b57df9d8ce4f4b923d24
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Sam Hague [Wed, 2 Dec 2015 23:12:42 +0000 (18:12 -0500)]
Fix for wrong tun_dst
Change-Id: Iee2066da9c3f4af393583e013462bf8caa7d96eb
Signed-off-by: Sam Hague <shague@redhat.com>
Peng Zhang [Thu, 26 Nov 2015 14:14:22 +0000 (22:14 +0800)]
Create Physical Port By Listening on DS changes
PatchSet 2&3:
share code and change it according comments
PatchSet 4:
rebase on 'Create Physical Switch'
PathchSet 5:
1.rebase on 'Yang changes and cleanup'
2.finish creating physical port
3.rewrite HwvtepOperationalState
PatchSet 6:
change code according comments
PatchSet 7:
rebase on master branch
PathchSet 8:
fix a nullpoint bug
Change-Id: I425336aea3b055ee4d7e75bd26490e194340e3af
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>
Eric Multanen [Tue, 1 Dec 2015 21:50:18 +0000 (13:50 -0800)]
OVSDB QoS - move QoS and Queue lists to OVSDB Node
The QoS and Queue tables are root tables in OVSDB. Updates to
these tables can occur independently from the port table - so
this patch proposes to move lists of QoS and Queue entries to
the ovsdb-node-attributes (i.e. OVSDB Node) object in the MD-SAL.
v2 - removed the 'do not merge' notice from subject line
Change-Id: I77654f144ec6876f0a807b6b723d723e691215f1
Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Isaku Yamahata [Thu, 3 Dec 2015 00:26:46 +0000 (16:26 -0800)]
Bug 4704 - unbreak compile error of missing symbol of getSubnets
Due to the changeset of neutron nerthbound of
8f43dc56a5e2684ffcc2de4435e87d8ea68a06e6, the following compilation errors
occurs. This patch resolves it by removing those unused functions.
NOTE: This is a compatibility breakage by neutron northbound and such
breakage should be fixed somehow.
Given that the result of getSubnets() will be unreliable (so its usage
is discouraged) and that ovsdb/netvirt already doesn't use
it and related methods, it makes sense to remove references to those
methods.
> [INFO] -------------------------------------------------------------
> [ERROR] COMPILATION ERROR :
> [INFO] -------------------------------------------------------------
> [ERROR] /home/yamahata/openstack/odl/odl/ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronNetworkChangeListener.java:[131,20] cannot find symbol
> symbol: method getSubnets()
> location: variable network of type org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network
> [ERROR] /home/yamahata/openstack/odl/odl/ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/iaware/impl/NeutronNetworkChangeListener.java:[133,39] cannot find symbol
> symbol: method getSubnets()
> location: variable network of type org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network
> [ERROR] /home/yamahata/openstack/odl/odl/ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/crud/impl/NeutronNetworkInterface.java:[137,20] cannot find symbol
> symbol: method getSubnets()
> location: variable network of type org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network
> [ERROR] /home/yamahata/openstack/odl/odl/ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/crud/impl/NeutronNetworkInterface.java:[139,39] cannot find symbol
> symbol: method getSubnets()
> location: variable network of type org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.Network
> [ERROR] /home/yamahata/openstack/odl/odl/ovsdb/openstack/net-virt/src/main/java/org/opendaylight/ovsdb/openstack/netvirt/translator/crud/impl/NeutronNetworkInterface.java:[239,27] cannot find symbol
> symbol: method setSubnets(java.util.List<org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid>)
> location: variable networkBuilder of type org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.networks.rev150712.networks.attributes.networks.NetworkBuilder
Change-Id: Ifdcc3c71968bfd2e1773b609b36d7902d66a30da
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Sam Hague [Wed, 2 Dec 2015 13:59:58 +0000 (13:59 +0000)]
Merge "Delete without reading"
Stephen Kitt [Thu, 26 Nov 2015 08:56:56 +0000 (09:56 +0100)]
Delete without reading
MD-SAL ignores deletions of non-present nodes, so it's safe to delete
without reading first.
Change-Id: I825e46f2e07310d3fddedc1d5200dc80b35d8456
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Peng Zhang [Tue, 1 Dec 2015 12:04:28 +0000 (20:04 +0800)]
Add Others Command Skeleton Code
PatchSet2:
rebase on master
PatchSet3:
rebase on "Fix IT tests as per as API change in SFC"
Change-Id: I4b437c6c61f733d91a4bf7b63d8167e2f37f7a85
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>
Flavio Fernandes [Tue, 1 Dec 2015 19:18:38 +0000 (19:18 +0000)]
Merge "Fix IT tests as per as API change in SFC"
Sam Hague [Tue, 1 Dec 2015 16:18:12 +0000 (16:18 +0000)]
Merge "Yang changes and cleanup"
adetalhouet [Tue, 1 Dec 2015 16:03:53 +0000 (11:03 -0500)]
Fix IT tests as per as API change in SFC
Those changes were made in SFC:
https://git.opendaylight.org/gerrit/#/c/29303/16/sfc-model/src/main/yang/service-function-forwarder.yang
This patch reflects those changes
Change-Id: I4c07b8b0f9b9e5957b24824fd8da8edd2155cbc6
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>
Flavio Fernandes [Tue, 1 Dec 2015 13:54:17 +0000 (13:54 +0000)]
Merge "Avoid exceptions with IPv6 subnets"
Vishal Thapar [Tue, 1 Dec 2015 03:59:36 +0000 (09:29 +0530)]
Yang changes and cleanup
This commits changes how locator-sets are defined and used
in yang file. This also includes code changes to accomodate
yang file changes and some refactoring to make code bit more
simpler and added some error checking.
Patchset2:
1. Added uuid fields for some objects
2. Fixes some issues found in testing physicalLocatorUpdate
Change-Id: Ia55a3bbd15030c7a8fb5cf6276e705097e1da57e
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
SridharG [Thu, 26 Nov 2015 15:18:21 +0000 (15:18 +0000)]
Avoid exceptions with IPv6 subnets
In a setup where ODL is used for L2 support and Neutron L3 agent
is used for Routing, we see some Java exceptions when IPv6 subnets
are created. Because of the Java exception, Layer2 connectivity
is lost and we are unable to work with IPv6 subnets. In this patch,
we log an error instead of exception.
Patch set 2: add other places in netvirt code where ipv6 (address and prefix)
could be used and it would be improperly interpreted.
Patch set 3: minor code review changes.
Change-Id: I4e253f8f86a1a3f027e57861549e9a1f98ff5fbf
Signed-off-by: Sridhar Gaddam <sgaddam@redhat.com>
Signed-off-by: SridharG <sgaddam@redhat.com>
Sam Hague [Mon, 30 Nov 2015 16:36:01 +0000 (16:36 +0000)]
Merge "Use odlparent-lite as artifacts parent"
Sam Hague [Mon, 30 Nov 2015 16:33:14 +0000 (16:33 +0000)]
Merge "Create Physical Switch by listening on DS"
Sam Hague [Mon, 30 Nov 2015 16:30:50 +0000 (16:30 +0000)]
Merge changes from topic 'sonar-cleanup'
* changes:
Remove unused code and imports
General code cleanup
Simplify AbstractNeutronInterface::readMd
Sam Hague [Mon, 30 Nov 2015 16:30:23 +0000 (16:30 +0000)]
Merge "Drop redundant ofPort check"
Sam Hague [Mon, 30 Nov 2015 16:29:50 +0000 (16:29 +0000)]
Merge "Inline return values"
Sam Hague [Mon, 30 Nov 2015 16:18:26 +0000 (16:18 +0000)]
Merge "Added Update and Remove commands code"
Sam Hague [Mon, 30 Nov 2015 16:18:09 +0000 (16:18 +0000)]
Merge "Changes to LogicalSwitchUpdateCommand in transact as per new yang"
Thanh Ha [Sun, 29 Nov 2015 22:28:55 +0000 (17:28 -0500)]
Use odlparent-lite as artifacts parent
We created odlparent-lite to provide a minimal pom which allows projects
to publish to the correct server. Without this ${project}-artifacts may
fail to deploy to Nexus.
Change-Id: Iec5b15f027a64ad9498fcd9c874be1b4e57e682c
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Peng Zhang [Thu, 26 Nov 2015 10:47:22 +0000 (18:47 +0800)]
Create Physical Switch by listening on DS
PatchSet2:
1. fix update issue
2. update postman collection
PatchSet3:
1. change according to review comment
PatchSet4:
1. fix IP To String issue
Change-Id: I16357d027bdcd8b03e2f0a0d2bedf57bd4a4864f
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>
Anil Vishnoi [Fri, 27 Nov 2015 21:07:57 +0000 (21:07 +0000)]
Merge "Avoid calling the String constructor explicitly"
karanrajsingh [Thu, 26 Nov 2015 11:58:53 +0000 (17:28 +0530)]
Added Update and Remove commands code
McastMacsLocalUpdate/Remove done.
UcastMacsLocalUpdate/Remove done.
LogicalSwitchRemoveCommand updated as per new yang.
Some minor fixes done in PhysicalLocatorUpdateCommand.
Redundant Blanks and comments removed.
Some comments Updated.
Change-Id: I4e19fc42e0c935da99e3330e442067b2c62be694
Signed-off-by: karanrajsingh <karan.raj.s.singh@ericsson.com>
Peng Zhang [Wed, 25 Nov 2015 08:22:06 +0000 (16:22 +0800)]
Changes to LogicalSwitchUpdateCommand in transact as per new yang
1. changes to LogicalSwitchUpdateCommand in transact
2. remove redundant code
PatchSet 2:
1. Get "extractCreated" back
PatchSet 3:
1. Change postman collection as per new yang
Patchset 4:
Fixed update issue in LogicalSwitchUpdate command
Change-Id: If2f34ed570bfa0f265c976178272dc07674766ec
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
Stephen Kitt [Thu, 26 Nov 2015 08:55:13 +0000 (09:55 +0100)]
Remove unused code and imports
Change-Id: I9f9fe46abc4feba4a0795b8380b5c9bf4e894716
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 26 Nov 2015 08:47:20 +0000 (09:47 +0100)]
General code cleanup
Use <> where appropriate.
Remove a couple of unnecessary unboxing statements.
Reduce variable scope.
Simplify a couple of boolean expressions (Optional<T>.get() is
instanceof T if it's not null).
Fix up some documentation.
Change-Id: I6db39ad20e3245c03fff94cb96fbc8b09f4f57dc
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 26 Nov 2015 08:44:25 +0000 (09:44 +0100)]
Simplify AbstractNeutronInterface::readMd
Use B for the parameter type to avoid masking the main T parameter
type.
Inline the optional handling.
Change-Id: I3f54589aec36b7fb378d7a0936743961946aa11b
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 26 Nov 2015 08:43:05 +0000 (09:43 +0100)]
Drop redundant ofPort check
Because of the break in the loop, ofPort is always 0 when the if
statement is reached, so it can safely be removed.
Change-Id: Ia700962e9d5a7d8a4dd0fa1af61811694ac366fe
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Thu, 26 Nov 2015 08:24:41 +0000 (09:24 +0100)]
Inline return values
Change-Id: Iea346d6682801f11e69a22c0330aabcef2a0dd4c
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Sam Hague [Wed, 25 Nov 2015 21:21:20 +0000 (21:21 +0000)]
Merge "Add option to use netdev datapath_type"
Sam Hague [Wed, 25 Nov 2015 20:51:46 +0000 (15:51 -0500)]
Add option to use netdev datapath_type
Change-Id: Ica37449612dc2465ddd71bfc19caa9a599354c34
Signed-off-by: Sam Hague <shague@redhat.com>
Stephen Kitt [Wed, 25 Nov 2015 16:51:09 +0000 (17:51 +0100)]
Avoid calling the String constructor explicitly
Change-Id: I3f57df03746acafe11def7cdced65822b31117a5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Vishal Thapar [Wed, 25 Nov 2015 14:30:30 +0000 (20:00 +0530)]
yang changes, PhysicalLocator and UcastMacsRemote
1. Added PhysicalLocator and UCastMacsRemote Update code.
2. Yang: Modified logical-switch-ref to correct type based on recent
changes
3. Yang: Moved all mac attributes to Global node from PhysicalSwitch.
Change-Id: I1a51ea9a4423144892488d9de6d01e7b5271d18b
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
Sam Hague [Wed, 25 Nov 2015 14:45:57 +0000 (14:45 +0000)]
Merge "Changes to LogicalSwitchUpdate as per new yang"
Sam Hague [Wed, 25 Nov 2015 14:42:25 +0000 (14:42 +0000)]
Merge "Added UT and refactored code 1) Added UT for SecurityServicesImpl and SecurityGroupCacheManagerImpl. 2) Refactored a method in SecurityServicesManager."
Sam Hague [Wed, 25 Nov 2015 14:41:47 +0000 (14:41 +0000)]
Merge "UT for ProtocolRemovedCommand class"
Sam Hague [Wed, 25 Nov 2015 14:41:13 +0000 (14:41 +0000)]
Merge "Clean up L2ForwardingService"
Sam Hague [Wed, 25 Nov 2015 14:15:01 +0000 (14:15 +0000)]
Merge "Move NetvirtIT to use latest IT parent poms"
Sam Hague [Wed, 25 Nov 2015 13:43:46 +0000 (08:43 -0500)]
Move NetvirtIT to use latest IT parent poms
Change-Id: If59f183f08b0a98514ff1db4c6e0fb7cc1c2ed7c
Signed-off-by: Sam Hague <shague@redhat.com>
karanrajsingh [Tue, 24 Nov 2015 16:13:56 +0000 (21:43 +0530)]
Changes to LogicalSwitchUpdate as per new yang
Patchset2: review comments
Change-Id: I0bff6c4a2dbcb63fde20da8c2595061af5e8bca2
Signed-off-by: karanrajsingh <karan.raj.s.singh@ericsson.com>
Aswin Suryanarayanan [Tue, 24 Nov 2015 17:48:03 +0000 (23:18 +0530)]
Added UT and refactored code
1) Added UT for SecurityServicesImpl and SecurityGroupCacheManagerImpl.
2) Refactored a method in SecurityServicesManager.
Change-Id: I039d34869d182bc19ad89733092e0a5f35f67295
Signed-off-by: Aswin Suryanarayanan <aswin.suryanarayanan@hp.com>
Sam Hague [Tue, 24 Nov 2015 11:47:05 +0000 (11:47 +0000)]
Merge "Change hwvtep.yang and fix related code"
Peng Zhang [Tue, 24 Nov 2015 05:33:39 +0000 (13:33 +0800)]
Change hwvtep.yang and fix related code
1. Change hwvtep.yang based on https://git.opendaylight.org/gerrit/#/c/29797/.
2. Fix related code.
Change-Id: I314ddc23daebe59bd3ed241fa80803ce4845ef37
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>
Sam Hague [Tue, 24 Nov 2015 01:34:07 +0000 (01:34 +0000)]
Merge "Test code for failing IT test 2"
Sam Hague [Tue, 24 Nov 2015 01:33:45 +0000 (20:33 -0500)]
Test code for failing IT test 2
Change-Id: Idf46604a17d5b96f3b62f29f17be1fbeb12d2b67
Signed-off-by: Sam Hague <shague@redhat.com>
Sam Hague [Mon, 23 Nov 2015 22:51:12 +0000 (17:51 -0500)]
Test code for failing IT test
Change-Id: I250408640b46e60d0ae67bfe75b898fb077ea2ff
Signed-off-by: Sam Hague <shague@redhat.com>
Layth Al-Ani [Thu, 12 Nov 2015 20:49:16 +0000 (15:49 -0500)]
UT for ProtocolRemovedCommand class
Change-Id: Icd2b454b49b214735540c20281d6611071309947
Signed-off-by: Layth Al-Ani <lalani@inocybe.com>
Signed-off-by: adetalhouet <adetalhouet@inocybe.com>
Stephen Kitt [Fri, 20 Nov 2015 16:44:05 +0000 (17:44 +0100)]
Clean up L2ForwardingService
Avoid multiple instanciations of MatchBuilders.
Factor common code involved in FlowBuilder setup and instruction
construction, adding appropriate methods in FlowUtils and
InstructionUtils.
Use fluent-style builders.
Drop appendResubmitLocalFlood() which isn't used.
Avoid multiple creations of the same Uri in loops.
Two of the FlowBuilders don't have a setStrict() call; is that
intentional?
Change-Id: I984a735229613bd013443ff16815a1566a74b2d5
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Sam Hague [Sun, 22 Nov 2015 15:58:28 +0000 (15:58 +0000)]
Merge "L3: Add eth to br-ex"
Stephen Kitt [Thu, 19 Nov 2015 17:41:29 +0000 (18:41 +0100)]
Handle new base type provided by MD-SAL
When deserialized, OvsdbBridgeAugmentation's datapathType is now
initialized as DatapathTypeBase instead of null. This is now handled
as an absent value in SouthboundMapper instead of producing an
IllegalArgumentException.
The exception's message is clarified to trace the unknown datapath
type class, instead of the value retrieved from the map (which is
always null in this case).
Change-Id: Ie10ff09878bf182d4747d63f1580a37dfd71ac88
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Sam Hague [Thu, 19 Nov 2015 02:28:45 +0000 (02:28 +0000)]
Merge "Remove a few obsolete dependencies"
Stephen Kitt [Wed, 18 Nov 2015 13:36:12 +0000 (14:36 +0100)]
Remove a few obsolete dependencies
A security upgrade for commons-collections was released, but it turns
out ovsdb no longer uses it; this patch removes that from dependency
management along with a couple of other obsolete dependencies.
Change-Id: I7d3ba0c908e5306475f35ce9e07b0099f9c8f4cf
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Tue, 17 Nov 2015 14:03:56 +0000 (15:03 +0100)]
Use an Autoclosable to guarantee bridge clean-up
TestBridge encapsulates a bridge created in OVSDB; with
try-with-resources this means we know we always clean the bridges up.
Change-Id: Iac00febaa8525d985bd4ba2b71393dd1d086c314
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Stephen Kitt [Tue, 17 Nov 2015 09:57:17 +0000 (10:57 +0100)]
Share a single OVSDB connection among all tests
This helps SouthboundIT greatly, and the OVSDB is clean after the
tests finish.
Change-Id: I0ee431a269468b973cc01bd07bb766950f0b5a52
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Sam Hague [Mon, 16 Nov 2015 17:49:31 +0000 (17:49 +0000)]
Merge "Maven cleanup and features-parent migration"
Sam Hague [Mon, 16 Nov 2015 17:48:02 +0000 (17:48 +0000)]
Merge "Added code for PhysicalPort, LogicalSwitch"
Sam Hague [Mon, 16 Nov 2015 17:46:17 +0000 (17:46 +0000)]
Merge "Added support to update flows for induvidual security rule add/remove , after the SG is associated with a port."
Sam Hague [Mon, 16 Nov 2015 17:32:18 +0000 (17:32 +0000)]
Merge "Use MD-SAL events to react to OVSDB changes"
Sam Hague [Mon, 16 Nov 2015 17:31:23 +0000 (17:31 +0000)]
Merge "SouthboundIT: merge the CRUD tests methods"
Stephen Kitt [Mon, 16 Nov 2015 16:56:42 +0000 (17:56 +0100)]
Maven cleanup and features-parent migration
Use features-parent {{VERSION}} to allow dropping a number of Maven
properties.
Upgrade commons-collections (1.0 -> 3.2.1) and httpcomponents (4.2.1
-> 4.4.1).
Drop a number of obsolete components from dependency management
(controller:commons.northbound, controller:containermanager,
controller:forwardingrulesmanager, controller:sal,
controller:switchmanager.
Use odlparent-provided versions of commons-lang3, most netty
components, and the equinoxSDK381 components.
Drop obsolete io.netty:netty:3.8.0 dependency (replaced by
io.netty:netty-all in versions 4+).
Remove some duplicate dependency declarations.
Use "<relativePath/>" instead of "<relativePath></relativePath>" now
that it's safe to do so (the auto-release scripts handle it).
Change-Id: I62a385ba49d79e045934ec706f69313425553ae0
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Sam Hague [Mon, 16 Nov 2015 13:43:54 +0000 (08:43 -0500)]
Bug 4641 - openstack.net-virt-sfc-features fail to find artifacts
Change-Id: Ie9110ebcfb7412015c171e0add5faa89ecd5d293
Signed-off-by: Sam Hague <shague@redhat.com>
Vishal Thapar [Fri, 13 Nov 2015 13:11:45 +0000 (18:41 +0530)]
Added code for PhysicalPort, LogicalSwitch
1. Added PhysicalPortUpdate and PhysicalPortRemove
2. Added LogicalSwitchUpdate and LogicalSwitchRemove
With these changes physical-port and logical-switch changes on device are
reflected in OperationalDS.
Patchset2:
1. Rebase
2. Add VlanBindings to OperationalDataStore
3. Use env vars for IPs in postman collection
4. Fixed a bug in postman collection
Change-Id: Ic1b3d0e15088db6d81316ad88c2db5299a9c9be0
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
Sam Hague [Mon, 16 Nov 2015 02:30:18 +0000 (02:30 +0000)]
Merge "Listen config DS then push configuration to switch"
Sam Hague [Mon, 16 Nov 2015 02:29:55 +0000 (02:29 +0000)]
Merge "Bug 4641 - openstack.net-virt-sfc-features fail to find artifacts"
Sam Hague [Mon, 16 Nov 2015 01:59:10 +0000 (20:59 -0500)]
Bug 4641 - openstack.net-virt-sfc-features fail to find artifacts
Change-Id: Iccc0c5d817db0014842f5e7023b173c67af728e2
Signed-off-by: Sam Hague <shague@redhat.com>
Peng Zhang [Thu, 12 Nov 2015 03:01:04 +0000 (11:01 +0800)]
Listen config DS then push configuration to switch
Patch Set 1:
1. Add skeletal code for command pattern to push configuration to switch, function TBD.
2. Implement LogicalSwitchUpdateCommand.
Patch Set 2:
1. Fix whiteapce issues.
2. Add 'logical-switch-managed-by' for logical-switch-attribute in hwvtep.yang.
3. Use hcm.getConnetionInstance(node) added in https://git.opendaylight.org/gerrit/#/c/29599.
Patch Set 3:
1. Fix LOG severities and delete some TODOes.
2. Use HwvtepSchemaConstats.databaseName for Hwvtep database name.
Change-Id: I0fe5dafdf9ecfa91ee8c757c4b694a50e6cbed35
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>
Sam Hague [Sat, 14 Nov 2015 06:20:12 +0000 (06:20 +0000)]
Merge "rework sfc flows 2"
Sam Hague [Sat, 14 Nov 2015 06:06:58 +0000 (06:06 +0000)]
Merge "Patch Set 1: Add postman collection for HwvtepSouthbound"
Sam Hague [Sat, 14 Nov 2015 05:44:31 +0000 (00:44 -0500)]
rework sfc flows 2
Change-Id: I9cb93d19d54cd7bcf7d93ab82e17dbe7579cafb3
Signed-off-by: Sam Hague <shague@redhat.com>
Anil Vishnoi [Fri, 13 Nov 2015 17:11:12 +0000 (17:11 +0000)]
Merge "Security Groups: Added support for ICMP, ALL ICMP and Others protocol Change-Id: Iedc3061ccaf03f21b9a39da8a4b8b27c4baea6f0 Signed-off-by: raveek <raveek@hp.com>"
Flavio Fernandes [Fri, 13 Nov 2015 10:53:05 +0000 (10:53 +0000)]
Merge "Fixed possible null point exception in node manager entries update code"
Peng Zhang [Thu, 12 Nov 2015 15:13:05 +0000 (23:13 +0800)]
Patch Set 1:
Add postman collection for HwvtepSouthbound
Patch Set 2:
Add brief introduction in README
Patch Set 3:
Change to multi-line version
Patch Set 4:
Fix whitespace issues
Patch Set 5:
Fix whitespace issues: a trailing space missed
Patch Set 6:
recheck
Change-Id: If7a764ca56ced4316aa04ff8538bf12849d60dd9
Signed-off-by: Peng Zhang <pzhang@ctbri.com.cn>
Sam Hague [Fri, 13 Nov 2015 04:22:28 +0000 (04:22 +0000)]
Merge "add rsp option"
Sam Hague [Fri, 13 Nov 2015 04:19:47 +0000 (04:19 +0000)]
Merge "added getConnectionInstance by Node"
Sam Hague [Fri, 13 Nov 2015 03:48:16 +0000 (22:48 -0500)]
add rsp option
Change-Id: Idd0410436861ccc13ad581e42e75ea793102e3ad
Signed-off-by: Sam Hague <shague@redhat.com>
Flavio Fernandes [Fri, 13 Nov 2015 01:57:50 +0000 (01:57 +0000)]
Merge "UT for remaining classes in ovsdb.southbound.ovsdb.transact"
Flavio Fernandes [Fri, 13 Nov 2015 01:57:00 +0000 (01:57 +0000)]
Merge "Declare expected exceptions"
Flavio Fernandes [Fri, 13 Nov 2015 01:55:59 +0000 (01:55 +0000)]
Merge "Avoid logging stacktraces for schema version mismatches"
Anil Vishnoi [Fri, 13 Nov 2015 01:47:23 +0000 (07:17 +0530)]
Fixed possible null point exception in node manager entries update code
Change-Id: Iac231117e592f23c6e1362b71e76ae13d6c98a40
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Flavio Fernandes [Thu, 12 Nov 2015 23:47:28 +0000 (23:47 +0000)]
Merge "Bug 4611: null pointer exception while processing interface event"
Anil Vishnoi [Tue, 10 Nov 2015 20:50:37 +0000 (02:20 +0530)]
For controller initiated connection, there is race condition
while disconnecting the device from controller, that does
not allow one of the non-owner southbound instance to disconnect
the device from the plugin. Race condition was occuring because
OvsdbConnectionInstance was not stored in the internal cache
at correct point in control flow.It gets added when EntityOwnershipChange
event happens, so when data change event for disconnection occured,
it requires OvsdbConnectionInstance to be in cache to disconnect
from the device, but OvsdbConnectionInstance was not in the cache
becuse EntityOwnershipService event was not recieved by that non-owner instance.
Conflicts:
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/OvsdbConnectionManager.java
southbound/southbound-impl/src/main/java/org/opendaylight/ovsdb/southbound/SouthboundProvider.java
Change-Id: I3861b5f2907d08709a3bd1aa4f4ecfbfd444351d
Signed-off-by: Anil Vishnoi <vishnoianil@gmail.com>
Sam Hague [Thu, 12 Nov 2015 20:29:33 +0000 (20:29 +0000)]
Merge "rework sfc flows"
Sam Hague [Thu, 12 Nov 2015 17:30:30 +0000 (12:30 -0500)]
rework sfc flows
Change-Id: I1789ce135a8b08de4c4321fdd69cec73bc4a638c
Signed-off-by: Sam Hague <shague@redhat.com>
Vishal Thapar [Thu, 12 Nov 2015 15:13:23 +0000 (20:43 +0530)]
added getConnectionInstance by Node
This is required for https://git.opendaylight.org/gerrit/#/c/29575/
Change-Id: Iceab17399b973dab7c1fbf47d21af6989aa2f49e
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
Sam Hague [Wed, 11 Nov 2015 21:25:06 +0000 (21:25 +0000)]
Merge "workaround for sfc part 2"