neutron.git
5 years agoadd transaction to exists() 28/72728/5
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>
5 years agointroduce INeutronCRUD.Result, instead of boolean 30/72730/1
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>
5 years agoQoS: Add support for direction 45/72345/5
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>
5 years agoMerge "Fixup Augmentable and Identifiable methods changing"
Michael Vorburger [Mon, 4 Jun 2018 15:26:46 +0000 (15:26 +0000)]
Merge "Fixup Augmentable and Identifiable methods changing"

5 years agoMerge "NEUTRON-162: vlan_transparent attribute is missing in network_attributes"
Josh Hershberg [Mon, 4 Jun 2018 10:34:13 +0000 (10:34 +0000)]
Merge "NEUTRON-162: vlan_transparent attribute is missing in network_attributes"

5 years agoTSC-115: Fix MinimumBandwidthRule direction 60/72460/3
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>
5 years agoFixup Augmentable and Identifiable methods changing 27/72527/1
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>
5 years agoconvert to Jersey 2 11/72311/5
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>
5 years agoreduce copy/paste between HttpUtils's test_create() methods 71/72371/1
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>
5 years agosingleton_sg_create(String securityGroupID) in NeutronSecurityGroupTests 70/72370/1
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>
5 years agomake all _test methods in NeutronSecurityRuleTests private 69/72369/1
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>
5 years agoMerge "Add feature identity for qos rule types"
Josh Hershberg [Mon, 28 May 2018 08:06:39 +0000 (08:06 +0000)]
Merge "Add feature identity for qos rule types"

5 years agoNEUTRON-162: vlan_transparent attribute is missing in network_attributes 98/72198/4
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>
5 years agoNETVIRT-1121: Add IGMP Protocol types 30/72130/1
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>
6 years agoRemove AbstractDataChangeListenerTest derivation 70/71770/1
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>
6 years agoAdd feature identity for qos rule types 31/70331/5
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>
6 years agoRevert "Add Karaf build profile" 54/70954/2
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>
6 years agoMerge "comment out integration/test ITNeutronE2E"
Josh Hershberg [Wed, 25 Apr 2018 11:20:54 +0000 (11:20 +0000)]
Merge "comment out integration/test ITNeutronE2E"

6 years agocomment out integration/test ITNeutronE2E 08/71208/1
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>
6 years agobump EclipseLink Moxy JAXB implementation from 2.6.2 to 2.7.1 17/70717/3
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>
6 years agoremove org.osgi.core dependencies which are now no longer required - yay! 25/71125/1
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>
6 years agoadd non-IT NeutronE2ETest 96/70796/9
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>
6 years agocomplete dependency inject CRUD implementations 77/70977/5
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>
6 years agostart to dependency inject CRUD implementations (to be completed) 32/70932/4
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>
6 years agoprivate inline fetchINeutronCRUD and remove NeutronCRUDInterfaces 31/70931/3
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>
6 years agoremove irrelevant old JavaDoc from a long bygone era in northbound.api 30/70930/3
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>
6 years agominor neutron-hostconfig-vpp POM clean 29/70929/3
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>
6 years agofix Java generics warning in INeutronRequest 28/70928/3
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>
6 years agofix neutron.spi generics warnings INeutronObject/[Base|Admin]Attributes 27/70927/3
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>
6 years agoMerge "minor fix of obviously wrong Logger in NeutronSubnet (was NeutronSubnet)"
Michael Vorburger [Tue, 17 Apr 2018 16:47:15 +0000 (16:47 +0000)]
Merge "minor fix of obviously wrong Logger in NeutronSubnet (was NeutronSubnet)"

6 years agoMerge "remove Jetty dependency from northbound-api"
Isaku Yamahata [Tue, 17 Apr 2018 14:33:48 +0000 (14:33 +0000)]
Merge "remove Jetty dependency from northbound-api"

6 years agominor fix of obviously wrong Logger in NeutronSubnet (was NeutronSubnet) 26/70926/2
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>
6 years agoBump to odlparent 3.1.0 and yangtools 2.0.3 79/69879/2
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>
6 years agoMerge "Revert "Add Karaf build profile""
Isaku Yamahata [Mon, 16 Apr 2018 18:05:27 +0000 (18:05 +0000)]
Merge "Revert "Add Karaf build profile""

