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>
Isaku Yamahata [Wed, 17 Jan 2018 03:24:02 +0000 (03:24 +0000)]
Merge "Adds Minimum Bandwidth Rule to the Qos Policy"
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>
Isaku Yamahata [Wed, 17 Jan 2018 00:59:43 +0000 (00:59 +0000)]
Merge "Remove MOXyJsonProvider from resources"
Isaku Yamahata [Tue, 16 Jan 2018 23:49:16 +0000 (23:49 +0000)]
Merge "Add binding profile attribute to NeutronPort object"
Isaku Yamahata [Tue, 16 Jan 2018 21:58:03 +0000 (21:58 +0000)]
Merge "Simplify odl-neutron-northbound-api POM"
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>
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>
Isaku Yamahata [Tue, 16 Jan 2018 19:21:41 +0000 (19:21 +0000)]
Merge "Minor improvement to Assert failure message in ITNeutronE2E"
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>
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>
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>
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>
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>
Isaku Yamahata [Tue, 9 Jan 2018 01:54:51 +0000 (01:54 +0000)]
Merge "checkstyle: add check style"
Isaku Yamahata [Tue, 9 Jan 2018 01:09:13 +0000 (01:09 +0000)]
Merge "findbugs: DM_CONVERT_CASE RCN_REDUNDANT_NULLCHECK_OF_NONNULL_VALUE"
Isaku Yamahata [Tue, 9 Jan 2018 01:08:49 +0000 (01:08 +0000)]
Merge "spi/NeutronSFCFlowClassifier: typo source, not dest"
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>
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>
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>
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>
Isaku Yamahata [Thu, 14 Dec 2017 17:45:21 +0000 (17:45 +0000)]
Merge "Sort out neutron object class hierarchy"
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>
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>
Isaku Yamahata [Mon, 9 Oct 2017 22:52:36 +0000 (22:52 +0000)]
Merge "BUG-9218: make hostconfig plugins depend on spi"
Isaku Yamahata [Mon, 9 Oct 2017 21:35:50 +0000 (21:35 +0000)]
Merge "Make utility class final"
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>
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>
David Suarez [Thu, 5 Oct 2017 08:49:50 +0000 (10:49 +0200)]
Make utility class final
- Make utility class final to avoid subclassing and implement private
constructor to avoid instantiation.
- Simplification of checkstyle plugin config relaying on the one defined
in odlparent.
Change-Id: Id35766de6dbc4ec2eab2717627a1c18b354d9aa5
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>
David Suarez [Thu, 28 Sep 2017 15:17:26 +0000 (17:17 +0200)]
Remove explicit default super-constructor calls
The default constructor is called by default (hence its name), no need
to call it explicitly.
Change-Id: I1a6417a55cc693956b35db7a5aa6a52b9fb7e0c9
Signed-off-by: David Suarez <david.suarez.fuentes@gmail.com>
Thanh Ha [Fri, 29 Sep 2017 03:56:40 +0000 (23:56 -0400)]
Bump yangtools dependency to 1.2.0
Issue: RELENG-485
Change-Id: I768d5139795e7e0aaeeb6377e385f1f0b600b1ef
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Stephen Kitt [Wed, 27 Sep 2017 13:35:23 +0000 (15:35 +0200)]
Bump odlparent 2.0.4 to 2.0.5
Change-Id: Id39cc60287e2e2de26b384ac71c3b22a2809922d
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Pramod [Tue, 22 Aug 2017 22:49:09 +0000 (15:49 -0700)]
Fix naming Inconsistency for Qos feature
Change-Id: I412a6b5ba4b73d21d614fa0b1980a4976f2688d5
Signed-off-by: Pramod <pramod.raghavendra.jayathirth@intel.com>
Thanh Ha [Mon, 14 Aug 2017 17:33:19 +0000 (13:33 -0400)]
Bump versions by x.(y+1).z for next dev cycle
Change-Id: I82e56f467548bfc1445d9627d9ceda90b3ca739a
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Stephen Kitt [Tue, 8 Aug 2017 16:14:09 +0000 (18:14 +0200)]
Bump odlparent 2.0.2 to 2.0.4
Change-Id: I54349c7bfdb1274738f84f7601396f290d72a457
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Tom Pantelis [Mon, 7 Aug 2017 14:18:45 +0000 (10:18 -0400)]
Remove config-parent derivation
The project does not use the config subsystem so removed
config-parent derivation and other CSS artifacts.
Change-Id: I184317f7583a356f190820c42f0a0f1dd15b9370
Signed-off-by: Tom Pantelis <tompantelis@gmail.com>
Isaku Yamahata [Tue, 1 Aug 2017 06:20:20 +0000 (23:20 -0700)]
neutron-hostconfig-ovs: add odl-aaa-cert dependency
odl-neutron-hostconfig-ovs SingleFeatureTest fails with the following
exception to load dependent feature.
> Caused by: java.lang.IllegalArgumentException: null encryptSalt in AaaEncryptServiceConfig: AaaEncryptServiceConfig{augmentations={}}
> at org.opendaylight.aaa.encrypt.AAAEncryptionServiceImpl.<init>(AAAEncryptionServiceImpl.java:68)
> at sun.reflect.NativeConstructorAccessorImpl.newInstance0(Native Method)
> at sun.reflect.NativeConstructorAccessorImpl.newInstance(NativeConstructorAccessorImpl.java:62)
> at sun.reflect.DelegatingConstructorAccessorImpl.newInstance(DelegatingConstructorAccessorImpl.java:45)
> at java.lang.reflect.Constructor.newInstance(Constructor.java:423)
> at org.apache.aries.blueprint.utils.ReflectionUtils.newInstance(ReflectionUtils.java:331)
> at org.apache.aries.blueprint.container.BeanRecipe.newInstance(BeanRecipe.java:984)
> at org.apache.aries.blueprint.container.BeanRecipe.getInstanceFromType(BeanRecipe.java:349)
> ... 30 more
Change-Id: I674cdaa1055b7aa3ecc02af485bf744f28101dbe
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Sun, 16 Jul 2017 06:21:55 +0000 (06:21 +0000)]
Merge "remove unused integration/test/src/main/features/features.xml"
Isaku Yamahata [Sat, 15 Jul 2017 20:57:27 +0000 (20:57 +0000)]
Merge "transcriber: parameterize Neutron type in AbstractNeutronInterface"
Isaku Yamahata [Sat, 15 Jul 2017 20:56:30 +0000 (20:56 +0000)]
Merge "pom: update dependency"
Isaku Yamahata [Fri, 14 Jul 2017 22:43:57 +0000 (15:43 -0700)]
pom: update dependency
Change-Id: Ie5c08c681c1e1dac19ff0b41be9193184f255bc6
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Fri, 14 Jul 2017 16:16:05 +0000 (09:16 -0700)]
integration-test: retry on ECONNREFUSED
If ECONNREFUSED, retry again instead of test failure.
Change-Id: Ib5d14e17f2d4a78f6c3ea230f70c8e82222099e2
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Thu, 13 Jul 2017 00:23:09 +0000 (17:23 -0700)]
remove unused integration/test/src/main/features/features.xml
It's not used.
Change-Id: I11367516306cc4f739a3ddffa43053ffdb0f7d5b
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Wed, 12 Jul 2017 09:17:51 +0000 (09:17 +0000)]
Merge "AbstractTranscriberInterface: correct readMd signature"
Isaku Yamahata [Thu, 6 Jul 2017 01:08:29 +0000 (18:08 -0700)]
transcriber: parameterize Neutron type in AbstractNeutronInterface
Make generic parameter of Neutron of AbstractNeutronInterface for Tap-aaS.
flow classifier of Tap-aaS is child of tap service in yang model,
not Neutron. In order to make base class usable for Tap-aaS, make parent
class of mode generic parameter.
Change-Id: Iba24657e14280a7b91200442c0a8abbea5d72912
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Thu, 6 Jul 2017 01:11:22 +0000 (18:11 -0700)]
AbstractTranscriberInterface: correct readMd signature
type parameter T of readMd() overwrites type parameter of the class.
rename T to W to avoid name conflict.
Change-Id: I8651661b9606c85195d53d47236986a244f0cf24
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Wed, 12 Jul 2017 05:38:17 +0000 (05:38 +0000)]
Merge "Bump odlparent dependency to 2.0.2"
Isaku Yamahata [Sat, 8 Jul 2017 09:23:11 +0000 (02:23 -0700)]
artifact: remove duplicated features-neutron-test dependency
eliminate the following warning.
> [WARNING] Some problems were encountered while building the effective model for org.opendaylight.neutron:neutron-artifacts:pom:0.9.0-SNAPSHOT
> [WARNING] 'dependencyManagement.dependencies.dependency.(groupId:artifactId:type:classifier)' must be unique: ${project.groupId}:features-neutron-test:xml:features -> duplicate declaration of version ${project.version} @ line 69, column 25
> [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: I127ee79eae5701a7c1d2f9805171dfa82c317233
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Tue, 11 Jul 2017 21:00:48 +0000 (14:00 -0700)]
features: make prerequisite=true for features of integration test
Change-Id: I9bc113574c1a90bf2caea849ed89d54a388eaa36
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Sat, 8 Jul 2017 05:21:04 +0000 (22:21 -0700)]
Bump odlparent dependency to 2.0.2
This patch updates the odlparent dependency from 2.0.0 to 2.0.2.
Change-Id: I47a140631512b738995c165cd27a736a87e4b291
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Fri, 23 Jun 2017 20:33:05 +0000 (20:33 +0000)]
Merge "rename SocketInfoTest alternative val"
matcauf [Fri, 23 Jun 2017 15:36:44 +0000 (11:36 -0400)]
rename SocketInfoTest alternative val
Change BIS with ALT for alternative val
Change-Id: I1c3ce33f29b63b3ea8cc9718514d0b8a9e7d6677
Signed-off-by: matcauf <mcauffiez@inocybe.ca>
Isaku Yamahata [Fri, 23 Jun 2017 15:26:13 +0000 (15:26 +0000)]
Merge "use maven-blueprint-plugin"
Isaku Yamahata [Thu, 13 Apr 2017 21:37:06 +0000 (14:37 -0700)]
use maven-blueprint-plugin
TODO: figure out how to convert NeutronHostconfigVppListener
Change-Id: Id3361cc5a1c4847484c1dfa6db3ca2ea7b87b5cb
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
matthieu [Tue, 20 Jun 2017 14:21:13 +0000 (10:21 -0400)]
Add unit test for SocketInfo
Change-Id: Ifd8fea3a65db3431f337208fabfb966c057c55d4
Signed-off-by: matthieu <mcauffiez@inocybe.com>
Isaku Yamahata [Wed, 21 Jun 2017 17:51:38 +0000 (10:51 -0700)]
drop 4 from karaf4
Change-Id: I851a95c97fc5e91a9ee585a89e18165966360746
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Wed, 21 Jun 2017 17:36:16 +0000 (10:36 -0700)]
Bump odlparent dependency to 2.0.0
This patch updates the dependency to 2.0.0.
and remove karaf3 related files.
Change-Id: I578d280d0525577ae27db44a747956d530409437
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Wed, 14 Jun 2017 18:12:14 +0000 (11:12 -0700)]
features.xml: fix indent
Change-Id: I0adcd06fae8fc604dd664762adcbc61f801dbd62
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Wed, 14 Jun 2017 17:01:01 +0000 (10:01 -0700)]
Integration Test migrate to Karaf4
Fix integration test to make it work on Karaf4
and enable integration test which was disabled by
https://git.opendaylight.org/gerrit/#/c/58869/
Change-Id: I7e16ecd09895f1f599eb447805ce7083fb700435
Signed-off-by: Dileep Ranganathan <dileep.ranganathan@intel.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Thanh Ha [Tue, 13 Jun 2017 20:22:50 +0000 (16:22 -0400)]
Migrate to odlparent 1.9.0
For now, integration test is disabled to avoid patch dependency.
The test will be re-enabled by follow up patch,
https://git.opendaylight.org/gerrit/#/c/55128/
Change-Id: I618f31a1fdf4da1236454620e21b3a7435c81d11
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Tue, 13 Jun 2017 15:59:45 +0000 (08:59 -0700)]
misc minor code clean up
typo in comment, remove unnecesarry parens.
Change-Id: I6a3bc45761305fdd40ecd76b9d1f02f32b8911f8
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Tue, 13 Jun 2017 16:04:55 +0000 (09:04 -0700)]
remove unnecessary cast
Change-Id: Ie6d73f1fef4ca977f95d5beaed90c96ee79f66ae
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Tue, 13 Jun 2017 15:57:30 +0000 (08:57 -0700)]
more on remove type from <>
Change-Id: I12b499eaccc4db65a5fd40f371f8d199da9a7d8a
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Tue, 13 Jun 2017 15:55:23 +0000 (08:55 -0700)]
Add missing override annotations
Change-Id: I6a87bee9b9638c52bef17921ccd12e5a3d29110e
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Tue, 13 Jun 2017 03:59:30 +0000 (03:59 +0000)]
Merge "integration/test/pom.xml: add logger for jacoco"
Isaku Yamahata [Mon, 5 Jun 2017 22:18:16 +0000 (15:18 -0700)]
integration/test/pom.xml: add logger for jacoco
nueutron logger was missing for jacoco.
and fix indent.
Change-Id: I941442e0421e722e94b597bde504d829d4d6f96e
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
David Suarez [Fri, 2 Jun 2017 15:39:38 +0000 (17:39 +0200)]
Replace LOGGER by LOG
Replace LOGGER by LOG to follow the OpenDaylight recommendations.
https://wiki.opendaylight.org/view/BestPractices/Logging_Best_Practices
Change-Id: Idad0d8a3d38e51dc5e0fd3d3e7d41a4b6c129eb1
Signed-off-by: David Suarez <david.suarez.fuentes@ericsson.com>
Isaku Yamahata [Tue, 13 Jun 2017 00:55:19 +0000 (00:55 +0000)]
Merge "Code Clean up: remove type from <>"
matthieu [Thu, 1 Jun 2017 20:16:13 +0000 (16:16 -0400)]
Code Clean up: remove type from <>
Since Java 7 is not necessary to explicit type from <>
Change-Id: Iccec01a57a0bd6d0bc19cebca153fabfa825c9ca
Signed-off-by: matthieu <mcauffiez@inocybe.com>