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 19:31:51 +0000 (20:31 +0100)]
minor: rm src/site/site.xml
Change-Id: I04966f4324dcdbf049a305232c8494bca53030b1
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>
Stephen Kitt [Mon, 12 Jun 2017 09:26:23 +0000 (11:26 +0200)]
Bug 8660: use southbound-artifacts
Instead of pulling in odl-ovsdb-southbound-api as an artifact POM, use
southbound-artifacts.
Change-Id: I6ca7f82b66fa4e2680393afc3efbac0ce151cd20
Signed-off-by: Stephen Kitt <skitt@redhat.com>
Isaku Yamahata [Mon, 12 Jun 2017 21:57:03 +0000 (14:57 -0700)]
unbreak build
The dependency needs update otherwise, the following error occurs.
> [INFO] --- maven-surefire-plugin:2.18.1:test (default) @ odl-neutron-hostconfig-vpp ---
> [INFO] Surefire report directory: /home/yamahata/opendaylight/upstream/neutron/features/production/odl-neutron-hostconfig-vpp/target/surefire-reports
>
> -------------------------------------------------------
> T E S T S
> -------------------------------------------------------
> Running org.opendaylight.odlparent.featuretest.SingleFeatureTest
> Tests run: 1, Failures: 0, Errors: 1, Skipped: 0, Time elapsed: 11.912 sec <<< FAILURE! - in org.opendaylight.odlparent.featuretest.SingleFeatureTest
> installFeatureCatchAndLog(org.opendaylight.odlparent.featuretest.SingleFeatureTest)[repoUrl: file:/home/yamahata/opendaylight/upstream/neutron/features/production/odl-neutron-hostconfig-vpp/target/feature/feature.xml, Feature: odl-neutron-hostconfig-vpp 0.9.0.SNAPSHOT] Time elapsed: 11.342 sec <<< ERROR!
> org.osgi.service.resolver.ResolutionException: Unable to resolve root: missing requirement [root] osgi.identity; osgi.identity=odl-netconf-util; type=karaf.feature; version=1.3.0.SNAPSHOT; filter:="(&(osgi.identity=odl-netconf-util)(type=karaf.feature)(version>=1.3.0.SNAPSHOT))" [caused by: Unable to resolve odl-netconf-util/1.3.0.SNAPSHOT: missing requirement [odl-netconf-util/1.3.0.SNAPSHOT] osgi.identity; osgi.identity=odl-netconf-mapping-api; type=karaf.feature; version="[1.3.0.SNAPSHOT,1.3.0.SNAPSHOT]" [caused by: Unable to resolve odl-netconf-mapping-api/1.3.0.SNAPSHOT: missing requirement [odl-netconf-mapping-api/1.3.0.SNAPSHOT] osgi.identity; osgi.identity=odl-netconf-api; type=karaf.feature; version="[1.3.0.SNAPSHOT,1.3.0.SNAPSHOT]" [caused by: Unable to resolve odl-netconf-api/1.3.0.SNAPSHOT: missing requirement [odl-netconf-api/1.3.0.SNAPSHOT] osgi.identity; osgi.identity=org.opendaylight.controller.yang-jmx-generator; type=osgi.bundle; version="[0.7.0.SNAPSHOT,0.7.0.SNAPSHOT]"; resolution:=mandatory [caused by: Unable to resolve org.opendaylight.controller.yang-jmx-generator/0.7.0.SNAPSHOT: missing requirement [org.opendaylight.controller.yang-jmx-generator/0.7.0.SNAPSHOT] osgi.wiring.package; filter:="(&(osgi.wiring.package=org.opendaylight.mdsal.binding.generator.spi)(version>=0.11.0)(!(version>=1.0.0)))"]]]]
> at org.apache.felix.resolver.ResolutionError.toException(ResolutionError.java:42)
> at org.apache.felix.resolver.ResolverImpl.doResolve(ResolverImpl.java:389)
> at org.apache.felix.resolver.ResolverImpl.resolve(ResolverImpl.java:375)
> at org.apache.felix.resolver.ResolverImpl.resolve(ResolverImpl.java:347)
> at org.apache.karaf.features.internal.region.SubsystemResolver.resolve(SubsystemResolver.java:216)
> at org.apache.karaf.features.internal.service.Deployer.deploy(Deployer.java:263)
> at org.apache.karaf.features.internal.service.Deployer.deploy(Deployer.java:259)
> at org.apache.karaf.features.internal.service.Deployer.deploy(Deployer.java:259)
> at org.apache.karaf.features.internal.service.FeaturesServiceImpl.doProvision(FeaturesServiceImpl.java:1176)
> at org.apache.karaf.features.internal.service.FeaturesServiceImpl$1.call(FeaturesServiceImpl.java:1074)
> at java.util.concurrent.FutureTask.run(FutureTask.java:266)
> at java.util.concurrent.ThreadPoolExecutor.runWorker(ThreadPoolExecutor.java:1142)
> at java.util.concurrent.ThreadPoolExecutor$Worker.run(ThreadPoolExecutor.java:617)
> at java.lang.Thread.run(Thread.java:748)
>
>
> Results :
>
> Tests in error:
> Unable to resolve root: missing requirement [root] osgi.identity; osgi.identity=odl-netconf-util; type=karaf.feature; version=1.3.0.SNAPSHOT; filter:="(&(osgi.identity=odl-netconf-util)(type=karaf.feature)(version>=1.3.0.SNAPSHOT))" [caused by: Unable to resolve odl-netconf-util/1.3.0.SNAPSHOT: missing requirement [odl-netconf-util/1.3.0.SNAPSHOT] osgi.identity; osgi.identity=odl-netconf-mapping-api; type=karaf.feature; version="[1.3.0.SNAPSHOT,1.3.0.SNAPSHOT]" [caused by: Unable to resolve odl-netconf-mapping-api/1.3.0.SNAPSHOT: missing requirement [odl-netconf-mapping-api/1.3.0.SNAPSHOT] osgi.identity; osgi.identity=odl-netconf-api; type=karaf.feature; version="[1.3.0.SNAPSHOT,1.3.0.SNAPSHOT]" [caused by: Unable to resolve odl-netconf-api/1.3.0.SNAPSHOT: missing requirement [odl-netconf-api/1.3.0.SNAPSHOT] osgi.identity; osgi.identity=org.opendaylight.controller.yang-jmx-generator; type=osgi.bundle; version="[0.7.0.SNAPSHOT,0.7.0.SNAPSHOT]"; resolution:=mandatory [caused by: Unable to resolve org.opendaylight.controller.yang-jmx-generator/0.7.0.SNAPSHOT: missing requirement [org.opendaylight.controller.yang-jmx-generator/0.7.0.SNAPSHOT] osgi.wiring.package; filter:="(&(osgi.wiring.package=org.opendaylight.mdsal.binding.generator.spi)(version>=0.11.0)(!(version>=1.0.0)))"]]]]
>
> Tests run: 1, Failures: 0, Errors: 1, Skipped: 0
Change-Id: If869c8d7ccb71a1651046e1134b69645cd44112e
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Thanh Ha [Sat, 10 Jun 2017 02:46:18 +0000 (22:46 -0400)]
Migrate to odlparent 1.8.0-Carbon
Per request of odlparent project we are downgrading all Nitrogen
projects to use the released odlparent 1.8.0-Carbon to allow for the
odlparent project to start performing semver style releases.
Change-Id: I08967c90e05ce6534055a81ea93510a587dfde6a
Jira: RELENG-159
RT: 41406
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
Isaku Yamahata [Fri, 26 May 2017 23:27:11 +0000 (16:27 -0700)]
neutron spi: consolidate extractFields() method
Change-Id: Ibe9479b88004865724a5fa443f49a5297b541369
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Wed, 24 May 2017 23:13:26 +0000 (23:13 +0000)]
Merge "Fix sonar issue: multiple if statements"
matthieu [Mon, 15 May 2017 17:25:50 +0000 (13:25 -0400)]
Fix sonar issue: multiple if statements
Change multiple if statements on string with a
switch case, It can also be changed with an enum.
This is solving some sonar complexity code issues,
giving a cleaner and maybe faster code.
Add warn log for ignored fields
Change-Id: I1cc717e4d0935a9c3c4c74307fbf2c0696e1648e
Signed-off-by: matthieu <mcauffiez@inocybe.com>
Isaku Yamahata [Sat, 20 May 2017 17:38:18 +0000 (17:38 +0000)]
Merge "Code cleanup: ternary operator."
matthieu [Mon, 15 May 2017 20:20:35 +0000 (16:20 -0400)]
Code cleanup: ternary operator.
Remove conditional var assignment and use
ternary operator instead, in order to have less
assignment and a cleaner code.
Assigne directly the conditional operation result
to the boolean var firstpage.
Change-Id: Id124a84f513b7e1a506c6d1d13eaf8539cf2e8d6
Signed-off-by: matthieu <mcauffiez@inocybe.com>
matthieu [Tue, 16 May 2017 18:14:26 +0000 (14:14 -0400)]
Code cleanup: Useless assignment
Remove one useless assignment.
Change-Id: I4d3dcc76f84e3529daea43061e4857d3d9dae659
Signed-off-by: matthieu <mcauffiez@inocybe.com>
Isaku Yamahata [Wed, 10 May 2017 16:04:08 +0000 (16:04 +0000)]
Merge "Fix Sonar issue: Code readability"
Isaku Yamahata [Wed, 10 May 2017 16:00:28 +0000 (16:00 +0000)]
Merge "Fix sonar issue: unused LOG"
mcauffiez [Fri, 5 May 2017 14:43:43 +0000 (10:43 -0400)]
Fix Sonar issue: Code readability
Adress Major sonar issues for NeutronHostconfigVppListener.java file.
This patch improves code readability.
Use final temporary var instead of using the method parameter
vhostMode.
Reduce the lambda content by creating a new method:
processDataTreeModification.
Reduce the cyclomatic complexity of validateVppNode by adding the
boolean function isCapabilitiesPresent.
Change-Id: Ie2b3fa85772707f8c86901415dd1ca8d0a7eef47
Signed-off-by: mcauffiez <mcauffiez@inocybe.com>
mcauffiez [Tue, 9 May 2017 14:36:45 +0000 (10:36 -0400)]
Fix sonar issue: unused LOG
Remove unused Log and corresponding imports
Change-Id: Ie32e2aa8eb74fe880c368d8a7bc7fd990096074b
Signed-off-by: mcauffiez <mcauffiez@inocybe.com>
mcauffiez [Fri, 5 May 2017 15:51:05 +0000 (11:51 -0400)]
FIX sonar issue: Commented code
Remove ; in order to stop raising the issue
Change-Id: I164c7bed6e555d3cca9c11fbafdfcb98c8ea22f7
Signed-off-by: mcauffiez <mcauffiez@inocybe.com>
Isaku Yamahata [Thu, 27 Apr 2017 22:57:23 +0000 (15:57 -0700)]
use com.google.common.net.InetAddresses.forString()
instead of InteAddress.getByName(), use
com.google.common.net.InetAddresses.forString which is better.
Change-Id: Ic7405524882f94ecdd614f0b533deb093db0c8f3
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Tomas Cechvala [Tue, 2 May 2017 11:33:28 +0000 (13:33 +0200)]
Updating yang revisions in hostconfig for VPP
Added 2017-03-15 revision for honeycomb 1704
Config file is automatically copied to ${KARAF}/etc
Change-Id: I1b8bfa4d1f7230252286ead5b95af8c1c3192f70
SIGned-off-by: Tomas Cechvala <tcechval@cisco.com>
Signed-off-by: Dileep <dileep.ranganathan@intel.com>
Isaku Yamahata [Wed, 26 Apr 2017 23:32:47 +0000 (23:32 +0000)]
Merge "Add service-provider-feature for operational port status"
Josh [Sun, 23 Apr 2017 08:29:01 +0000 (11:29 +0300)]
Add service-provider-feature for operational port status
This commit adds a service-provider-feature for port-status,
operational-port-status. This feature should be set in operational
when netvirt knows how to update port status in operational when
a port becomes active.
Change-Id: I7fe7c6998f67380338e240355def7d2676c98335
Signed-off-by: Josh <jhershbe@redhat.com>
Lorand Jakab [Wed, 19 Apr 2017 18:40:20 +0000 (21:40 +0300)]
Prepare for checkstyle version upgrade
Checkstyle will be upgraded from 6.16 to 7.6.1 with [0]. This patch
fixes failres seen by the new version.
[0] https://git.opendaylight.org/gerrit/#/c/54981/
Change-Id: Ia84e1515810d162e0e813bdfeaec10721d06bba5
Signed-off-by: Lorand Jakab <lojakab@cisco.com>
Anil Belur [Tue, 11 Apr 2017 01:45:46 +0000 (11:45 +1000)]
Bump versions by x.(y+1).z for next dev cycle
Change-Id: I791386fdba5e478e85df5c78c95fc8fbb1dcfe99
Signed-off-by: Anil Belur <abelur@linuxfoundation.org>
Isaku Yamahata [Fri, 17 Mar 2017 05:52:59 +0000 (22:52 -0700)]
transcriber: remove redundant code in l2gw
Change-Id: I44c48614c1b2fa2aa2268c0cecf275b7638e7e68
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>
Isaku Yamahata [Fri, 17 Mar 2017 04:58:40 +0000 (04:58 +0000)]
Merge "transcriber: qos policy rule"
Isaku Yamahata [Fri, 17 Mar 2017 02:29:49 +0000 (02:29 +0000)]
Merge "Neutron Model update"
Isaku Yamahata [Fri, 17 Mar 2017 01:58:35 +0000 (18:58 -0700)]
transcriber: qos policy rule
QosPolicyRuleBuilder is wrongly allocated.
It should be allocated per each rule.
Change-Id: Ib5f35c48e7933bbbfe133993f64abd7a5379286d
Signed-off-by: Isaku Yamahata <isaku.yamahata@intel.com>