6 years agoRevert "Add Karaf build profile" 15/70915/1
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>
6 years agoremove Jetty dependency from northbound-api 54/70354/2
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>
6 years agoremove usage of deprecated JaxbTestHelper utility in all tests 11/70711/1
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>
6 years agoimprove JaxbTestHelper utility class with better type safe generics API 08/70708/1
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>
6 years agomove all asserts on tenant_id to last in JAXB tests 06/70706/1
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>
6 years agoMerge "Add Karaf build profile"
Michael Vorburger [Tue, 10 Apr 2018 09:46:02 +0000 (09:46 +0000)]
Merge "Add Karaf build profile"

6 years agoAdd Karaf build profile 38/70538/1
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>
6 years agoreplace web.xml with programmatic registration 39/70339/2
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>
6 years agoLicense name wrong in header of neutron-bgpvpns.yang 23/70123/1
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>
6 years agofix mvn warnings in odl-neutron-service 43/69543/1
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>
6 years agoMerge "sort .gitignore"
Michael Vorburger [Tue, 27 Feb 2018 16:54:42 +0000 (16:54 +0000)]
Merge "sort .gitignore"

6 years agoMerge "Add missing license notice"
Michael Vorburger [Tue, 27 Feb 2018 16:53:15 +0000 (16:53 +0000)]
Merge "Add missing license notice"

6 years agosort .gitignore 69/68669/2
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>
6 years agoAdd missing license notice 68/68668/2
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>
6 years agoMerge "replace NeutronTranscriberProvider by standard OSGi Blueprint"
Isaku Yamahata [Tue, 27 Feb 2018 14:58:34 +0000 (14:58 +0000)]
Merge "replace NeutronTranscriberProvider by standard OSGi Blueprint"

6 years agomove non Karaf IT related code from integration/test to test-standalone 19/68319/4
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>
6 years agomove HTTP related test utils from ITNeutronE2E to (new) HttpUtils 17/68317/2
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>
6 years agoMerge "split ITNeutronE2E actual test code from Karaf IT specific stuff"
Michael Vorburger [Tue, 27 Feb 2018 11:56:04 +0000 (11:56 +0000)]
Merge "split ITNeutronE2E actual test code from Karaf IT specific stuff"

6 years agoMerge "remove odl-neutron-transcriber feature"
Michael Vorburger [Tue, 27 Feb 2018 11:55:53 +0000 (11:55 +0000)]
Merge "remove odl-neutron-transcriber feature"

6 years agoreplace NeutronTranscriberProvider by standard OSGi Blueprint 39/68339/3
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>
6 years agoremove odl-neutron-transcriber feature 27/68327/3
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>
6 years agoclean up project-neutron-parent 85/67985/2
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>
6 years agosplit ITNeutronE2E actual test code from Karaf IT specific stuff 16/68316/2
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>
6 years agoMerge "create new objects not list classes in NeutronNorthboundRSApplication"
Michael Vorburger [Tue, 27 Feb 2018 10:48:08 +0000 (10:48 +0000)]
Merge "create new objects not list classes in NeutronNorthboundRSApplication"

6 years agoMerge "remove <security-constraint> from web.xml"
Michael Vorburger [Tue, 27 Feb 2018 10:46:23 +0000 (10:46 +0000)]
Merge "remove <security-constraint> from web.xml"

6 years agoMerge "minor: removed ugly white space empty lines in some neutron-spi classes"
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"

6 years agoMerge "increase ITNeutronE2E Pax Exam time-out from default 3' to 15'"
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'"

6 years agoMerge "Fix FindBugs violations"
Michael Vorburger [Tue, 27 Feb 2018 10:38:59 +0000 (10:38 +0000)]
Merge "Fix FindBugs violations"

