Ryan Moats [Wed, 30 Sep 2015 21:33:41 +0000 (21:33 +0000)]
Merge "transcriber: consolidate getAll() logic"
Ryan Moats [Wed, 30 Sep 2015 21:32:31 +0000 (21:32 +0000)]
Merge "Bug 4285 - NeutronSubnetInterface.fromMd() null pointer exception"
Stephen Kitt [Wed, 30 Sep 2015 08:06:46 +0000 (10:06 +0200)]
Fix -Dkaraf.debug
The debug setup needs to come after the main distribution
configuration. This patch moves it to the end, instead of the
commented code which used to enable remote debugging.
Change-Id: I7fbeecf8e1a2063fb1f75c3e2b07df7f73c2f1e1
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Isaku Yamahata [Tue, 29 Sep 2015 23:24:18 +0000 (16:24 -0700)]
Bug 4285 - NeutronSubnetInterface.fromMd() null pointer exception
null pointer exception as follows when deleting subnet.
gatewayip, ipv6 ra mode, and ipv6 address mode can be null as
neutron api defines. So fromMd() methods should null check for those.
> 2015-09-29 15:39:16,122 | ERROR | p371782331-48632 | ContainerResponse | 126 - com.sun.jersey.jersey-server - 1.17.0 | The RuntimeException could not be mapped to a response, re-throwing to the HTTP container
> java.lang.NullPointerException
> at org.opendaylight.neutron.transcriber.NeutronSubnetInterface.fromMd(NeutronSubnetInterface.java:140)
> at org.opendaylight.neutron.transcriber.NeutronSubnetInterface.fromMd(NeutronSubnetInterface.java:50)
> at org.opendaylight.neutron.transcriber.AbstractNeutronInterface.get(AbstractNeutronInterface.java:314)
> at org.opendaylight.neutron.transcriber.AbstractNeutronInterface$6.action(AbstractNeutronInterface.java:323)
> at org.opendaylight.neutron.transcriber.AbstractNeutronInterface$6.action(AbstractNeutronInterface.java:320)
> at org.opendaylight.neutron.transcriber.AbstractNeutronInterface.chainWrapper1(AbstractNeutronInterface.java:94)
> at org.opendaylight.neutron.transcriber.AbstractNeutronInterface.get(AbstractNeutronInterface.java:319)
> at org.opendaylight.neutron.transcriber.NeutronSubnetInterface.getSubnet(NeutronSubnetInterface.java:80)
> at org.opendaylight.neutron.northbound.api.NeutronSubnetsNorthbound.deleteSubnet(NeutronSubnetsNorthbound.java:328)[364:org.opendaylight.neutron.northbound-api:0.6.0.SNAPSHOT]
> at sun.reflect.GeneratedMethodAccessor258.invoke(Unknown Source)
> at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)[:1.8.0_60]
> at java.lang.reflect.Method.invoke(Method.java:497)[:1.8.0_60]
> at com.sun.jersey.spi.container.JavaMethodInvokerFactory$1.invoke(JavaMethodInvokerFactory.java:60)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.model.method.dispatch.AbstractResourceMethodDispatchProvider$ResponseOutInvoker._dispatch(AbstractResourceMethodDispatchProvider.java:205)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.model.method.dispatch.ResourceJavaMethodDispatcher.dispatch(ResourceJavaMethodDispatcher.java:75)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.HttpMethodRule.accept(HttpMethodRule.java:302)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.ResourceClassRule.accept(ResourceClassRule.java:108)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.RootResourceClassesRule.accept(RootResourceClassesRule.java:84)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1511)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1442)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1391)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1381)[126:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.spi.container.servlet.WebComponent.service(WebComponent.java:416)[127:com.sun.jersey.servlet:1.17.0]
> at com.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:538)[127:com.sun.jersey.servlet:1.17.0]
> at com.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:716)[127:com.sun.jersey.servlet:1.17.0]
> at javax.servlet.http.HttpServlet.service(HttpServlet.java:668)[38:org.apache.geronimo.specs.geronimo-servlet_3.0_spec:1.0.0]
> at org.eclipse.jetty.servlet.ServletHolder.handle(ServletHolder.java:684)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1496)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlets.CrossOriginFilter.handle(CrossOriginFilter.java:247)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlets.CrossOriginFilter.doFilter(CrossOriginFilter.java:210)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1467)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:501)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.ops4j.pax.web.service.jetty.internal.HttpServiceServletHandler.doHandle(HttpServiceServletHandler.java:69)[53:org.ops4j.pax.web.pax-web-jetty:3.1.4]
> at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:137)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.java:557)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:231)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1086)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.ops4j.pax.web.service.jetty.internal.HttpServiceContext.doHandle(HttpServiceContext.java:240)[53:org.ops4j.pax.web.pax-web-jetty:3.1.4]
> at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:429)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:193)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1020)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:135)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.ops4j.pax.web.service.jetty.internal.JettyServerHandlerCollection.handle(JettyServerHandlerCollection.java:75)[53:org.ops4j.pax.web.pax-web-jetty:3.1.4]
> at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:116)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.Server.handle(Server.java:370)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AbstractHttpConnection.handleRequest(AbstractHttpConnection.java:494)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AbstractHttpConnection.headerComplete(AbstractHttpConnection.java:971)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AbstractHttpConnection$RequestHandler.headerComplete(AbstractHttpConnection.java:1033)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:644)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:235)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AsyncHttpConnection.handle(AsyncHttpConnection.java:82)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.io.nio.SelectChannelEndPoint.handle(SelectChannelEndPoint.java:696)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.io.nio.SelectChannelEndPoint$1.run(SelectChannelEndPoint.java:53)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:608)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:543)[44:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at java.lang.Thread.run(Thread.java:745)[:1.8.0_60]
Change-Id: I454889cb21a98bdbcf5207f6676634b139648d87
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Wed, 23 Sep 2015 17:17:12 +0000 (10:17 -0700)]
transcriber: consolidate getAll() logic
This patch factors out the logic of getAll()
Change-Id: I4e529bf7a4b3dfd7a4442ae0f63b4e03f23cb79b
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Ryan Moats [Fri, 25 Sep 2015 11:48:57 +0000 (11:48 +0000)]
Merge "Bug 4143 - Transation failed with OptimisticLockFailedException"
Ryan Moats [Fri, 25 Sep 2015 11:48:39 +0000 (11:48 +0000)]
Merge "transcriber: use transaction chain for optimization"
Ryan Moats [Fri, 25 Sep 2015 11:45:48 +0000 (11:45 +0000)]
Merge "Bug 4043 - remote ip prefix of security group is type of ietf ip-prefix"
Ryan Moats [Fri, 25 Sep 2015 11:44:30 +0000 (11:44 +0000)]
Merge "Bug 4224 - remote_ip_prefix of metering rule should be type of ip-prefix"
Ryan Moats [Fri, 25 Sep 2015 11:43:12 +0000 (11:43 +0000)]
Merge changes from topic 'bug/4218'
* changes:
Bug 4218 - northbound: return 404 when deleting unexisting uuid
northbound: introduce a base class for nortubhound classes
Ryan Moats [Wed, 23 Sep 2015 13:26:34 +0000 (13:26 +0000)]
Merge "neutron-spi: Introduce base class for Neutron object"
Isaku Yamahata [Sat, 15 Aug 2015 05:01:19 +0000 (22:01 -0700)]
Bug 4143 - Transation failed with OptimisticLockFailedException
transaction in AbstractNeutronInterface.updateMd() can abort with
OptimisticLockFailedException as follows when updating a same resource.
For example, when attaching an interface to a router,
neutron creates a port, then update it right after creation. It may
causes transaction abort.
o.o.controller.sal.restconf.impl.RestconfImpl#updateConfigurationData
has a similar issue and retries 2 times.
By following the precedence, add retry logic to updateMd() to mitigate
transaction abort.
> 2015-08-14 17:20:26,623 | WARN | ult-dispatcher-4 | ConcurrentDOMDataBroker | 157 - org.opendaylight.controller.sal-distributed-datastore - 1.3.0.SNAPSHOT | Tx: DOM-183 Error during phase CAN_COMMIT, starting Abort OptimisticLockFailedException{message=Optimistic lock failed., errorList=[RpcError [message=Optimistic lock failed., severity=ERROR, errorType=APPLICATION, tag=resource-denied, applicationTag=null, info=null, cause=org.opendaylight.yangtools.yang.data.api.schema.tree.ConflictingModificationAppliedException: Node was created by other transaction.]]}
Change-Id: I4fe57ad42867bbbfc38f4d0175ae417bc15afa0a
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Thu, 10 Sep 2015 23:37:08 +0000 (16:37 -0700)]
transcriber: use transaction chain for optimization
This patch makes transcriber use transaction chain.
The next step is to make subclasses use transaction
chain.
Related-Bug: 4143
Change-Id: I2f79877259acf8f642ffa4877552112f7b0da7b5
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Flavio Fernandes [Tue, 22 Sep 2015 19:37:44 +0000 (15:37 -0400)]
Add support for karaf.debug
This is the basic version, a better approach would be to use either
AbstractMdsalTestBase or AbstractConfigTestBase (but the impact is
greater).
Original gerrit [1] caused a regression in that the
keepRuntimeFolder() was done conditionally. That broke things and
had to be reverted.
[1]: https://git.opendaylight.org/gerrit/#/c/26983/
Change-Id: I9fcbdb12fed154d3e2c16908b58bb99418fdc098
Also-By: Stephen Kitt <skitt@redhat.com>
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Flavio Fernandes [Tue, 22 Sep 2015 19:33:30 +0000 (19:33 +0000)]
Merge "Revert "Add support for karaf.debug and karaf.keep.unpack""
Ryan Moats [Tue, 22 Sep 2015 19:21:51 +0000 (19:21 +0000)]
Revert "Add support for karaf.debug and karaf.keep.unpack"
This breaks our IT test reporting in jenkins, so let's try this again.
This reverts commit
d9c920c3a3e1fffcdd913e0a880ecbbef231d7fe.
Change-Id: I1592768f3d59d220f5fdad5a48070bf338c9787d
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 22 Sep 2015 16:40:19 +0000 (16:40 +0000)]
Merge "Make I*Aware interfaces deprecated"
Ryan Moats [Tue, 22 Sep 2015 16:39:55 +0000 (16:39 +0000)]
Merge "transcriber: consolidate crud logic"
Isaku Yamahata [Tue, 15 Sep 2015 10:38:10 +0000 (03:38 -0700)]
neutron-spi: Introduce base class for Neutron object
This patch introduce base class for Neutron object for code consolidation.
This is preparation for bug fixing 4157.
Change-Id: Ibc0fc28255c6fcfd022fd1feb2af079cff416a61
Related-Bug: 4157
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Flavio Fernandes [Tue, 22 Sep 2015 15:37:20 +0000 (11:37 -0400)]
Make I*Aware interfaces deprecated
Change-Id: If5995a4e4d2f8e75250da7a99a586f4e96ec00fb
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Isaku Yamahata [Mon, 31 Aug 2015 22:45:42 +0000 (15:45 -0700)]
Bug 4043 - remote ip prefix of security group is type of ietf ip-prefix
remote ip prefix of security group rule should be type of ietf ip-prefix,
not ip-address.
Change-Id: Ibd6c74272e9e3ea9926f0992632bf02303870f0a
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Mon, 31 Aug 2015 22:50:01 +0000 (15:50 -0700)]
Bug 4224 - remote_ip_prefix of metering rule should be type of ip-prefix
remote_ip_prefix of metering rule is type of ietf ip-prefix,
not ietf ip-address.
Change-Id: If76c8790812e33f626c30cad6968900bbb59ebb3
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Flavio Fernandes [Thu, 17 Sep 2015 04:58:22 +0000 (00:58 -0400)]
Bug 4325: floating ip update is not working
Change-Id: I4e028f396defd11bcd477da0c8a817f45c8fca57
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Flavio Fernandes [Thu, 17 Sep 2015 21:44:27 +0000 (21:44 +0000)]
Merge "Bug 4324: neutron port for router must allow empty string as tenant id"
Flavio Fernandes [Thu, 17 Sep 2015 04:55:02 +0000 (00:55 -0400)]
Bug 4324: neutron port for router must allow empty string as tenant id
Patch set 2: complement toMd() by adding corresponding check on from Md()
Change-Id: Ifae54f92f85cc73e744a3b348d03fd7ddd290311
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Isaku Yamahata [Tue, 15 Sep 2015 19:47:50 +0000 (12:47 -0700)]
transcriber: consolidate crud logic
This patch refactors transcriber by consolidating crud logic
Change-Id: I25b7ed350ca026abda633949441868483a044281
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Stephen Kitt [Tue, 15 Sep 2015 13:43:29 +0000 (15:43 +0200)]
Add support for karaf.debug and karaf.keep.unpack
This is the basic version, a better approach would be to use either
AbstractMdsalTestBase or AbstractConfigTestBase (but the impact is
greater).
Patch set 2: use constants instead of bare strings
Change-Id: I8c54da0892c8e969c838edb20902ba123065782c
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Isaku Yamahata [Thu, 27 Aug 2015 19:07:46 +0000 (12:07 -0700)]
Bug 4218 - northbound: return 404 when deleting unexisting uuid
Deleting unexisting uuid results in internal server error right now.
It should return 404(not found) instead so that the neutron ODL driver
can behave gracefully.
This patch is paired with the following networking-odl patch.
https://review.openstack.org/#/c/217872/
https://bugs.launchpad.net/networking-odl/+bug/
1489593
Change-Id: I9c4f56f5015148fa6c0cc7216c0917b79752f127
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Thu, 27 Aug 2015 01:00:54 +0000 (18:00 -0700)]
northbound: introduce a base class for nortubhound classes
This patch introduces a base class for nortubhound classes to consolidate
some codes.
Related-Bug: 4218
Change-Id: I6a82944cbab555114b294aef1aff4282e03b0d87
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Flavio Fernandes [Fri, 11 Sep 2015 20:41:11 +0000 (16:41 -0400)]
Bug 4265: NPE when sg.getSecurityRules is null
Patch set 2: add missing call to multiple_sr_create_test().
Change-Id: I532129d9cc370a0170ccfac63c8fcbe0604f1fe2
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
Ed Warnicke [Fri, 11 Sep 2015 15:45:13 +0000 (15:45 +0000)]
Merge "Remove Metering ConcurrentHashMaps"
Ed Warnicke [Fri, 11 Sep 2015 15:45:06 +0000 (15:45 +0000)]
Merge "Remove security group and security rule ConcurrentHashMaps"
Ed Warnicke [Fri, 11 Sep 2015 15:44:48 +0000 (15:44 +0000)]
Merge "Remove ConcurrentHashMaps from LBaaS classes"
Ed Warnicke [Fri, 11 Sep 2015 15:44:22 +0000 (15:44 +0000)]
Merge "Remove use of ConcurrentHashMap from FWaaS transcriber"
Ed Warnicke [Fri, 11 Sep 2015 15:44:17 +0000 (15:44 +0000)]
Merge "Remove ConcurrentHashMaps from VPNaaS Interface classes"
Ryan Moats [Fri, 11 Sep 2015 15:23:57 +0000 (15:23 +0000)]
Merge "Migration to use MD-SAL Project"
Flavio Fernandes [Fri, 11 Sep 2015 13:59:56 +0000 (13:59 +0000)]
Merge "Add IT CRUD tests for FWaaS"
Tony Tkacik [Wed, 2 Sep 2015 14:13:29 +0000 (16:13 +0200)]
Migration to use MD-SAL Project
Change-Id: I2427919e79ca44a43966218b72141de1485e114b
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
Tomas Cere [Mon, 7 Sep 2015 06:55:57 +0000 (08:55 +0200)]
Migrate restconf dependency
Change-Id: I6dd7e44a2ac876c36af34616fc3111210fcc3568
Signed-off-by: Tomas Cere <tcere@cisco.com>
Ryan Moats [Sun, 6 Sep 2015 23:23:34 +0000 (23:23 +0000)]
Merge "Use odlparent jacoco configuration"
Ryan Moats [Sun, 6 Sep 2015 23:20:48 +0000 (18:20 -0500)]
Remove ConcurrentHashMaps from VPNaaS Interface classes
Change-Id: I4d06b42702d52f591215b9df3abb73d851b3b55b
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sun, 6 Sep 2015 14:16:06 +0000 (09:16 -0500)]
Remove ConcurrentHashMaps from LBaaS classes
Side effects:
- fix up the lbaas yang model
- collapsed transcriber LoadBalancerPoolMemberInterface class
into LoadBalancerPoolInterface class
- collapsed LoadBalancerPoolMemberCRUD methods into
LoadBalancerPoolCRUD interface
- fix up other neutron-spi classes and northbound classes in line
with the above changes
Change-Id: I353cced2bcd8c2aad9385b19e0f478df35c0a677
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sun, 6 Sep 2015 14:05:47 +0000 (09:05 -0500)]
Remove use of ConcurrentHashMap from FWaaS transcriber
Side effects: fix up the fwaas yang models,
fix up up the fwaas neutron-spi pojos
Change-Id: If1c1050775aeba0b3b0b05d33ac963a9cffdb288
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sat, 5 Sep 2015 18:10:16 +0000 (13:10 -0500)]
Remove security group and security rule ConcurrentHashMaps
Side Effect: tweak to yang model to make sure the whole kit
and kaboodle hangs together.
Change-Id: I3e9cd68aec27fdd73bd690a9e173ddf44e46fe0b
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sat, 5 Sep 2015 17:00:25 +0000 (12:00 -0500)]
Remove Metering ConcurrentHashMaps
Side Effect: tweaks to the yang models so that the
whole kit and kaboodle works correctly.
Change-Id: Iebceaf22ac9f88926ab6295dc7533413985f88a0
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sat, 5 Sep 2015 15:07:26 +0000 (10:07 -0500)]
Add IT CRUD tests for FWaaS
Side effect: northbound FWaaS Policy and Rule URL anchors have
been corrected.
Change-Id: Id2bbbbc195b1dd8c75755446da0652bdf3491fdc
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Flavio Fernandes [Thu, 3 Sep 2015 21:10:13 +0000 (21:10 +0000)]
Merge "Add IT case for Bug 4027"
Ryan Moats [Thu, 3 Sep 2015 17:47:24 +0000 (12:47 -0500)]
Add IT case for Bug 4027
This is aimed at helping triage that bug and avoiding regression
in the future
Change-Id: Icb4fabdea56f72ff23ccc4943fb784fe0e0acba0
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Thanh Ha [Tue, 1 Sep 2015 23:06:15 +0000 (19:06 -0400)]
Use odlparent jacoco configuration
Change-Id: I2e5f58412859823a5e8d60735a2b041d35828819
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Ryan Moats [Sat, 22 Aug 2015 16:59:43 +0000 (11:59 -0500)]
Add LBaaS CRUD cases to IT
Side effects:
1. this patch implements Pool Member update semantics as
the first was unavailable
2. to make the PoolMembers northbound functions work properly,
it is necessary to collapse the PoolMemberNorthbound class into
the PoolNorthbound class so that they can use the same root URL.
3. Pool overwirte has been removed as it is causing issues
and will be removed anyway as part of the impending CHM removal.
Change-Id: I9c25f843465781baf343cfd6d764896567cf63cb
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ed Warnicke [Fri, 21 Aug 2015 16:39:53 +0000 (16:39 +0000)]
Merge "Remove Router ConcurrentHashMap"
Flavio Fernandes [Fri, 21 Aug 2015 15:35:58 +0000 (15:35 +0000)]
Merge "Add VPNaaS related test cases"
Ed Warnicke [Fri, 21 Aug 2015 15:35:26 +0000 (15:35 +0000)]
Merge changes from topics 'remove_fip_chm', 'fip_tests'
* changes:
Remove Floating IP ConcurrentHashMap
Add IT cases for Floating IPs
Flavio Fernandes [Fri, 21 Aug 2015 15:29:03 +0000 (15:29 +0000)]
Merge "Add IT cases for Security Rules"
Flavio Fernandes [Fri, 21 Aug 2015 15:28:57 +0000 (15:28 +0000)]
Merge "Add IT cases for Metering Rules"
Flavio Fernandes [Fri, 21 Aug 2015 15:28:50 +0000 (15:28 +0000)]
Merge "Add IT cases for Metering Labels"
Flavio Fernandes [Fri, 21 Aug 2015 15:28:43 +0000 (15:28 +0000)]
Merge "Add IT cases for Security Groups"
Ryan Moats [Wed, 19 Aug 2015 16:21:24 +0000 (11:21 -0500)]
Add VPNaaS related test cases
Add CRUD test cases for VPNaaS classes. This generated
a bunch of side effects as the YANG model, transcriber classes,
and northbound-api classes all needed cleaning up to make these
tests pass.
Change-Id: I1c89081c42b94b7c038f5289931b01b92ff83d0f
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Isaku Yamahata [Sat, 8 Aug 2015 18:48:36 +0000 (11:48 -0700)]
BUG #4026 : Missing key is getUuid. Supplied key is RouterKey []
When update router, it results in missing key for routers during encoding.
The following stack trace shows router case, but in theory this applies to
other resources.
data of update request doesn't include id, so the key isn't set. it should
be explicitly set by MD code before encoding.
POST to /controller/nb/v2/neutron/routers
DATA:
{
"router": {
"status": "ACTIVE",
"external_gateway_info": null,
"name": "router1",
"gw_port_id": null,
"admin_state_up": true,
"routes": [],
"tenant_id": "
015ffea9d6094b9fbe465c4f1d76c636",
"distributed": false,
"id": "
4e23aa01-f3aa-4eb8-83b2-
58b59ee17fec"
}
}
PUT to /controller/nb/v2/neutron/routers/
4e23aa01-f3aa-4eb8-83b2-
58b59ee17fec
DATA:
{
"router": {
"external_gateway_info": {
"network_id": "
a0ad7845-4434-4532-ba9e-
3ac861a3d7c4",
"enable_snat": true,
"external_fixed_ips": [
{
"subnet_id": "
08dda021-f395-411d-ad7f-
89886c3b2678",
"ip_address": "172.24.4.2"
}
]
},
"name": "router1",
"gw_port_id": "
f46143b7-5eab-4e49-8dc3-
094ce7d2cd54",
"admin_state_up": true,
"distributed": false,
"routes": []
}
}
---
> 2015-08-08 02:08:07,418 | WARN | tp1647472839-767 | NeutronRouterInterface | 374 - org.opendaylight.neutron.transcriber - 0.6.0.SNAPSHOT | Attempting to write neutron router without UUID
> 2015-08-08 02:08:07,419 | ERROR | tp1647472839-767 | ContainerResponse | 195 - com.sun.jersey.jersey-server - 1.17.0 | The RuntimeException could not be mapped to a response, re-throwing to the HTTP container
> java.lang.IllegalArgumentException: All keys must be specified for class org.opendaylight.yang.gen.v1.urn.opendaylight.neutron.l3.rev141002.routers.attributes.routers.RouterKey. Missing key is getUuid. Supplied key is RouterKey []
> at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145)
> at org.opendaylight.yangtools.binding.data.codec.impl.ValueContext.getAndSerialize(ValueContext.java:46)
> at org.opendaylight.yangtools.binding.data.codec.impl.IdentifiableItemCodec.serialize(IdentifiableItemCodec.java:124)
> at org.opendaylight.yangtools.binding.data.codec.impl.IdentifiableItemCodec.serialize(IdentifiableItemCodec.java:31)
> at org.opendaylight.yangtools.binding.data.codec.impl.KeyedListNodeCodecContext.addYangPathArgument(KeyedListNodeCodecContext.java:52)
> at org.opendaylight.yangtools.binding.data.codec.impl.DataObjectCodecContext.bindingPathArgumentChild(DataObjectCodecContext.java:193)
> at org.opendaylight.yangtools.binding.data.codec.impl.BindingCodecContext.getCodecContextNode(BindingCodecContext.java:127)
> at org.opendaylight.yangtools.binding.data.codec.impl.BindingCodecContext.newWriter(BindingCodecContext.java:104)
> at org.opendaylight.yangtools.binding.data.codec.impl.BindingNormalizedNodeCodecRegistry.toNormalizedNode(BindingNormalizedNodeCodecRegistry.java:102)
> at org.opendaylight.controller.md.sal.binding.impl.BindingToNormalizedNodeCodec.toNormalizedNode(BindingToNormalizedNodeCodec.java:133)
> at org.opendaylight.controller.md.sal.binding.impl.AbstractWriteTransaction.put(AbstractWriteTransaction.java:39)
> at org.opendaylight.neutron.transcriber.AbstractNeutronInterface.updateMd(AbstractNeutronInterface.java:77)
> at org.opendaylight.neutron.transcriber.NeutronRouterInterface.updateRouter(NeutronRouterInterface.java:107)
> at org.opendaylight.neutron.northbound.api.NeutronRoutersNorthbound.updateRouter(NeutronRoutersNorthbound.java:294)[373:org.opendaylight.neutron.northbound-api:0.6.0.SNAPSHOT]
> at sun.reflect.NativeMethodAccessorImpl.invoke0(Native Method)[:1.7.0_79]
> at sun.reflect.NativeMethodAccessorImpl.invoke(NativeMethodAccessorImpl.java:57)[:1.7.0_79]
> at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)[:1.7.0_79]
> at java.lang.reflect.Method.invoke(Method.java:606)[:1.7.0_79]
> at com.sun.jersey.spi.container.JavaMethodInvokerFactory$1.invoke(JavaMethodInvokerFactory.java:60)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.model.method.dispatch.AbstractResourceMethodDispatchProvider$ResponseOutInvoker._dispatch(AbstractResourceMethodDispatchProvider.java:205)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.model.method.dispatch.ResourceJavaMethodDispatcher.dispatch(ResourceJavaMethodDispatcher.java:75)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.HttpMethodRule.accept(HttpMethodRule.java:302)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.ResourceClassRule.accept(ResourceClassRule.java:108)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.RootResourceClassesRule.accept(RootResourceClassesRule.java:84)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1511)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1442)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1391)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1381)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.spi.container.servlet.WebComponent.service(WebComponent.java:416)[196:com.sun.jersey.servlet:1.17.0]
> at com.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:538)[196:com.sun.jersey.servlet:1.17.0]
> at com.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:716)[196:com.sun.jersey.servlet:1.17.0]
> at javax.servlet.http.HttpServlet.service(HttpServlet.java:668)[159:org.apache.geronimo.specs.geronimo-servlet_3.0_spec:1.0.0]
> at org.eclipse.jetty.servlet.ServletHolder.handle(ServletHolder.java:684)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1496)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlets.CrossOriginFilter.handle(CrossOriginFilter.java:247)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlets.CrossOriginFilter.doFilter(CrossOriginFilter.java:210)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1467)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:501)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.ops4j.pax.web.service.jetty.internal.HttpServiceServletHandler.doHandle(HttpServiceServletHandler.java:69)[174:org.ops4j.pax.web.pax-web-jetty:3.1.4]
> at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:137)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.java:557)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:231)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1086)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.ops4j.pax.web.service.jetty.internal.HttpServiceContext.doHandle(HttpServiceContext.java:240)[174:org.ops4j.pax.web.pax-web-jetty:3.1.4]
> at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:429)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:193)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1020)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:135)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.ops4j.pax.web.service.jetty.internal.JettyServerHandlerCollection.handle(JettyServerHandlerCollection.java:75)[174:org.ops4j.pax.web.pax-web-jetty:3.1.4]
> at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:116)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.Server.handle(Server.java:370)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AbstractHttpConnection.handleRequest(AbstractHttpConnection.java:494)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AbstractHttpConnection.content(AbstractHttpConnection.java:982)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AbstractHttpConnection$RequestHandler.content(AbstractHttpConnection.java:1043)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:865)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:240)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AsyncHttpConnection.handle(AsyncHttpConnection.java:82)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.io.nio.SelectChannelEndPoint.handle(SelectChannelEndPoint.java:696)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.io.nio.SelectChannelEndPoint$1.run(SelectChannelEndPoint.java:53)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:608)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:543)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at java.lang.Thread.run(Thread.java:745)[:1.7.0_79]
Change-Id: Ie2d328adbc80d1279eb8562c7882790fb3ccc236
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Ryan Moats [Tue, 18 Aug 2015 15:33:38 +0000 (10:33 -0500)]
Add IT cases for Metering Rules
Add missing CRUD operations to IT for Metering Rules
Change-Id: Idcb7efb78583cfda2a2e2cfe8afbc8d104274420
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 18 Aug 2015 14:54:52 +0000 (09:54 -0500)]
Add IT cases for Metering Labels
Add missing CRUD operations to IT for Metering Labels
Change-Id: Iafeef55b46e0c46723c363f59784ba403dfa77ac
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 18 Aug 2015 14:30:18 +0000 (09:30 -0500)]
Add IT cases for Security Rules
Add missing CRUD operations to IT for Security Rules
Change-Id: I564e9cc1c4dc86c5cfaa3ce9c8addb69278f1803
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 18 Aug 2015 14:11:07 +0000 (09:11 -0500)]
Add IT cases for Security Groups
Add missing CRUD operations to IT for Security Groups
Change-Id: I3f431584709231b94f924f4ef964352d2ce36e94
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 18 Aug 2015 13:46:05 +0000 (13:46 +0000)]
Merge "Remove port concurrent hash map"
Ryan Moats [Fri, 14 Aug 2015 16:40:19 +0000 (11:40 -0500)]
Remove Router ConcurrentHashMap
Replace the CHM backing implemenation for routers
with the MD-SAL.
Change-Id: I2a7b02442f3fedde0e3b7a69ca3f362ada535b1b
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sat, 15 Aug 2015 22:26:34 +0000 (17:26 -0500)]
Remove Floating IP ConcurrentHashMap
Replace internal fip ConcurrentHashMap with MD-SAL
Change-Id: Iadf3bc7d88bf54540c1e9dd24eba534cb1471a36
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sat, 15 Aug 2015 21:21:16 +0000 (16:21 -0500)]
Add IT cases for Floating IPs
Add IT tests for missing CRUD operations for Floating IPs
Change-Id: I9b7ac03fb1ef36312f1d2a0d363b516fbd265629
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 14 Aug 2015 12:39:04 +0000 (12:39 +0000)]
Merge "BUG #4026 neutron spi: make NeutronObject implements INeutronObject"
Isaku Yamahata [Sat, 8 Aug 2015 18:32:51 +0000 (11:32 -0700)]
BUG #4026 neutron spi: make NeutronObject implements INeutronObject
org/opendaylight/neutron/spi/Neutron*.java may or may not implement
INeutronObject. It's inconsistent. Make them implements INeutronObject.
setID will be used later.
At the same time, this patch sprinkles @deprecates and updates
the callers.
Change-Id: I00f473e1da31bb14bbdc27b1ccb1c8026b4343d9
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Ryan Moats [Thu, 23 Jul 2015 15:47:38 +0000 (10:47 -0500)]
Remove port concurrent hash map
In addition to removing the concurrent hash map, this
code addresses some problems found with updates of port
objects currently passed downstream by networking-odl.
Change-Id: I282f6e4db86e53cd4bf141a736d85d001b93f3e5
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Thanh Ha [Sun, 9 Aug 2015 18:01:16 +0000 (14:01 -0400)]
Fix license header violations in dummyprovider
Change-Id: Ic8cc4f9d877b57e7aaa14ecbf8bcac60752a6f55
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Sun, 9 Aug 2015 17:59:01 +0000 (13:59 -0400)]
Fix license header violations in transcriber
Change-Id: I07795552f643b85ea26c5e8e652ecbeeebee49e8
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Sun, 9 Aug 2015 17:53:27 +0000 (13:53 -0400)]
Fix license header violations in northbound-api
Change-Id: I68ba43112a5d31c45bbf9398fdf1316b477f0edc
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Thanh Ha [Sun, 9 Aug 2015 17:46:44 +0000 (13:46 -0400)]
Fix license header violations in neutron-spi
Change-Id: I9d8c6990cc29091a0fe829369d8462600a9713c5
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Ryan Moats [Wed, 22 Jul 2015 22:00:30 +0000 (17:00 -0500)]
Remove subnet concurrent hash map
This code removes subnet's concurrent hash map and fixes
some issues uncovered in the network interface code.
In addition, it puts back an implementation of getPortsInSubnet,
the removal of which broke ovsdb-netvirt
Change-Id: I250fcb53e404fa1deec655b1f2192aafc2fb8c36
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Thu, 23 Jul 2015 04:38:27 +0000 (23:38 -0500)]
Make NN more transparent, part III
Remove unused imports, methods, fields and annotations
Change-Id: Id06fef86635a7e07651ac3a16fee71df5d994ba3
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Thu, 23 Jul 2015 03:50:27 +0000 (03:50 +0000)]
Merge "Make NN more transparent, part II"
Ryan Moats [Thu, 23 Jul 2015 03:49:41 +0000 (03:49 +0000)]
Merge "BUG #4044 binding:host_id is string, not UUID"
Ryan Moats [Thu, 23 Jul 2015 02:57:15 +0000 (21:57 -0500)]
Make NN more transparent, part II
This patch removes all hidden tracking code
previously used by NN as that is already
handled by Neutron (DRY principle)
Change-Id: I9c4041f334d65f7007b68eb7a14eb57a0c08bb9e
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Thu, 23 Jul 2015 03:39:10 +0000 (03:39 +0000)]
Merge "Make NN more transparent, part I"
Ryan Moats [Thu, 23 Jul 2015 03:23:25 +0000 (22:23 -0500)]
Fix create of LBaaS pool members
LBaaS pool members should be created by POST,
not PUT.
Change-Id: I8ba68031f6869c7f2fd1d5528e713b623eca0fd1
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Thu, 23 Jul 2015 01:54:21 +0000 (20:54 -0500)]
Make NN more transparent, part I
This is the first patch in a series to make NN more
transparent. Invoking DRY, this patch removes all
checks that Neutron performs.
Change-Id: If2493267dfbeaf278420cc443d6ae7d29384b743
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Isaku Yamahata [Wed, 22 Jul 2015 21:23:49 +0000 (14:23 -0700)]
BUG #4044 binding:host_id is string, not UUID
The attributes of ML2 binding extension, binding:host_id, is string.
By default, the host id is determined by gethostname.
It causes the following exception.
> java.lang.IllegalArgumentException: Supplied value "ls" does not match required pattern "^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"
> at com.google.common.base.Preconditions.checkArgument(Preconditions.java:145)
> at org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.Uuid.<init>(Uuid.java:44)
> at org.opendaylight.neutron.transcriber.AbstractNeutronInterface.toUuid(AbstractNeutronInterface.java:100)
> at org.opendaylight.neutron.transcriber.NeutronPortInterface.toMd(NeutronPortInterface.java:227)
> at org.opendaylight.neutron.transcriber.NeutronPortInterface.toMd(NeutronPortInterface.java:55)
> at org.opendaylight.neutron.transcriber.AbstractNeutronInterface.updateMd(AbstractNeutronInterface.java:75)
> at org.opendaylight.neutron.transcriber.NeutronPortInterface.updatePort(NeutronPortInterface.java:182)
> at org.opendaylight.neutron.northbound.api.NeutronPortsNorthbound.updatePort(NeutronPortsNorthbound.java:473)[373:org.opendaylight.neutron.northbound-api:0.6.0.SNAPSHOT]
> at sun.reflect.GeneratedMethodAccessor210.invoke(Unknown Source)
> at sun.reflect.DelegatingMethodAccessorImpl.invoke(DelegatingMethodAccessorImpl.java:43)[:1.7.0_79]
> at java.lang.reflect.Method.invoke(Method.java:606)[:1.7.0_79]
> at com.sun.jersey.spi.container.JavaMethodInvokerFactory$1.invoke(JavaMethodInvokerFactory.java:60)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.model.method.dispatch.AbstractResourceMethodDispatchProvider$ResponseOutInvoker._dispatch(AbstractResourceMethodDispatchProvider.java:205)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.model.method.dispatch.ResourceJavaMethodDispatcher.dispatch(ResourceJavaMethodDispatcher.java:75)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.HttpMethodRule.accept(HttpMethodRule.java:302)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.ResourceClassRule.accept(ResourceClassRule.java:108)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.RightHandPathRule.accept(RightHandPathRule.java:147)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.uri.rules.RootResourceClassesRule.accept(RootResourceClassesRule.java:84)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1511)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl._handleRequest(WebApplicationImpl.java:1442)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1391)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.server.impl.application.WebApplicationImpl.handleRequest(WebApplicationImpl.java:1381)[195:com.sun.jersey.jersey-server:1.17.0]
> at com.sun.jersey.spi.container.servlet.WebComponent.service(WebComponent.java:416)[196:com.sun.jersey.servlet:1.17.0]
> at com.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:538)[196:com.sun.jersey.servlet:1.17.0]
> at com.sun.jersey.spi.container.servlet.ServletContainer.service(ServletContainer.java:716)[196:com.sun.jersey.servlet:1.17.0]
> at javax.servlet.http.HttpServlet.service(HttpServlet.java:668)[159:org.apache.geronimo.specs.geronimo-servlet_3.0_spec:1.0.0]
> at org.eclipse.jetty.servlet.ServletHolder.handle(ServletHolder.java:684)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1496)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlets.CrossOriginFilter.handle(CrossOriginFilter.java:247)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlets.CrossOriginFilter.doFilter(CrossOriginFilter.java:210)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlet.ServletHandler$CachedChain.doFilter(ServletHandler.java:1467)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.servlet.ServletHandler.doHandle(ServletHandler.java:501)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.ops4j.pax.web.service.jetty.internal.HttpServiceServletHandler.doHandle(HttpServiceServletHandler.java:69)[174:org.ops4j.pax.web.pax-web-jetty:3.1.4]
> at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:137)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.security.SecurityHandler.handle(SecurityHandler.java:557)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.session.SessionHandler.doHandle(SessionHandler.java:231)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.handler.ContextHandler.doHandle(ContextHandler.java:1086)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.ops4j.pax.web.service.jetty.internal.HttpServiceContext.doHandle(HttpServiceContext.java:240)[174:org.ops4j.pax.web.pax-web-jetty:3.1.4]
> at org.eclipse.jetty.servlet.ServletHandler.doScope(ServletHandler.java:429)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.session.SessionHandler.doScope(SessionHandler.java:193)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.handler.ContextHandler.doScope(ContextHandler.java:1020)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.handler.ScopedHandler.handle(ScopedHandler.java:135)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.ops4j.pax.web.service.jetty.internal.JettyServerHandlerCollection.handle(JettyServerHandlerCollection.java:75)[174:org.ops4j.pax.web.pax-web-jetty:3.1.4]
> at org.eclipse.jetty.server.handler.HandlerWrapper.handle(HandlerWrapper.java:116)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.Server.handle(Server.java:370)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AbstractHttpConnection.handleRequest(AbstractHttpConnection.java:494)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AbstractHttpConnection.content(AbstractHttpConnection.java:982)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AbstractHttpConnection$RequestHandler.content(AbstractHttpConnection.java:1043)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.http.HttpParser.parseNext(HttpParser.java:865)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.http.HttpParser.parseAvailable(HttpParser.java:240)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.server.AsyncHttpConnection.handle(AsyncHttpConnection.java:82)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.io.nio.SelectChannelEndPoint.handle(SelectChannelEndPoint.java:696)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.io.nio.SelectChannelEndPoint$1.run(SelectChannelEndPoint.java:53)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.util.thread.QueuedThreadPool.runJob(QueuedThreadPool.java:608)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at org.eclipse.jetty.util.thread.QueuedThreadPool$3.run(QueuedThreadPool.java:543)[165:org.eclipse.jetty.aggregate.jetty-all-server:8.1.15.v20140411]
> at java.lang.Thread.run(Thread.java:745)[:1.7.0_79]
Change-Id: Ic61ba6188ebec597cee55cc34e231690a995daa6
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Ryan Moats [Wed, 22 Jul 2015 19:45:33 +0000 (19:45 +0000)]
Merge "Make MDSAL delete synchronous"
Flavio Fernandes [Wed, 22 Jul 2015 19:43:13 +0000 (19:43 +0000)]
Merge "Explicitly set git-review branch to master"
Ryan Moats [Mon, 13 Jul 2015 04:44:05 +0000 (23:44 -0500)]
Make MDSAL delete synchronous
Before this patch the future returned by read and put
transactions was wrapped in a get to render the result
synchronous (this is necessary to support Neutron).
Apply this pattern to the future returned by the
delete transaction.
This allows the negative get network test post delete
to work again, so re-enable it.
Change-Id: I2443a07869114ae466549de5f5f03132f5d3bdf1
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Thanh Ha [Wed, 22 Jul 2015 19:17:42 +0000 (15:17 -0400)]
Explicitly set git-review branch to master
Change-Id: I612df26f4b37c6eb44cafe296dca8e393eee03b4
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Ryan Moats [Sun, 12 Jul 2015 17:05:48 +0000 (12:05 -0500)]
Remove concurrenthashmap from networks... part II
Negative network E2E fetch test after delete has
been commented out as a to do to work out timing...
Change-Id: I253e13f470ddb49d378ad978b1930ab506bd87ee
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sun, 12 Jul 2015 14:49:33 +0000 (09:49 -0500)]
Remove concurrenthashmap from networks part I
Add method for reading from mdsal.
Change-Id: I5b0f5efceb8733674b922798b724ae6f5a2f845d
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sun, 12 Jul 2015 04:00:24 +0000 (23:00 -0500)]
cleanup yang model, part VII
Ensure that extensions are included properly and
that augmented MD-SAL objects are properly filled in
Change-Id: Ie986c1638082986fd5ed684e2639939625252b25
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 21 Jul 2015 17:58:15 +0000 (12:58 -0500)]
Update yang to catch lost pieces in part VI
These are needed to allow part VII to merge
Change-Id: If7ce638c9be7a38f3afb7d00eb546e4a3551c1b2
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Alexis de Talhouët [Tue, 21 Jul 2015 14:43:39 +0000 (10:43 -0400)]
Clean up yang model - Part VI
Enumerations are not extendable and unions lead to code
that isn't in the normal place. Remove unions and replace
enumerations with identities/identityrefs as the latter are
extendable.
Change-Id: I1aabd1b4fc59415a5ac8de4df758cd9d1fa756cb
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Alexis de Talhouët [Mon, 20 Jul 2015 21:12:13 +0000 (17:12 -0400)]
Top-level yang file defining identities.
Identities defined for:
- protocol
- probe
- direction
- ip version
Patch set 1: proposal
Patch set 2: desired implementation
Patch set 3: remove whitespaces
Change-Id: I186cd2576ccc0bf78a2c90a472859e4647710d5b
Signed-off-by: Alexis de Talhouët <adetalhouet@inocybe.com>
Ryan Moats [Sat, 11 Jul 2015 23:18:27 +0000 (18:18 -0500)]
Clean up yange model - Part V
replace attrs with attributes in securty group, subnets
and vpnaas groupings
Change-Id: Ibaa03b8265f0e2fcb46cb2ee55b47e2b66fc8194
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sat, 11 Jul 2015 23:01:23 +0000 (18:01 -0500)]
Clean up yang model - Part IV
Use attributes instead of attrs in grouping names for
metering and port objects.
Change-Id: I673f0ba5f047e7a5414a5d34b846bb0fea669b25
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 21 Jul 2015 13:28:55 +0000 (13:28 +0000)]
Merge "Clean up yang model... Part III"
Ryan Moats [Tue, 21 Jul 2015 13:27:14 +0000 (13:27 +0000)]
Merge "Add vlan-transparent and mtu attributes to Network pojo"
Ryan Moats [Tue, 21 Jul 2015 13:27:04 +0000 (13:27 +0000)]
Merge "Remove duplicated lines in transcriber"
Ryan Moats [Sat, 11 Jul 2015 22:11:35 +0000 (17:11 -0500)]
Clean up yang model... Part III
Replace attrs with attributes in L3 and LBaaS model groupings.
This causes some of transcriber project to be rewritten :-(
Change-Id: I5bcba88aedfb3b0a626e104bcd48d9c469b06381
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 21 Jul 2015 13:22:01 +0000 (13:22 +0000)]
Merge "Clean up yang model part II"