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 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"
Ryan Moats [Tue, 21 Jul 2015 13:14:24 +0000 (13:14 +0000)]
Merge "Run IT tests via per-class static methods."
Ryan Moats [Sat, 11 Jul 2015 22:05:55 +0000 (17:05 -0500)]
Clean up yang model part II
Replace attrs with attributes in binding and fwaas groupings
Change-Id: I3cee90332395e2884c70c3e87cb35d9e1d76f585
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 21 Jul 2015 13:08:44 +0000 (13:08 +0000)]
Merge "BUG 4015 test_create_floating_ip_specifying_a_fixed_ip_address fails"
Ryan Moats [Tue, 21 Jul 2015 13:07:33 +0000 (13:07 +0000)]
Merge "Clean up yang model - Part I"
Ryan Moats [Sat, 11 Jul 2015 17:31:24 +0000 (12:31 -0500)]
Clean up yang model - Part I
Replace attrs with attributes on base and admin groups
Change-Id: I912510da4f9f5912e473be428b80aa98a1b82043
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Isaku Yamahata [Fri, 17 Jul 2015 23:56:47 +0000 (16:56 -0700)]
BUG 4015 test_create_floating_ip_specifying_a_fixed_ip_address fails
tempest.api.network.test_floating_ips.FloatingIPTestJSON.
test_create_floating_ip_specifying_a_fixed_ip_address
fails to create floating ip as follows.
an external network with an ipv4 subnet + an ipv6 subnet is created.
Then, it tries to create floating ip. ODL returns bad request to neutron.
When creating/updating floating ip and attaching interface to router
subnets needs to exist.
The check is done by the number of subnets != 1.
But it should be done the number of ipv4 subnet == 0.
> Traceback (most recent call last):
> File "tempest/api/network/test_floating_ips.py", line 181, in test_create_floating_ip_specifying_a_fixed_ip_address
> fixed_ip_address=self.ports[1]['fixed_ips'][0]['ip_address'])
> File "tempest/services/network/json/network_client.py", line 188, in create_floatingip
> return self._create_resource(uri, post_data)
> File "tempest/services/network/json/network_client.py", line 109, in _create_resource
> resp, body = self.post(req_uri, req_post_data)
> File "/opt/stack/tempest/.venv/local/lib/python2.7/site-packages/tempest_lib/common/rest_client.py", line 256, in post
> return self.request('POST', url, extra_headers, headers, body)
> File "/opt/stack/tempest/.venv/local/lib/python2.7/site-packages/tempest_lib/common/rest_client.py", line 636, in request
> resp, resp_body)
> File "/opt/stack/tempest/.venv/local/lib/python2.7/site-packages/tempest_lib/common/rest_client.py", line 747, in _error_checker
> raise exceptions.ServerFault(resp_body, message=message)
> tempest_lib.exceptions.ServerFault: Got server fault
> Details: Request Failed: internal server error while processing your request.
Change-Id: I9b4fa7c959e52c386cab25d6ac9ab64e1fc8a607
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Ryan Moats [Sat, 18 Jul 2015 00:53:06 +0000 (19:53 -0500)]
Add vlan-transparent and mtu attributes to Network pojo
Partially addresses Bug #3824
Change-Id: Icdcefbf850f830be47b62115898ae9d2cb104e03
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 17 Jul 2015 22:06:57 +0000 (17:06 -0500)]
Remove duplicated lines in transcriber
Change-Id: I377fc2ff00f750b4a2642419713550fe7cbb88c1
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 17 Jul 2015 19:42:14 +0000 (14:42 -0500)]
Run IT tests via per-class static methods.
Rather than define IT cases in the container class,
define them in static methods in each class. That way
adding new tests to a class involves a single touch point.
Change-Id: Ic6509682906b4387e69db742972ef918a127ca1e
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 17 Jul 2015 17:56:29 +0000 (17:56 +0000)]
Merge "Add more router tests"
Ryan Moats [Fri, 17 Jul 2015 17:56:13 +0000 (17:56 +0000)]
Merge "Add host routes to subnet create IT case."
Ryan Moats [Thu, 16 Jul 2015 23:31:27 +0000 (18:31 -0500)]
Add more router tests
Note: this also includes changes to PortTests and
PortInterface objects related to making router tests
work.
Again, this is *NOT* a candidate for stable/lithium
as it changes the semantics of update from an update
passing a delta change to openstack passing the
updated object.
Change-Id: Iaccbafa430affb338fb260dc58eb40f81fb6c158
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 17 Jul 2015 00:55:31 +0000 (19:55 -0500)]
Update poms with sonar IT report information
Transcriber and model poms do not inherit from odl-parent,
so they need sonar.jacoco.itReportPath explicitly set
Change-Id: I5268d87f1276035e076c77e92df74987810d198c
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Thu, 16 Jul 2015 23:51:02 +0000 (18:51 -0500)]
Add host routes to subnet create IT case.
To ensure that host route class methods are covered by IT.
Change-Id: I846a98e24008dd5a4b5b928e3a3205ac84e9c92f
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Thu, 16 Jul 2015 17:18:07 +0000 (17:18 +0000)]
Merge "Integrate md-sal port model and add more port E2E tests"
Ryan Moats [Wed, 15 Jul 2015 23:43:02 +0000 (23:43 +0000)]
Merge "Clean up code issues caused by transcriber refactoring"
Ryan Moats [Wed, 15 Jul 2015 23:39:34 +0000 (18:39 -0500)]
Integrate md-sal port model and add more port E2E tests
Again, this change is *NOT* a candidate for stable/lithium as
it changes both the sematics of port update *and* it changes
the device-id portion of the yang model from uuid to flat
string.
Change-Id: Ic95d5c4e3125bcd31aecc48f13e8a2e0a2b2720f
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Wed, 15 Jul 2015 19:35:41 +0000 (14:35 -0500)]
Clean up unused local variables from transcriber
Change-Id: Ifb8a6ff27152590c28e36d0ca23092e344a85354
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Wed, 15 Jul 2015 18:33:24 +0000 (13:33 -0500)]
Clean up code issues caused by transcriber refactoring
Remove unused imports and no need to throw Exception
in added static methods
Change-Id: Idcbf04191052e2c9f52372bd606d1fca2b2a4186
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Wed, 15 Jul 2015 16:37:53 +0000 (16:37 +0000)]
Merge "Add additional subnet E2E tests."
Ryan Moats [Wed, 15 Jul 2015 16:37:39 +0000 (16:37 +0000)]
Merge "Clean up overlong start method in Activator"
Ryan Moats [Wed, 15 Jul 2015 00:20:22 +0000 (19:20 -0500)]
Clean up overlong start method in Activator
Parcel it out as static methods in each class to make
the pattern more scalable.
Change-Id: I9743b880645219c364f363c662c38416afa20595
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 14 Jul 2015 21:43:07 +0000 (16:43 -0500)]
Add additional subnet E2E tests.
Side effects of this are to change the semantics of the
updateSubnet operation, so this change is *not* a
candidate for backport to stable/lithium, even though
it is adding test cases.
Change-Id: I8547b613f8618298b289924f7e7f71540a96f6f3
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Tue, 14 Jul 2015 18:59:42 +0000 (13:59 -0500)]
Ensure that exceptions are either logged or thrown
This avoids losing exception context...
Change-Id: Iadce03ccf23c496f3ddc8921599432eb9d81dddb
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Mon, 13 Jul 2015 21:25:38 +0000 (16:25 -0500)]
Code cleanup: use collection interfaces in declarations
Replace HashMap with Map and HashSet with Set in
variable declarations
Change-Id: I364d3673351a273b84ab0daef8bc0a59ecda63d8
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Flavio Fernandes [Mon, 13 Jul 2015 23:31:53 +0000 (23:31 +0000)]
Merge "Clean up collapsable if statements"
Ryan Moats [Mon, 13 Jul 2015 19:55:03 +0000 (14:55 -0500)]
Code cleanup: remove unused local variables
In addition, in NeutronPort class, remove potential NPE
by reordering comparison with static strings.
Change-Id: Ia00a7be4dbacfd1807b81786ae4436f6e89e65cd
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Mon, 13 Jul 2015 19:35:29 +0000 (14:35 -0500)]
Clean up collapsable if statements
Change-Id: I019fa5d09467fe2323ae86c8260e25dacb475758
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Mon, 13 Jul 2015 18:54:53 +0000 (13:54 -0500)]
Clean up minor code issues
Remove unused imports and get public/final ordering
correct.
Change-Id: I718360db0a12d88514263fb2e03edbcacf0a9f5e
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Mon, 13 Jul 2015 17:09:20 +0000 (17:09 +0000)]
Merge "Clean code issues in NeutronSubnetIPAllocationPool"
Ryan Moats [Sat, 11 Jul 2015 02:07:39 +0000 (21:07 -0500)]
Clean code issues in NeutronSubnetIPAllocationPool
Address the following issues:
1. Rename the class itself (contains underscore)
2. Rename methods that contain underscore
3. Ensure caught exceptions are logged
Also change dependent classes impacted by 1 and 2
Change-Id: I287140b7c5921ca6b0a4f9938e39f0d9f9ed99a8
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sat, 11 Jul 2015 01:44:53 +0000 (20:44 -0500)]
Clean issues in NeutronUtil and PaginateRequestFactory
Fix the following code issues in these two classes:
1. Declare them final.
2. Correct method names
3. Don't assign values to parameters
Change-Id: Ic647e8c197b158bc5b884abb6c05ab9d90eb76fb
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sat, 11 Jul 2015 00:00:53 +0000 (00:00 +0000)]
Merge "build failure of neutron"
Ryan Moats [Fri, 10 Jul 2015 20:06:47 +0000 (15:06 -0500)]
Add more neutron network IT cases
This patch is a cadidate for cherry picking to stable/lithium.
However, it changes the semantics of the canNetworkBeUpdated
part of the INetworkAware interface and so before we change
that, we need to communicate with other projects.
Change-Id: Ie9c3774fb98ebdb044d9523477bc0fb3112beaba
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 10 Jul 2015 19:35:19 +0000 (19:35 +0000)]
Merge "Remove commented code blocks"
Ryan Moats [Fri, 10 Jul 2015 19:35:14 +0000 (19:35 +0000)]
Merge "Hide constructor of utility classes"
Ryan Moats [Fri, 10 Jul 2015 19:35:09 +0000 (19:35 +0000)]
Merge "Add braces on else blocks"
Ryan Moats [Fri, 10 Jul 2015 19:35:03 +0000 (19:35 +0000)]
Merge "Fix field naming in NeutronVPNServiceInterface"
Ryan Moats [Fri, 10 Jul 2015 19:34:58 +0000 (19:34 +0000)]
Merge "Clean up unnecessary object allocation"
Ryan Moats [Fri, 10 Jul 2015 19:34:47 +0000 (19:34 +0000)]
Merge "Clean code in NeutronPort class"
Ryan Moats [Fri, 10 Jul 2015 19:34:35 +0000 (19:34 +0000)]
Merge "Fix mac_regex constant name and type"
Ryan Moats [Fri, 10 Jul 2015 19:34:25 +0000 (19:34 +0000)]
Merge "Fix inefficient string buffering "
Ryan Moats [Fri, 10 Jul 2015 18:34:59 +0000 (13:34 -0500)]
Remove commented code blocks
Change-Id: Ib6b6d327f020d1cfee59abf81e043882f96af9b2
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 10 Jul 2015 18:25:32 +0000 (13:25 -0500)]
Hide constructor of utility classes
From squid:
"Utility classes, which are a collection of static members,
are not meant to be instantiated. Even abstract utility
classes, which can be extended, should not have public constructors.
Java adds an implicit public constructor to every class
which does not define at least one explicitly. Hence,
at least one non-public constructor should be defined."
Change-Id: Ibc83dfbf6f1777acccd41e89ef5a371eabfa51d4
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 10 Jul 2015 18:14:54 +0000 (13:14 -0500)]
Add braces on else blocks
Found two else blocks without braces...
Change-Id: Icd537c7c72ff79fcb1ac2a11c15ec75cbd960edf
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 10 Jul 2015 18:04:58 +0000 (13:04 -0500)]
Fix field naming in NeutronVPNServiceInterface
Change-Id: Id018b0a965385249e0a8fb7c3e74f212a8011dc2
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 10 Jul 2015 17:54:05 +0000 (12:54 -0500)]
Clean up unnecessary object allocation
NeutronSecurityRuleInterface used new Integer to instantiate
objects where Integer.valueOf is more friendly
Change-Id: I98daea7364462f283cee840ab3ce48e430f9ddfc
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 10 Jul 2015 16:23:40 +0000 (11:23 -0500)]
Clean code in NeutronPort class
Remove two instances of local variables hiding
class variables and fix a type definition as an
implementation rather than an interface.
Change-Id: I3d70e0af7ffa99e2d2f26a650bc44237c64a5397
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 10 Jul 2015 16:06:46 +0000 (11:06 -0500)]
Fix mac_regex constant name and type
Change-Id: Icf6e46bad90d1f45af0e6b28237e52066472e003
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 10 Jul 2015 15:45:26 +0000 (10:45 -0500)]
Fix inefficient string buffering
Don't combine arguments in NeutronSubnet_IPAllocationPool
Change-Id: Ibc24747fb08bc9072bca30847ed6f5ec79f8467c
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Fri, 10 Jul 2015 15:41:07 +0000 (10:41 -0500)]
Remove unused field from NeutronTranscriberProvider
Change-Id: I89897d74e455237b2097cc16e985a4b0709b20f7
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Isaku Yamahata [Fri, 10 Jul 2015 06:55:59 +0000 (23:55 -0700)]
build failure of neutron
Building with -DskipITs or -DskipTests leads to a failure when
/neutron/integration/test/target/site does not exist.
Change toplevel antrun move directives to not fail on error
as this error is not critical
Change-Id: If64c53ada8414d82c9fd389d0d754bb219764e12
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Flavio Fernandes [Fri, 10 Jul 2015 00:19:31 +0000 (00:19 +0000)]
Merge "Consolidate duplicated code from transcriber classes"
Flavio Fernandes [Fri, 10 Jul 2015 00:15:45 +0000 (00:15 +0000)]
Merge "Remove @deprecation from FWaaS classes"
Ryan Moats [Wed, 8 Jul 2015 20:26:54 +0000 (15:26 -0500)]
Remove @deprecation from FWaaS classes
FWaaS is not going away in Liberty, so related classes need to hang
around.
Change-Id: Ie9c338a110d42db3cf1ce3513e4012ea5bcd266a
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Thu, 9 Jul 2015 22:21:04 +0000 (17:21 -0500)]
Consolidate duplicated code from transcriber classes
The AbstractNeutronInterface allows us to consolidate the overwrite
method that was part of multiple classes in transcriber
Change-Id: Ifee0936649d91cb086c2894a9a054ee031b64782
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Thu, 9 Jul 2015 20:21:45 +0000 (15:21 -0500)]
Change NeutronCRUDInterfaces class from static
This change is intended to make it easier to scale when we
start adding extensions by not requiring code to call static
methods in NeutronCRUDInterfaces
Change-Id: I5b6bb03e992e7ec51fc236b6cccf2876e7b61cf9
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Wed, 8 Jul 2015 00:25:43 +0000 (19:25 -0500)]
Create custom checkstyle rules for NN
There are some rules in ODL parent checkstyle that
are annoying - this patch allows us to set our own
for some of them
Change-Id: I4045988200508c4976290a526e7d2ee504c58e25
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Wed, 8 Jul 2015 17:37:00 +0000 (12:37 -0500)]
Adapting reporting approach to work with maven goal order
Because maven goals are set to "clean install", that means
the top level project has to move the IT reports from the
integration test project to itself.
Change-Id: Id7c09fd020739ef335e9ca63df2c3322c22d147a
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Wed, 8 Jul 2015 16:09:53 +0000 (11:09 -0500)]
Fix code duplication in report to sonar
The patch that got IT reporting working had the nasty
side effect of doubling the LoC reported by sonar
for the module. This patch rearranges things to
fix that and report IT results for each of the modules,
rather than from the IT module.
Change-Id: Ied75efa67ce8843c6650d3a04a333586bf35c747
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Wed, 8 Jul 2015 03:50:54 +0000 (03:50 +0000)]
Merge "neutron-secgroups.yang: update model for security group"
Isaku Yamahata [Mon, 6 Jul 2015 23:59:51 +0000 (16:59 -0700)]
neutron-secgroups.yang: update model for security group
- neutron security group accepts protocol as integer.
It's defined as uint8.
- neutron security group defines port as uint16 since
its port number of UDP/TCP.
There is no point to define it as uint32.
Change-Id: I6fe01623ad07800a663fbd871dcfb030b9eef098
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Ryan Moats [Tue, 7 Jul 2015 21:24:09 +0000 (16:24 -0500)]
Yet another attempt at IT reporting to Sonar
Change-Id: Ic133322d05988ef535890dc2508186f674ac20f7
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>
Ryan Moats [Sun, 5 Jul 2015 11:48:52 +0000 (06:48 -0500)]
Remove model classes from sonar reporting
Change-Id: I53e21a1fb8c4b2dc21c12a3ff73be6fc86143d19
Signed-off-by: Ryan Moats <rmoats@us.ibm.com>