6 years agoBump versions by x.(y+1).z for next dev cycle 44/68744/1
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>
6 years agocreate new objects not list classes in NeutronNorthboundRSApplication 43/68343/3
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>
6 years agominor: removed ugly white space empty lines in some neutron-spi classes 38/68338/1
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>
6 years agoincrease ITNeutronE2E Pax Exam time-out from default 3' to 15' 29/68329/1
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>
6 years agominor: rm src/site/site.xml 20/68320/1
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>
6 years agoremove <security-constraint> from web.xml 15/68315/1
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>
6 years agouse feature for inter-project dependency 15/68215/2
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>
6 years agoRemove Maven site from POMs 87/67987/1
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>
6 years agoEliminate unecessary yangtools version and cleanup poms 64/67364/2
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>
6 years agoBump yangtools to 2.0.1 17/67317/1
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>
6 years agoFix FindBugs violations 53/67253/1
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>
6 years agoMerge "Adds Minimum Bandwidth Rule to the Qos Policy"
Isaku Yamahata [Wed, 17 Jan 2018 03:24:02 +0000 (03:24 +0000)]
Merge "Adds Minimum Bandwidth Rule to the Qos Policy"

6 years agoAdds Minimum Bandwidth Rule to the Qos Policy 70/60170/40
Pramod [Mon, 10 Jul 2017 22:36:19 +0000 (15:36 -0700)]
Adds Minimum Bandwidth Rule to the Qos Policy

Qos Feature on Neutron Northbound has supported
two rules initially. This patch facilitates the
addition of a third rule (minimim bandwidth rule)

https://specs.openstack.org/openstack/neutron-specs/specs/newton/ml2-qos-minimum-egress-bw-support.html

Change-Id: Ia3681a28e01c886f6e4ab84d16cf3204e0dad709
Signed-off-by: Pramod <pramod.raghavendra.jayathirth@intel.com>
6 years agoMerge "Remove MOXyJsonProvider from resources"
Isaku Yamahata [Wed, 17 Jan 2018 00:59:43 +0000 (00:59 +0000)]
Merge "Remove MOXyJsonProvider from resources"

6 years agoMerge "Add binding profile attribute to NeutronPort object"
Isaku Yamahata [Tue, 16 Jan 2018 23:49:16 +0000 (23:49 +0000)]
Merge "Add binding profile attribute to NeutronPort object"

6 years agoMerge "Simplify odl-neutron-northbound-api POM"
Isaku Yamahata [Tue, 16 Jan 2018 21:58:03 +0000 (21:58 +0000)]
Merge "Simplify odl-neutron-northbound-api POM"

6 years agoAdd binding profile attribute to NeutronPort object 15/66915/8
Edan David [Sun, 7 Jan 2018 08:15:25 +0000 (03:15 -0500)]
Add binding profile attribute to NeutronPort object

Binding profile is sent as a json string by networking-odl [1]
[1] https://review.openstack.org/#/c/529303/

Change-Id: Idd3fc6bd4df6daee26b67704697eb71f3a547048
Signed-off-by: Edan David <edandavi@gmail.com>
6 years agoreplace Jackson specific @JsonIgnore annotation with JAXB @XmlTransient 06/67206/2
Michael Vorburger [Tue, 16 Jan 2018 13:26:45 +0000 (14:26 +0100)]
replace Jackson specific @JsonIgnore annotation with JAXB @XmlTransient

on NeutronObject's setTenantID(Uuid tenantID), but note
setTenantID(String tenantID), although with @XmlElement(name =
"tenant_id") on field String tenantID and
@XmlAccessorType(XmlAccessType.NONE) annotating the setter was probably
pointless anyway,

and remove dependency to jackson-annotations,

because neutron (apparently, so learnt in NEUTRON-154!) uses Moxy and
not Jackson, at least clearly now it does, perhaps in the past it once
used Jackson, so this annotation was probably already always ignored
anyway.

This is safe and should not break anything, because if it did, then the
ITNeutronE2E would detect any major regressions (and it still passes
with this change).

found while rummaging around neutron code related to NEUTRON-154

Change-Id: I6b815cdade1a7e0877c456520f7f0f5b9215057c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoMerge "Minor improvement to Assert failure message in ITNeutronE2E"
Isaku Yamahata [Tue, 16 Jan 2018 19:21:41 +0000 (19:21 +0000)]
Merge "Minor improvement to Assert failure message in ITNeutronE2E"

