Michael Vorburger [Mon, 13 Aug 2018 15:29:15 +0000 (15:29 +0000)]
Merge "add dependency check for qosPolicyId to NeutronNetworkInterface"
Anil Belur [Thu, 9 Aug 2018 12:40:15 +0000 (18:10 +0530)]
Bump versions by x.(y+1).z for next dev cycle
Change-Id: Ic377f1c6fcdf2a131bdc679ec4b42dfc5244e27d
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Michael Vorburger [Thu, 2 Aug 2018 13:50:47 +0000 (15:50 +0200)]
add dependency check for qosPolicyId to NeutronNetworkInterface
JIRA: NEUTRON-178
Change-Id: I50c668659ad87bc53f370f584408867dc0625f70
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Josh Hershberg [Tue, 31 Jul 2018 09:04:45 +0000 (09:04 +0000)]
Merge "suppress warn log if replying 500 just for OptimisticLockFailedException"
Stephen Kitt [Wed, 18 Jul 2018 16:06:41 +0000 (18:06 +0200)]
Bump to odlparent 3.1.3
Change-Id: I1e7e61333d8ed6c5535e98129662410761de414f
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Robert Varga [Tue, 24 Jul 2018 11:06:36 +0000 (13:06 +0200)]
Use moved BindingReflections
BindingReflections are being evacuated from yang-binding, use them
from their new location.
Change-Id: Ib2d132dc43d70e46491b5043595ec77e528a570d
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Michael Vorburger [Mon, 23 Jul 2018 12:02:05 +0000 (12:02 +0000)]
Merge "Migrate to stringValue()"
Michael Vorburger [Mon, 2 Jul 2018 19:19:45 +0000 (21:19 +0200)]
suppress warn log if replying 500 just for OptimisticLockFailedException
Change-Id: Ia311b340e993f5210223f11616a7d1fac70c66ad
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Robert Varga [Fri, 20 Jul 2018 16:33:33 +0000 (18:33 +0200)]
Migrate to stringValue()
This eliminates the use of char[]-based instantiation and conversion.
Change-Id: Ic9024531f138e52848fd0531c9a4d479b120af86
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Thu, 19 Jul 2018 10:55:24 +0000 (12:55 +0200)]
Factor out odl-neutron-model
The model is being packaged by two features, create a feature
to hold it.
Change-Id: I48fc29f823bb8f6e004cc207f6813e0e9711e83b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Robert Varga [Tue, 17 Jul 2018 15:24:14 +0000 (17:24 +0200)]
Depend on minimal mdsal models
Rather than pulling all the models available, just pull in the
minimum required.
JIRA: MDSAL-363
Change-Id: Ifebc7fd2253faa36e0b60dbc4bdd6a99df06a50b
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
Michael Vorburger [Wed, 4 Jul 2018 14:25:15 +0000 (16:25 +0200)]
add missing warn log to AbstractNeutronNorthbound for 442
In I2c55e707c9d48f78fd60a8e22af6a799976d86bf this was only done for the
bulk operation code path, but forgotten for the single create.
Change-Id: I15943679a9a2ff40de84ba43a01233869465acf9
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 5 Jul 2018 15:34:42 +0000 (17:34 +0200)]
Revert "bump EclipseLink Moxy JAXB implementation from 2.6.2 to 2.7.1"
This reverts commit
d40a0ef257d79fc3a3b21dede57da65ca36e0ab4.
because just a few months after I38f0285643ca0a1aea99a5e7f9e2b158bb86168c
we finally have an odlparent (3.1.2) which includes that and which neutron
meanwhile bumped to; we therefore don't need to override the version here anymore.
Issue: NEUTRON-160
Change-Id: I04e9b69389dd33c785a5165eb3e72016b76b56cc
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Mon, 25 Jun 2018 14:05:42 +0000 (16:05 +0200)]
return HTTP_CONFLICT (409) from POST create() in case of AlreadyExists
see https://lists.opendaylight.org/pipermail/neutron-dev/2018-June/001702.html
Change-Id: Idd0d65e720d209afbf993db2c202b7710ef6c9db
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Mon, 2 Jul 2018 19:11:10 +0000 (21:11 +0200)]
add warn log with cause to AbstractNeutronNorthbound for 442 and 500
Just in case the Neutron Driver does not log what we propagate to it
nicely for operators to find in debugging, it perhaps does not hurt if
we put a WARN log on the ODL side in case of problems due to both the
new dependency check mechanism and datastore exceptions propagate
(including mandatory YANG validation).
JIRA: NEUTRON-157
Change-Id: I2c55e707c9d48f78fd60a8e22af6a799976d86bf
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Mon, 2 Jul 2018 18:47:42 +0000 (20:47 +0200)]
make security group rule ID mandatory in YANG model
To simplify the dependency check - it is not really the role of the new
areAllDependenciesAvailable() method to enforce required properties
programmatically - doing that declaratively in the YANG model is the
ODL way.
This lets us re-activate a test which covers this scenario which we had
to temporarily comment out in the previous to previous commit for "add
dependency check for security rule's group update(), not just add()";
we need the previous commit re. "propagate datastore exceptions all the
way to northbound" for YANG mandatory constraints to actually have any
effect (because before that, we basically just stupidly ignored ANY
problem when commiting the transaction!).
Changing this also reveals a subtle mistake in an existing test:
Modifying an existing entity without required fields is not actually
working / supported (never was; it's not that this break it) - an MD SAL
put() is does *NOT* apply a delta, but replaces the existing object. A
few Neutron Northbound classes override the updateDelta() method of
AbstractNeutronNorthbound with custom logic which seems to attempt to
"compensate" for this be doing e.g. delta.setID(uuid); etc. but this is
implemented inconsistently in existing code (e.g. many including the
NeutronSecurityRulesNorthbound do not do this).
Many more fields in the model which in truth are mandatory should
ideally be so declared in follow-up changes imitating this one now.
JIRA: NEUTRON-158
Change-Id: I077906a682225ac87caf1c4c933f01bdf40c1353
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 6 Jun 2018 16:22:59 +0000 (18:22 +0200)]
propagate datastore exceptions all the way to northbound
Instead of logging but ultimately ignoring them, as they currently are.
Stumbled across this wile working on (not directly related) NEUTRON-158.
This will also fix the problem raised in NEUTRON-157: We are,
intentionally, changing the OptimisticLockFailedException WARN log to a
DEBUG only. If it still didn't go through after RETRY_MAX (currently 2)
then it will be rethrown, and that, with this, will go back up to the
driver.
JIRA: NEUTRON-157
Change-Id: I10b7dea0b5698db40ee7cfaa63593fb6b3c573c7
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 20 Jun 2018 12:22:35 +0000 (14:22 +0200)]
add dependency check for security rule's group update(), not just add()
JIRA: NEUTRON-158
Change-Id: I249d8a3898641baaf9b92699da41eac523a22b36
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Stephen Kitt [Wed, 30 May 2018 13:45:50 +0000 (15:45 +0200)]
Bump odlparent to 3.1.2
Change-Id: I472712975bfbc783649310e40252d8005b2249e3
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Michael Vorburger [Mon, 25 Jun 2018 16:40:38 +0000 (18:40 +0200)]
clean-up to remove un-used three WebApplicationException subclasses
and minor JavaDoc clean up in the two remaining ones
The removed null check in NeutronRoutersNorthbound is (now) pointless.
Change-Id: If3bfac610b1dc9563651ac8bba3513e58637265f
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 20 Jun 2018 12:27:56 +0000 (14:27 +0200)]
remove apparently un-used methods in AbstractTranscriberInterface
These methods seems left overs; they have functionality comparable to
other existing methods which are actually used, but these do not have
the dependency checks hooks I've added; so just remove them:
* addMd()
* updateMd()
* removeMd()
JIRA: NEUTRON-158
Change-Id: If53bb7bce6c9cfcc2bd9fa640de3fd11e76c6513
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 20 Jun 2018 12:14:46 +0000 (14:14 +0200)]
use (new) INeutronCRUD.Result instead of boolean in update()
JIRA: NEUTRON-158
Change-Id: Ia94844c13f823ae169ae8e2295b3d4f89c2f3b91
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 20 Jun 2018 11:53:35 +0000 (13:53 +0200)]
improve NeutronSecurityRuleTests to cover 404 on modify of non-existant
in preparation of supporting 442 not just for create but also modify.
JIRA: NEUTRON-158
Change-Id: I84c1656fdd84d9e1e6adf5f10a4ccb5414507ced
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 20 Jun 2018 09:04:48 +0000 (09:04 +0000)]
Merge "implement dependency checking for security rule's group"
Michael Vorburger [Tue, 19 Jun 2018 09:33:47 +0000 (11:33 +0200)]
clean up features
avoid bundle dependencies to other projects in features.xml;
instead depend on the features of the projects that provide
those as dependencies.
see https://lists.opendaylight.org/pipermail/neutron-dev/2018-June/001693.html
Change-Id: Ia4c7c4a8f9acded8cd1c5e6e985005644831ef0d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 12 Jun 2018 16:11:37 +0000 (18:11 +0200)]
add myself to <developer> in POM ;)
Change-Id: Ia2d8b662d028c1f637fb67077f3788bb9e6eb20c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Mon, 28 May 2018 16:49:04 +0000 (18:49 +0200)]
implement dependency checking for security rule's group
JIRA: NEUTRON-158
Change-Id: Ie0454543f7a5707aac6eb1583b3fd3ec55cbdfe1
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 6 Jun 2018 14:28:36 +0000 (16:28 +0200)]
add transaction to exists()
make AbstractTranscriberInterface exists() public
This allows one *Interface implementation (say
NeutronSecurityRuleInterface) to check for the existence of others (say
NeutronSecurityGroupInterface) in dependency checks.
JIRA: NEUTRON-158
Change-Id: I351c219f6784180aa918c818fd10bd1cca85afc3
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 6 Jun 2018 15:00:14 +0000 (17:00 +0200)]
introduce INeutronCRUD.Result, instead of boolean
and for now use it in add(T input), later remove() & update().
A future follow-up change will extend INeutronCRUD.Result with a 4th
additional enum value to signal "DependencyMissing" to callers.
JIRA: NEUTRON-158
Change-Id: I5f312008b899862e4957c0ab950b4939fd5b7369
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Vishal Thapar [Mon, 28 May 2018 06:18:36 +0000 (11:48 +0530)]
QoS: Add support for direction
* Add direction support for Bandwidth Limit rules
JIRA: NETVIRT-1242
Change-Id: I3a42344e909213ba6af10f5b7d7250ad7a8213b7
Signed-off-by: Vishal Thapar <vthapar@redhat.com>
Michael Vorburger [Mon, 4 Jun 2018 15:26:46 +0000 (15:26 +0000)]
Merge "Fixup Augmentable and Identifiable methods changing"
Josh Hershberg [Mon, 4 Jun 2018 10:34:13 +0000 (10:34 +0000)]
Merge "NEUTRON-162: vlan_transparent attribute is missing in network_attributes"
Vishal Thapar [Wed, 30 May 2018 06:51:59 +0000 (12:21 +0530)]
TSC-115: Fix MinimumBandwidthRule direction
minimumbandswidth-rule-attributes has wrongly
defined direction to be constants:direction-minimum-base.
constants:direciton-minimum-base is not reqired at all
as there are already ingress/egress defined.
Changes it to remove the redundant and wrong yang attribute
and fix rest of the code to use the correct direction classes.
Change-Id: I93febb29a77aa19428a3211eaf1712d84388a7d7
JIRA:NEUTRON-163
Signed-off-by: Vishal Thapar <vthapar@redhat.com>
Stephen Kitt [Thu, 31 May 2018 14:20:03 +0000 (16:20 +0200)]
Fixup Augmentable and Identifiable methods changing
This is a fixup of the change in binding codegen, adjusting:
- getKey() -> key()
- setKey() -> withKey()
- getAugmentation() -> augmentation()
Change-Id: I449489503c6c9811b7b1fe97eabbe37b46ab7473
JIRA: TSC-101
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Tom Pantelis [Fri, 25 May 2018 13:18:09 +0000 (09:18 -0400)]
convert to Jersey 2
Modified the WebInitializer to use the new AAA Servlet API based on Jersey 2.
JIRA: TSC-113
Change-Id: I1c495087c278debec6e04a6cf920ca10632dd3f7
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Michael Vorburger [Mon, 28 May 2018 16:33:14 +0000 (18:33 +0200)]
reduce copy/paste between HttpUtils's test_create() methods
Change-Id: I2eed44ead7b7b05f6b178c5a0b34b9641c223615
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Mon, 28 May 2018 16:32:59 +0000 (18:32 +0200)]
singleton_sg_create(String securityGroupID) in NeutronSecurityGroupTests
and make all _test methods in NeutronSecurityGroupTests private
Change-Id: I1f53a8a30be4d9c0c86d5291fe95d70261aec97e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Mon, 28 May 2018 15:49:50 +0000 (17:49 +0200)]
make all _test methods in NeutronSecurityRuleTests private
only constructor and public runTest() method are used by NeutronAllTests
TBD in follow-up changes: apply same to all *Tests classes
Change-Id: Iee66ab307bbc2b5a46e3218dff1f22e1bda17941
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Josh Hershberg [Mon, 28 May 2018 08:06:39 +0000 (08:06 +0000)]
Merge "Add feature identity for qos rule types"
Shashidhar Raja [Mon, 21 May 2018 09:36:49 +0000 (15:06 +0530)]
NEUTRON-162: vlan_transparent attribute is missing in network_attributes
Added support for vlan_transparent in network_attributes
Change-Id: I9006f3a63baa8edf9d72eafef866793451720036
Signed-off-by: Shashidhar Raja <shashidharr@altencalsoftlabs.com>
Victor Pickard [Mon, 21 May 2018 19:00:33 +0000 (15:00 -0400)]
NETVIRT-1121: Add IGMP Protocol types
Add IGMP Protocol type definitions to neutron.
Change-Id: I2be35241b2732852a6e22cffeba35567b2a03d35
Signed-off-by: Victor Pickard <vpickard@redhat.com>
Tom Pantelis [Thu, 3 May 2018 17:13:02 +0000 (13:13 -0400)]
Remove AbstractDataChangeListenerTest derivation
AbstractDataChangeListenerTest is going away so change
HostconfigsDataBrokerTest to derive from AbstractConcurrentDataBrokerTest.
Change-Id: I5b0feabc70b9cafee7104857f569d5cdc87ba368
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Josh [Wed, 4 Apr 2018 11:46:04 +0000 (14:46 +0300)]
Add feature identity for qos rule types
This patch is preperation for supporting some
qos features and more specifically the feature
negotiation of those features.
See https://review.openstack.org/#/c/558554/ for details.
Change-Id: I18423ba66cd62b1b099c81cb545412a317a8520c
Signed-off-by: Josh <jhershbe@redhat.com>
Josh Hershberg [Sun, 15 Apr 2018 07:04:00 +0000 (07:04 +0000)]
Revert "Add Karaf build profile"
This reverts commit
8a28ebe52608c50ca2dfdf8e79698b05f0f91176.
Per Thanh here: https://git.opendaylight.org/gerrit/#/c/70537/
Change-Id: I58b8f10abb428a9fca39b27a9258697fde3c016e
Signed-off-by: Josh Hershberg <jhershbe@redhat.com>
Josh Hershberg [Wed, 25 Apr 2018 11:20:54 +0000 (11:20 +0000)]
Merge "comment out integration/test ITNeutronE2E"
Michael Vorburger [Mon, 23 Apr 2018 12:11:51 +0000 (14:11 +0200)]
comment out integration/test ITNeutronE2E
until we can figure out how to make it always pass
because it fails more often than not, see e.g.
https://lists.opendaylight.org/pipermail/neutron-dev/2018-April/thread.html
because Pax Exam based OSGi Integration Tests (IT)
just don't seem to be work reliably enough for us.
The equivalent new non-IT NeutronE2ETest introduced
in I9a2bcb8d6bb095993eec64714648944b25bcaaa4 can take the
place of ITNeutronE2E for future development in neutron.
Change-Id: I92068073b20d199fa2e71421d99b160224177fbc
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 10 Apr 2018 14:16:22 +0000 (16:16 +0200)]
bump EclipseLink Moxy JAXB implementation from 2.6.2 to 2.7.1
This is done (a) in the hope it may help with the weird spurious
test failures seen in NEUTRON-159, and (b) because it's generally
not a bad idea to bump versions of 3rd-party dependencies in major
releases.
Issue: NEUTRON-160
Change-Id: I27c44479d0755ae30eb191bff6f275033ff31fe3
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 19 Apr 2018 18:52:29 +0000 (20:52 +0200)]
remove org.osgi.core dependencies which are now no longer required - yay!
Change-Id: I4f2ad5e86f622537554b3df308dc02557c83a09e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Wed, 11 Apr 2018 18:09:46 +0000 (20:09 +0200)]
add non-IT NeutronE2ETest
Change-Id: I9a2bcb8d6bb095993eec64714648944b25bcaaa4
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Mon, 16 Apr 2018 10:49:13 +0000 (12:49 +0200)]
complete dependency inject CRUD implementations
Change-Id: Ib8d2843ff7de5790a67678c645770307091b4c20
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Fri, 13 Apr 2018 20:34:51 +0000 (22:34 +0200)]
start to dependency inject CRUD implementations (to be completed)
Change-Id: Ie5d4d12720404666709df98c8870de795fde26fb
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Fri, 13 Apr 2018 19:14:24 +0000 (21:14 +0200)]
private inline fetchINeutronCRUD and remove NeutronCRUDInterfaces
Change-Id: I94735fa65369947effe058986ecfbf68b34d7b61
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Fri, 13 Apr 2018 20:08:31 +0000 (22:08 +0200)]
remove irrelevant old JavaDoc from a long bygone era in northbound.api
and some other minor clean up like:
* make all Logger constants private
* move constants to beginning of class
* remove wrong empty lines, add required empty lines
* made some package local fields private
* remove clearly un-used fields
Change-Id: I0b087aae2dc35470e1d006675aa6f9c080d3de3f
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Fri, 13 Apr 2018 19:26:31 +0000 (21:26 +0200)]
minor neutron-hostconfig-vpp POM clean
the point of using *-artifacts is not to repeat the <version>
the use of the odl-netconf-api feature in this bundle is weird though,
we should separately have a closer look into cleaning that up.
also remove <scm> which duplicates project-neutron-parent
Change-Id: I9002e3b4a1b9113577842d2fac906e5d65bf5795
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Fri, 13 Apr 2018 19:30:27 +0000 (21:30 +0200)]
fix Java generics warning in INeutronRequest
Change-Id: I4a0520f12bb98c0a0bdbc055a010dc6b175ba694
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Fri, 13 Apr 2018 19:27:44 +0000 (21:27 +0200)]
fix neutron.spi generics warnings INeutronObject/[Base|Admin]Attributes
Change-Id: Id966e3bc59df29c79e93924894e625ce72ca5050
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 17 Apr 2018 16:47:15 +0000 (16:47 +0000)]
Merge "minor fix of obviously wrong Logger in NeutronSubnet (was NeutronSubnet)"
Isaku Yamahata [Tue, 17 Apr 2018 14:33:48 +0000 (14:33 +0000)]
Merge "remove Jetty dependency from northbound-api"
Michael Vorburger [Fri, 13 Apr 2018 19:11:50 +0000 (21:11 +0200)]
minor fix of obviously wrong Logger in NeutronSubnet (was NeutronSubnet)
FYI once we'll have enable FindBug enforcement, I can make this
automatically detected using infrautils:parent as the <parent> POM here;
would that be of interest to project neutron?
Change-Id: I689fdc9d6f7731336084788021994a7f30178f82
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Stephen Kitt [Thu, 22 Mar 2018 17:24:28 +0000 (18:24 +0100)]
Bump to odlparent 3.1.0 and yangtools 2.0.3
Change-Id: I813bec724b00e215b20215263928c14ef7eab918
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Isaku Yamahata [Mon, 16 Apr 2018 18:05:27 +0000 (18:05 +0000)]
Merge "Revert "Add Karaf build profile""
Thanh Ha [Fri, 13 Apr 2018 14:25:37 +0000 (14:25 +0000)]
Revert "Add Karaf build profile"
The integration/test module requires karaf so this is a valid reason for a project to have a karaf distro.
This reverts commit
8a28ebe52608c50ca2dfdf8e79698b05f0f91176.
Change-Id: I6bd92f6cabc2048c67745653b41e17e59a54f8a1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Michael Vorburger [Thu, 5 Apr 2018 05:01:52 +0000 (07:01 +0200)]
remove Jetty dependency from northbound-api
This was original required because of the use of the
org.eclipse.jetty.servlets.CrossOriginFilter.CrossOriginFilter
in the web.xml (now WebInitializer), but with the WebContextSecurer
this is now hidden inside the ShiroWebContextSecurer impl in AAA instead.
Change-Id: Ie5d537fefcb572dc23fc0683e5f9103240497488
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 10 Apr 2018 12:09:32 +0000 (14:09 +0200)]
remove usage of deprecated JaxbTestHelper utility in all tests
Change-Id: Ieac043116404be980c726a0f185375afd66ca010
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 10 Apr 2018 11:58:35 +0000 (13:58 +0200)]
improve JaxbTestHelper utility class with better type safe generics API
Change-Id: Ie65f7838588f08310d3cc8e12c435dc66ee1623d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 10 Apr 2018 11:45:38 +0000 (13:45 +0200)]
move all asserts on tenant_id to last in JAXB tests
This is to confirm the hypothesis that the weird occasional test
failures we see are ALL and ONLY due to some suspected possible
concurrency issue in getTenantID().
Issue: NEUTRON-159
Change-Id: Ibd1c1e925aa8ad25c4918dcdf16d2b7a0fe42afc
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 10 Apr 2018 09:46:02 +0000 (09:46 +0000)]
Merge "Add Karaf build profile"
Daniel Farrell [Fri, 6 Apr 2018 21:24:28 +0000 (17:24 -0400)]
Add Karaf build profile
Project local Karaf distros are handy for devs to test their work
however is unneeded by autorelease builds and should not be released
as part of the Simultanious Release. Add a profile that is active by
default so that default behaviour is unchanged however allows the
autorelease project to disable building this module.
Issue: RELENG-86
Change-Id: I09f95138ae5b5eb073d8556d36a2b47ec83a912d
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>
Michael Vorburger [Mon, 26 Feb 2018 13:45:53 +0000 (14:45 +0100)]
replace web.xml with programmatic registration
this is just the first step; once this is in,
we can replace much of the static etc. and directly
wire the web components and the OSGi beans and services.
The blueprint.xml is needed because of the weird AAA-170
issue with the pax-cdi-api @OsgiService annotation.
Using change Ia3a16df71384610a75acf3d28205c973c554d477
in AAA, we directly use the WebContextSecurer instead of
relying on aaa-shiro in code because that makes Neutron
code de-coupled from AAA (as it should be) and prevents
the KarafIniWebEnvironment dead-lock, see AAA-171.
Change-Id: I1dc13069b7e0ec456941f523e9dd4d560841f3e6
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Josh [Mon, 26 Mar 2018 23:35:10 +0000 (16:35 -0700)]
License name wrong in header of neutron-bgpvpns.yang
Change-Id: I967cac178ea9df8034ef3951d9d5bd7ea6361534
Signed-off-by: Josh <jhershbe@redhat.com>
Michael Vorburger [Thu, 15 Mar 2018 23:41:45 +0000 (00:41 +0100)]
fix mvn warnings in odl-neutron-service
[WARNING] Some problems were encountered while building the effective model for org.opendaylight.neutron:odl-neutron-service:feature:0.11.0-SNAPSHOT
[WARNING] 'dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: ${project.groupId}:odl-neutron-spi:xml:features -> duplicate declaration of version ${project.version} @ line 66, column 21
[WARNING] 'dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: ${project.groupId}:odl-neutron-northbound-api:xml:features -> duplicate declaration of version ${project.version} @ line 73, column 21
[WARNING]
[WARNING] It is highly recommended to fix these problems because they threaten the stability of your build.
[WARNING]
[WARNING] For this reason, future Maven versions might no longer support building such malformed projects.
Change-Id: I907f9df9be4894cf8f901cd0af1671a2c3db2f54
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 27 Feb 2018 16:54:42 +0000 (16:54 +0000)]
Merge "sort .gitignore"
Michael Vorburger [Tue, 27 Feb 2018 16:53:15 +0000 (16:53 +0000)]
Merge "Add missing license notice"
Isaku Yamahata [Sat, 24 Feb 2018 23:59:25 +0000 (15:59 -0800)]
sort .gitignore
Change-Id: Iedfd17e1a05e819189a1a2deeca6b2a9b8da2d78
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Sat, 24 Feb 2018 23:52:36 +0000 (15:52 -0800)]
Add missing license notice
As those files are committed under contribution agreement, they are all
under eclipse license.
Change-Id: I09cd15b2d41e154a25264832968603a6f4c7eff4
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Tue, 27 Feb 2018 14:58:34 +0000 (14:58 +0000)]
Merge "replace NeutronTranscriberProvider by standard OSGi Blueprint"
Michael Vorburger [Thu, 15 Feb 2018 19:25:43 +0000 (20:25 +0100)]
move non Karaf IT related code from integration/test to test-standalone
This allows to call the new class NeutronAllTests in another test env.
The ITNeutronE2E of course still runs just like before.
Change-Id: Ie72012416b4333660cf4b083a97d1e66156a6efa
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 15 Feb 2018 19:14:43 +0000 (20:14 +0100)]
move HTTP related test utils from ITNeutronE2E to (new) HttpUtils
Change-Id: I329bf348c3d698b1f277aec7715326d75231e029
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 27 Feb 2018 11:56:04 +0000 (11:56 +0000)]
Merge "split ITNeutronE2E actual test code from Karaf IT specific stuff"
Michael Vorburger [Tue, 27 Feb 2018 11:55:53 +0000 (11:55 +0000)]
Merge "remove odl-neutron-transcriber feature"
Michael Vorburger [Thu, 15 Feb 2018 22:59:03 +0000 (23:59 +0100)]
replace NeutronTranscriberProvider by standard OSGi Blueprint
plus some trivial mechanical changes (mostly) from Eclipse Save Actions,
like adding @Override and similar.
Change-Id: I78e1cad9a15aaeee5e49e63fc6b1a4ac111984e2
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 15 Feb 2018 20:29:19 +0000 (21:29 +0100)]
remove odl-neutron-transcriber feature
this is more of an internal implementation detail than something exposed
no ODL projects currently directly depend on odl-neutron-transcriber
Change-Id: I6968124b1a4015dec92158180cfe17b1f89d945d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 6 Feb 2018 21:46:48 +0000 (22:46 +0100)]
clean up project-neutron-parent
* remove <prerequisites><maven>3.1.1, as that is wrong (that's only for
Maven plugin projects, and odlparent has what this is meant to do with a
maven-enforcer instead)
* remove maven-surefire-plugin because it was commented out anyway
* remove maven-source-plugin, as odlparent (bundle-parent) already has
that, almost identically (bound to verify instead of deploy; same)
* remove maven-compiler-plugin, as odlparent already has that, almost
identically (it has -Xlint:deprecation but not -Xlint:unchecked, but
don't tell me anyone EVER looked at those compiler warnings? ;)
* remove maven-bundle-plugin because
<Bundle-Name>${project.groupId}.${project.artifactId} instead of default
${pom.name} is not consistent with rest of ODL; and
<manifestLocation>${project.build.directory}/META-INF should not be
needed
* remove site stuff which we don't really use anymore
Change-Id: I893511fcd510b8dc0c16d45846c85dce97c748a7
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 15 Feb 2018 18:58:52 +0000 (19:58 +0100)]
split ITNeutronE2E actual test code from Karaf IT specific stuff
This allows to call the new class NeutronAllTests in another test env.
Change-Id: Ia1ce18faee9113cd04669de5895811a36cf61418
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Tue, 27 Feb 2018 10:48:08 +0000 (10:48 +0000)]
Merge "create new objects not list classes in NeutronNorthboundRSApplication"
Michael Vorburger [Tue, 27 Feb 2018 10:46:23 +0000 (10:46 +0000)]
Merge "remove <security-constraint> from web.xml"
Michael Vorburger [Tue, 27 Feb 2018 10:45:53 +0000 (10:45 +0000)]
Merge "minor: removed ugly white space empty lines in some neutron-spi classes"
Michael Vorburger [Tue, 27 Feb 2018 10:42:53 +0000 (10:42 +0000)]
Merge "increase ITNeutronE2E Pax Exam time-out from default 3' to 15'"
Michael Vorburger [Tue, 27 Feb 2018 10:38:59 +0000 (10:38 +0000)]
Merge "Fix FindBugs violations"
Anil Belur [Mon, 26 Feb 2018 07:41:45 +0000 (17:41 +1000)]
Bump versions by x.(y+1).z for next dev cycle
Change-Id: I06c6fae5c37bc1daf1667dd3058d1b5131e851df
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Michael Vorburger [Thu, 15 Feb 2018 23:48:38 +0000 (00:48 +0100)]
create new objects not list classes in NeutronNorthboundRSApplication
this is related to & will be required by future work discussed on
https://lists.opendaylight.org/pipermail/neutron-dev/2018-February/001590.html
Change-Id: I18f0257bfe1dd346cc900c6dfbd4731c09b9ba75
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 15 Feb 2018 22:44:55 +0000 (23:44 +0100)]
minor: removed ugly white space empty lines in some neutron-spi classes
Change-Id: I011398bafbc96b3302d0fea6e9f7c760a7f8b16d
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 15 Feb 2018 20:37:14 +0000 (21:37 +0100)]
increase ITNeutronE2E Pax Exam time-out from default 3' to 15'
because this IT fails more often than not on the Jenkins jobs with this:
org.ops4j.pax.swissbox.tracker.ServiceLookupException:
gave up waiting for service org.ops4j.pax.exam.ProbeInvoker
but it always passes locally for me; so hoping that this will help.
Change-Id: Idc8f5e67e95238a1ec3d40518045ae47f23f53f4
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 15 Feb 2018 19:31:51 +0000 (20:31 +0100)]
minor: rm src/site/site.xml
Change-Id: I04966f4324dcdbf049a305232c8494bca53030b1
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Michael Vorburger [Thu, 15 Feb 2018 18:00:56 +0000 (19:00 +0100)]
remove <security-constraint> from web.xml
The original idea of this (back when Tomcat was still used, before
Karaf, perhaps?) probably was to protect URLs at the "web container
level", but... we ALSO have the Shiro AAAFilter, and my understanding is
that this Filter is what actually does the protection (today); therefore
I suspect that this <security-constraint> is now useless. We can remove
it to remove confusion for possible future work to replace the web.xml
with something else.
Change-Id: I23c74ed146364ee8864e31f7a8038a782bd32fba
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Isaku Yamahata [Tue, 13 Feb 2018 20:14:22 +0000 (12:14 -0800)]
use feature for inter-project dependency
NEUTRON-156: Use feature to express inter-project dependency correctly
instead of bundle.
For details, refer to
https://lists.opendaylight.org/pipermail/release/2018-January/013604.html
https://lists.opendaylight.org/pipermail/release/2017-September/012356.html
This depends on ovsdb patch to export necessary bundle as feature.
https://git.opendaylight.org/gerrit/#/c/68214/
Change-Id: I6963512084eb409090ed0f3a79138d2e4bf3802e
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Michael Vorburger [Tue, 6 Feb 2018 22:10:09 +0000 (23:10 +0100)]
Remove Maven site from POMs
Change-Id: I1ca71589559f4261525c9bb478c679d9c593df8a
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Tom Pantelis [Fri, 19 Jan 2018 21:14:18 +0000 (16:14 -0500)]
Eliminate unecessary yangtools version and cleanup poms
Changed the project-neutron-parent pom to derive from binding-parent so
yangtools version and dependencies come from mdsal. Also
derived all code projects from project-neutron-parent and
elimnated configurations duplicated from project-neutron-parent
(eg checkstyle).
Change-Id: Ic1691d69fd4c798a627effd6acff454753068818
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Luis Gomez [Thu, 18 Jan 2018 23:46:53 +0000 (15:46 -0800)]
Bump yangtools to 2.0.1
Change-Id: I64e22d433fe845a6809b06ebd65e207087583077
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
Tom Pantelis [Wed, 17 Jan 2018 20:40:50 +0000 (15:40 -0500)]
Fix FindBugs violations
- Confusing to have methods with similar names
- Class implements same interface as superclass
- Non-transient non-serializable instance field 'segments' in serializable class
- Method invokes toString() method on a String
- Boxed value is unboxed and then immediately reboxed
- Method ignores exceptional return value
Change-Id: If5bc9c997e879cffd44a4e3390e59a9cfabaf42e
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>