6 years agoMinor improvement to Assert failure message in ITNeutronE2E 07/67207/2
Michael Vorburger [Tue, 16 Jan 2018 13:29:09 +0000 (14:29 +0100)]
Minor improvement to Assert failure message in ITNeutronE2E

this helped in understanding the test failure in NEUTRON-154,
and could help again in the future if we ever screw it up again.

Change-Id: Id3aa992c487fbc3ccd4910dab0d9f30c7ab9a520
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoSimplify odl-neutron-northbound-api POM 04/67204/2
Michael Vorburger [Tue, 16 Jan 2018 13:12:56 +0000 (14:12 +0100)]
Simplify odl-neutron-northbound-api POM

all of the dependencies removed are not required, because they already
are in and transitively inherited from northbound-api; so duplicating
them here adds no value, and only confusion (especially if we change
them in northbound-api; as in NEUTRON-154 or maybe later in NEUTRON-124
or if ever switching from Moxy to GSON or something).

This is safe and should not break anything, because if it did, then the
ITNeutronE2E would detect any major regressions (and it still passes
with this change).

Change-Id: I6b232321c2e73e55f050a74b277ac3894977ed59
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoMove jaxb.properties from wrong package to the correct one 03/67203/1
Michael Vorburger [Tue, 16 Jan 2018 12:59:57 +0000 (13:59 +0100)]
Move jaxb.properties from wrong package to the correct one

although the fact that everything works anyway clearly means that this
actually is not really currently needed.  I believe, based on
NEUTRON-154, that this is because the MOXyJsonProvider which we
configure in NeutronNorthboundRSApplication probably already does the
equivalent programmatically in code to what this jaxb.properties does
for JAXB.

However, instead of just deleting it, I do think keeping it here but in
the right place has value for being able to write unit tests for the
JAXB annotated API model binding classes in the future, if ever, e.g. to
unit test their JSON (de)serialization outside of JAX RS (and thus
NeutronNorthboundRSApplication) via standard JAXB APIs from such future
tests.

Change-Id: I98d001b862e8cc69529112a330b5195698889b5c
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
6 years agoRemove MOXyJsonProvider from resources 02/67202/1
Robert Varga [Mon, 15 Jan 2018 17:52:18 +0000 (18:52 +0100)]
Remove MOXyJsonProvider from resources

Fixes the following warning:
2018-01-15 18:50:26,021 | WARN  | ender-2-thread-1 | ResourceConfig                   |
 31 - com.sun.jersey.jersey-server - 1.17.0 | Class org.eclipse.persistence.jaxb.rs.MOXyJsonProvider is ignored as an instance is registered in the set of singletons

Change-Id: I57ef62ba1578c9c4ae2dd2c213a91d47b5230a23
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoBump to yangtools-2.0.0 and odlparent-3.0.2 09/66509/9
Tom Pantelis [Fri, 15 Dec 2017 14:02:04 +0000 (09:02 -0500)]
Bump to yangtools-2.0.0 and odlparent-3.0.2

This patch also embeds MOXy inside northbound-api in order to deal
with javax.ws.rs version mismatch between jersey (1.1.x) and jackson
(2.0.1), where MOXy has a revisionless import and hence binding
to jackson version -- preventing it from working with jersey;
see NEUTRON-154 for full background.

Change-Id: I9663ad4df3bae44e9de27ee0c7659cb2e3fa578a
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Signed-off-by: Michael Vorburger <vorburger@redhat.com>
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMerge "checkstyle: add check style"
Isaku Yamahata [Tue, 9 Jan 2018 01:54:51 +0000 (01:54 +0000)]
Merge "checkstyle: add check style"

6 years agoMerge "findbugs: DM_CONVERT_CASE RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"
Isaku Yamahata [Tue, 9 Jan 2018 01:09:13 +0000 (01:09 +0000)]
Merge "findbugs: DM_CONVERT_CASE RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"

6 years agoMerge "spi/NeutronSFCFlowClassifier: typo source, not dest"
Isaku Yamahata [Tue, 9 Jan 2018 01:08:49 +0000 (01:08 +0000)]
Merge "spi/NeutronSFCFlowClassifier: typo source, not dest"

6 years agofindbugs: DM_CONVERT_CASE RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE 00/66700/1
Isaku Yamahata [Thu, 21 Dec 2017 05:47:31 +0000 (21:47 -0800)]
findbugs: DM_CONVERT_CASE RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE

Change-Id: Iefb307926b33684f142419da7decbe8702844e52
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
6 years agospi/NeutronSFCFlowClassifier: typo source, not dest 99/66699/1
Isaku Yamahata [Thu, 21 Dec 2017 05:12:20 +0000 (21:12 -0800)]
spi/NeutronSFCFlowClassifier: typo source, not dest

Change-Id: I305ca8c9d248339a2b11f45387f68715d561f064
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
6 years agocheckstyle: add check style 96/66696/1
Isaku Yamahata [Thu, 21 Dec 2017 05:17:10 +0000 (21:17 -0800)]
checkstyle: add check style

some modules are missing check style.
Enable checkstyle enforcement for them.

Change-Id: I43c32675519cf56b4df96597c8d1be0b6a7b068a
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
6 years agoFix odlparent 3 Checkstyle issues 08/66508/1
Tom Pantelis [Fri, 15 Dec 2017 14:57:30 +0000 (09:57 -0500)]
Fix odlparent 3 Checkstyle issues

Change-Id: Id420b0bb2496974af3099f76ff5fbb50ee2caf8c
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
6 years agoMerge "Sort out neutron object class hierarchy"
Isaku Yamahata [Thu, 14 Dec 2017 17:45:21 +0000 (17:45 +0000)]
Merge "Sort out neutron object class hierarchy"

6 years agoSort out neutron object class hierarchy 38/53438/11
Ritu Sood [Mon, 6 Nov 2017 23:11:52 +0000 (15:11 -0800)]
Sort out neutron object class hierarchy

Consolidated uuid and tenant-id in yang models
Weather report filed for this.

Change-Id: Ib277b2da45ae3d1a273c8c783d16408d19229188
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Signed-off-by: Ritu Sood <ritu.sood@intel.com>
6 years agotapaas: tapaas support 24/53024/13
Isaku Yamahata [Wed, 8 Mar 2017 19:25:42 +0000 (11:25 -0800)]
tapaas: tapaas support
Added Tap-As-A-Service implementation in Neutron.
Added Northbound-api, spi and transcriber
Also added postman script to test the implementation.
Updated the copyright dates and names
Added unit tests and e2etests

Change-Id: I2febd008cfa86e70557123e82a1621eaa80e832c
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Signed-off-by: Kiran Kamineni <kiran.k.kamineni@intel.com>
6 years agoMerge "BUG-9218: make hostconfig plugins depend on spi"
Isaku Yamahata [Mon, 9 Oct 2017 22:52:36 +0000 (22:52 +0000)]
Merge "BUG-9218: make hostconfig plugins depend on spi"

6 years agoMerge "Make utility class final"
Isaku Yamahata [Mon, 9 Oct 2017 21:35:50 +0000 (21:35 +0000)]
Merge "Make utility class final"

6 years agoBUG-9218: make hostconfig plugins depend on spi 91/64091/1
Robert Varga [Mon, 9 Oct 2017 14:54:46 +0000 (16:54 +0200)]
BUG-9218: make hostconfig plugins depend on spi

Rather than packaging model/spi bundles, make plugins depend
on old-neutron-spi.

Change-Id: I95da0d5d304aabaebbc4bffcdf1e0ef96d3e3bc8
Signed-off-by: Robert Varga <robert.varga@pantheon.tech>
6 years agoMake utility class final 81/63781/3
David Suarez [Thu, 28 Sep 2017 15:21:28 +0000 (17:21 +0200)]
Make utility class final

Make utility class final to avoid subclassing and implement private
constructor to avoid instantiation.

Change-Id: I7655b402cc9682ecae347d4cfba0b51a415bff72
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>