integration/distribution.git
9 years agoMerge "Adding nic features"
Luis Gomez [Thu, 30 Apr 2015 01:57:12 +0000 (01:57 +0000)]
Merge "Adding nic features"

9 years agoAdding nic features
Renato Aguiar [Mon, 27 Apr 2015 16:43:51 +0000 (09:43 -0700)]
Adding nic features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/nic/job/nic-merge-master/20/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=nic.git;a=blob;f=features/src/main/resources/features.xml;h=66ab48c12a5dc6965aac2a26c8719a6e9261366b;hb=HEAD
a) Feature Names (prefixed with 'odl-'): odl-nic-core odl-nic-console
b) Features Descriptions: Present (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description)
c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
a) feature:install odl-nic-core
b) feature:install odl-nic-core odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: I68c251dfb62fcbf989ce1c0ea5f5f7c41ec8ad3c
Signed-off-by: Renato Aguiar <renato.aguiar@hp.com>
9 years agoMerge "Remove opendaylight-karaf-empty from integration repo"
Luis Gomez [Tue, 28 Apr 2015 18:17:05 +0000 (18:17 +0000)]
Merge "Remove opendaylight-karaf-empty from integration repo"

9 years agoMerge "added lithium features of ofPlugin"
Luis Gomez [Tue, 28 Apr 2015 17:44:58 +0000 (17:44 +0000)]
Merge "added lithium features of ofPlugin"

9 years agoadded lithium features of ofPlugin
Michal Rehak [Mon, 27 Apr 2015 18:55:58 +0000 (20:55 +0200)]
added lithium features of ofPlugin

Change-Id: Idc2730512172d8bcdc90e81c12c087b8a9613b81
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoRemove opendaylight-karaf-empty from integration repo
Luis Gomez [Tue, 28 Apr 2015 06:01:05 +0000 (23:01 -0700)]
Remove opendaylight-karaf-empty from integration repo

Change-Id: I2eb7cb390323d5ddcd7216428f4786a0b43a63ae
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoMerge "Adding TSDR features to integration project."
Luis Gomez [Mon, 27 Apr 2015 21:46:32 +0000 (21:46 +0000)]
Merge "Adding TSDR features to integration project."

9 years agoAdding TSDR features to integration project.
YuLing Chen [Sat, 18 Apr 2015 01:05:02 +0000 (18:05 -0700)]
Adding TSDR features to integration project.

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/job/tsdr-merge-master/org.opendaylight.tsdr$features-tsdr/19/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=tsdr.git;a=blob;f=features/src/main/resources/features.xml;h=62febc1a6f0c10375d9ca61a913a787cc6491b7d;hb=6e434b6790b86ecf9ca685118a7f24ed33a42deb
   a) Feature Names (prefixed with 'odl-'): odl-tsdr-all, odl-tsdr-hbase (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming)
   b) Features Descriptions: Present ( check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description)
   c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
   a) feature:install odl-tsdr-all
   b) feature:install odl-tsdr-hbase
4) Integration Test Impact: None

Change-Id: I001595aa219d9889345b4a3dffe76ce17251460a
Signed-off-by: YuLing Chen <yuling_c@dell.com>
9 years agoMerge "Do not override Karaf version"
Luis Gomez [Wed, 22 Apr 2015 04:35:19 +0000 (04:35 +0000)]
Merge "Do not override Karaf version"

9 years agoDo not override Karaf version
Tony Tkacik [Tue, 21 Apr 2015 09:14:00 +0000 (11:14 +0200)]
Do not override Karaf version

Change-Id: I7bae23b613b62ade6bec312c72fbddb1ae15a98a
Signed-off-by: Tony Tkacik <ttkacik@cisco.com>
9 years agoChanging vpnservice feature to not-compatible feature
Luis Gomez [Mon, 20 Apr 2015 21:00:12 +0000 (14:00 -0700)]
Changing vpnservice feature to not-compatible feature

vpnservice feature breaks restconf so it does impact other people.
Once this issue gets addressed, it can be moved back to compatible.

Change-Id: I3a4216c779b9c96fb64ef4ca97d9bc58a274ae89
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoMerge "Adding SFC-OVS and SFC-netconf to Integration"
Luis Gomez [Mon, 20 Apr 2015 17:07:53 +0000 (17:07 +0000)]
Merge "Adding SFC-OVS and SFC-netconf to Integration"

9 years agoAdding SFC-OVS and SFC-netconf to Integration
Reinaldo Penno [Sun, 19 Apr 2015 06:44:25 +0000 (23:44 -0700)]
Adding SFC-OVS and SFC-netconf to Integration

Change-Id: I286f32eeee999cf0cb26a67c5205a64bf4ce236e
Signed-off-by: Reinaldo Penno <rapenno@gmail.com>
9 years agoProperties in root pom.xml are sorted now.
Vratko Polak [Wed, 15 Apr 2015 12:37:47 +0000 (14:37 +0200)]
Properties in root pom.xml are sorted now.

Secondary objectives:
See that distribution-verify job gets triggered.
See the job pass, as part of examination
of mysterious failures on other submissions.

Change-Id: Ic5c032d6a70e274c379fe6ba69444b63d3245490
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
9 years agoMerge "Added iotdm feature to integration"
Luis Gomez [Tue, 14 Apr 2015 21:51:15 +0000 (21:51 +0000)]
Merge "Added iotdm feature to integration"

9 years agoAdded iotdm feature to integration
John Burns [Tue, 14 Apr 2015 21:27:06 +0000 (14:27 -0700)]
Added iotdm feature to integration

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/iotdm/job/iotdm-merge-master/org.opendaylight.iotdm$onem2m-features/9/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=iotdm.git;a=blob;f=onem2m/onem2m-features/src/main/features/features.xml;h=4d98920ad269afcdeb3d102a43b394d265508d36;hb=master
  a) Feature Names (prefixed with 'odl-'): odl-iotdm-onem2m (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming)
  b) Features Descriptions: Present (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description)
  c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
  a) feature:install odl-iotdm-onem2m
  b) feature:install odl-iotdm-onem2m, odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: I6b13350b262a7c9387d05a93548af9cb51a94052
Signed-off-by: John Burns <johnburn@cisco.com>
9 years agoMerge "Adding back sfclisp to features index."
Luis Gomez [Mon, 13 Apr 2015 16:15:00 +0000 (16:15 +0000)]
Merge "Adding back sfclisp to features index."

9 years agoAdding back sfclisp to features index.
Vratko Polak [Thu, 9 Apr 2015 12:47:09 +0000 (14:47 +0200)]
Adding back sfclisp to features index.

Sfclisp was removed in this change:
https://git.opendaylight.org/gerrit/#/c/17864/
to unblock distribution jobs.

Since then, SFC project has merged
https://git.opendaylight.org/gerrit/#/c/17725/
and there were many merges to other projects
which might have fixed sfclisp issues.

This patch tries to add sfclisp back to Integration
to see whether distribution-verify job succeeds.

Change-Id: I261dcd489675f64b3f140c95eeea5d5b4815e4f3
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
9 years agoCleaning pom.xml file duplicate dependencies
Luis Gomez [Fri, 10 Apr 2015 20:44:39 +0000 (13:44 -0700)]
Cleaning pom.xml file duplicate dependencies

Change-Id: Icd08f100609b0e09a2806e1c8bdaeec5a55db9ff
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoMerge "Remove features-flow from dependencies."
Luis Gomez [Fri, 10 Apr 2015 20:15:35 +0000 (20:15 +0000)]
Merge "Remove features-flow from dependencies."

9 years agoRemove features-flow from dependencies.
Vratko Polak [Thu, 9 Apr 2015 13:14:55 +0000 (15:14 +0200)]
Remove features-flow from dependencies.

Flow related stuff was moved from Controller to OpenFlowPlugin.
The features-flow atrifact itself was removed here:
https://git.opendaylight.org/gerrit/#/c/17978/

Integration project should stop depending on this artifact.

This is a verify-triggering version of
https://git.opendaylight.org/gerrit/#/c/18079/

Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Change-Id: I790ff6c0a253bec73c10844fdec1d86aea94a878

9 years agofixing alphabatical order for capwap in feature repository. thanks to Vratkfor the...
Navin Agrawal [Wed, 8 Apr 2015 15:47:42 +0000 (08:47 -0700)]
fixing alphabatical order for capwap in feature repository. thanks to Vratkfor the review comment.

Change-Id: Idb27681e66009074063e5f956e1eae8325322295
Signed-off-by: Navin Agrawal <anavin@gmail.com>
9 years agoAdding capwap features
Navin Agrawal [Mon, 6 Apr 2015 06:18:46 +0000 (23:18 -0700)]
Adding capwap features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/job/capwap-merge-master/4/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=capwap.git;a=blob;f=features/src/main/features/features.xml;h=7a747ce3bd157bde730c475e5f91c010d6aaf877;hb=HEAD
a) Feature Names: Prefixed with 'odl-' : odl-capwap-ac-rest
b) Features Descriptions: Present
c) Features Start-Levels: No start-levels on <bundle> elements or <feature> elements
3) Features Tested: Features have been tested for functionality with
a) feature:install odl-capwap-ac-rest
b) feature:install odl-integration-compatible-with-all
4) Integration Test Impact - none

Change-Id: I7bd315f3bcaf9fbb21003cf978089b803b356b16
Signed-off-by: Navin Agrawal <anavin@gmail.com>
9 years agoRemoving sfclisp to unblock integration
Luis Gomez [Tue, 7 Apr 2015 17:03:37 +0000 (19:03 +0200)]
Removing sfclisp to unblock integration

Change-Id: Ic43d9bdfd2ff84e97f13f08dcb2b0d30a0c8b5b9
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoMerge "Remove Packetcable from integration."
Luis Gomez [Fri, 27 Mar 2015 20:45:52 +0000 (20:45 +0000)]
Merge "Remove Packetcable from integration."

9 years agoRemove Packetcable from integration.
Vratko Polak [Fri, 27 Mar 2015 15:42:39 +0000 (16:42 +0100)]
Remove Packetcable from integration.

Packetcable project in current state is preventing
Integration project to create ODL distribution builds.

Until https://git.opendaylight.org/gerrit/#/c/17222/ is merged,
packetcable features and repositories are commented out.

Change-Id: I1a6125586fe1d423a73f767483084efcaa5928e6
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
9 years agoMerge "Revert "Add odlparent relativepath relative to autorelease""
Luis Gomez [Thu, 26 Mar 2015 21:41:28 +0000 (21:41 +0000)]
Merge "Revert "Add odlparent relativepath relative to autorelease""

9 years agoRevert "Add odlparent relativepath relative to autorelease"
Thanh Ha [Thu, 26 Mar 2015 18:58:22 +0000 (14:58 -0400)]
Revert "Add odlparent relativepath relative to autorelease"

Per discussion on mailing list thread we have decided to revert this
change and achieve relative path updating via scripting in autorelease.

https://lists.opendaylight.org/pipermail/release/2015-March/001754.html

This reverts commit 2da011ef1cb74556db256f76ddb23cf29fefbec3.

Change-Id: I557703bedc13bff0555784935116907d7e4f10ee
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoGetting rid off test distribution + sorting features
Luis Gomez [Thu, 26 Mar 2015 02:47:14 +0000 (19:47 -0700)]
Getting rid off test distribution + sorting features

Change-Id: I86486f8cab403764f6602f100f27162dfe5025a4
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoMerge "Adding odl-sfc-ui and odl-sfc-sb-rest."
Luis Gomez [Fri, 20 Mar 2015 01:12:58 +0000 (01:12 +0000)]
Merge "Adding odl-sfc-ui and odl-sfc-sb-rest."

9 years agoAdding odl-sfc-ui and odl-sfc-sb-rest.
Vratko Polak [Thu, 19 Mar 2015 15:35:32 +0000 (16:35 +0100)]
Adding odl-sfc-ui and odl-sfc-sb-rest.

Those 2 features were left out of the previous change to update
the "odl-sfc-all" SFC feature name.

Also added features-sfc-sb-rest repository.

Change-Id: I4d993439dd5350ac4561a497dece50020b2bc14a
Signed-off-by: Brady Johnson <brady.allen.johnson@ericsson.com>
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
9 years agoAdding lacp feature
kalaiselvik [Thu, 19 Mar 2015 11:57:40 +0000 (17:27 +0530)]
Adding lacp feature

1)Feature Tests Pass:
https://jenkins.opendaylight.org/releng/job/lacp-merge-master/33/org.opendaylight.lacp$features-lacp/testReport/

2) Features Comply with Guidelines:
https://git.opendaylight.org/gerrit/gitweb?p=lacp.git;a=blob;f=features/src/main/features/features.xml
    a) Feature Names: Prefixed with 'odl-' : odl-lacp-ui, odl-lacp-rest
    b) Features Descriptions: Present
    c) Features Start-Levels: No start-levels on bundle elements or feature elements

3) Features Tested: Features have been tested for functionality with
    a) feature:install odl-lacp-ui
    b) feature:install odl-integration-compatible-with-all

4) Integration Test Impact - none

Change-Id: I2cc7bdf237b75c40e113f1e53ca15ff3bb66e636
Signed-off-by: kalaiselvik <Kalaiselvi_K@Dell.com>
9 years agoUpdated features/test list for SFC project
Vratko Polak [Wed, 18 Mar 2015 18:59:27 +0000 (19:59 +0100)]
Updated features/test list for SFC project

SFC project has changed its feature layout
https://git.opendaylight.org/gerrit/#/c/16621/3
Notably, odl-sfc-all feature is no more.

This patch makes a wild guess about
what the new list of user-facing features
from SFC project should look like.

Change-Id: I8859b74c1f9b3501c378e50d001f6ec8eade559c
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
9 years agoMerge "Add basic test suite for usc"
Luis Gomez [Wed, 18 Mar 2015 05:45:52 +0000 (05:45 +0000)]
Merge "Add basic test suite for usc"

9 years agoMerge "Adding tox files to .gitignore"
Luis Gomez [Wed, 18 Mar 2015 05:43:42 +0000 (05:43 +0000)]
Merge "Adding tox files to .gitignore"

9 years agoAdding tox files to .gitignore
Luis Gomez [Wed, 18 Mar 2015 00:02:40 +0000 (17:02 -0700)]
Adding tox files to .gitignore

Change-Id: I3f34be7c94435a17e0842d784a8fa692a14ce97f
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoAdd basic test suite for usc
A H [Wed, 18 Mar 2015 01:14:02 +0000 (18:14 -0700)]
Add basic test suite for usc

Change-Id: I74b0a6062a4247bfa22c5201f5f7db57215bd336
Signed-off-by: A H <an.ho@huawei.com>
9 years agoAdding vpnservice features
Vishal Thapar [Tue, 17 Mar 2015 12:13:51 +0000 (17:43 +0530)]
Adding vpnservice features

1) Feature Tests Pass:
https://jenkins.opendaylight.org/releng/job/vpnservice-merge-master/org.opendaylight.vpnservice$vpnservice-features/5/testReport/
2) Features Comply with Guidelines:
https://git.opendaylight.org/gerrit/gitweb?p=vpnservice.git;a=blob;f=features/src/main/features/features.xml;hb=HEAD
        a) Feature Names (prefixed with 'odl-'): odl-vpnservice-core
        b) Features Descriptions: Present
        c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
        a) feature:install odl-vpnservice-core
        b) feature:install odl-vpnservice-core,odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: I77d9187e7f5139dabbec698e7b92bcabfd84ecd6
Signed-off-by: Vishal Thapar <vishal.thapar@ericsson.com>
9 years agoMerge "See if we can get the features-test copied into system but not visible"
Luis Gomez [Mon, 16 Mar 2015 02:38:44 +0000 (02:38 +0000)]
Merge "See if we can get the features-test copied into system but not visible"

9 years agoMerge "Adding usc features."
Luis Gomez [Fri, 13 Mar 2015 08:38:07 +0000 (08:38 +0000)]
Merge "Adding usc features."

9 years agoAdd odlparent relativepath relative to autorelease
Thanh Ha [Fri, 13 Mar 2015 02:25:28 +0000 (22:25 -0400)]
Add odlparent relativepath relative to autorelease

Change-Id: Ia24ae3d17c7a7c0ff2f493dd7549df0582d018e6
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoAdding usc features.
A H [Thu, 12 Mar 2015 19:39:01 +0000 (12:39 -0700)]
Adding usc features.

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/usc/job/usc-merge-master/5/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=usc.git;a=blob;f=usc-features/src/main/features/features.xml
a) Feature Names: odl-usc-all
b) Features Descriptions: Present
c) Features Start-Levels: No start-levels on <bundle> elements or <feature> elements
3) Features Tested: Features have been tested for functionality with
a) feature:install odl-restconf-all odl-mdsal-apidocs odl-usc-all
b) feature:install odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: Ieb7cfe730005b8c45b9a59572f57a03c2bd54cc8
Signed-off-by: A H <an.ho@huawei.com>
9 years agoAdding features to main features.xml in integration repo
Steve Dean [Wed, 11 Mar 2015 22:49:12 +0000 (15:49 -0700)]
Adding features to main features.xml in integration repo

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/didm/job/didm-merge-master/lastBuild/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=didm.git;a=blob;f=features/src/main/features/features.xml
   a) Feature Names (prefixed with 'odl-'): odl-didm-identification-api, odl-didm-identification, odl-didm-drivers-api (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming)
   b) Features Descriptions: Present (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description)
   c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
   a) feature:install odl- didm-identification-api
   b) feature:install odl- didm-identification
   c) feature:install odl- didm-drivers-api
   d) feature:install odl- didm-identification-api, didm-identification, didm-drivers-api, odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: Ieb2617a5c44396630bab7a3a792fcec189dfe2b8
Signed-off-by: Steve Dean <sdean@hp.com>
9 years agoSee if we can get the features-test copied into system but not visible
Ed Warnicke [Thu, 12 Mar 2015 01:39:45 +0000 (18:39 -0700)]
See if we can get the features-test copied into system but not visible

Change-Id: I4db6d1d27b4fda060b39027b6e5ad7fe1cbe37f4
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Moving SNBI feature to not compatible."
Ed Warnicke [Thu, 12 Mar 2015 01:41:18 +0000 (01:41 +0000)]
Merge "Moving SNBI feature to not compatible."

9 years agoMoving SNBI feature to not compatible.
Luis Gomez [Thu, 12 Mar 2015 00:05:21 +0000 (17:05 -0700)]
Moving SNBI feature to not compatible.

Explanation: SNBI feature brings l2switch features that are not compatible with other features. This makes SNBI feature not compatible too.

Project has been informed about this issue a few days ago. https://lists.opendaylight.org/pipermail/release/2015-March/001535.html

Change-Id: Ie9d62fd6b8de4fc0e6f1bcc9d7ba4c3e9f423ebe
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoRevert "Moving SNBI features to not compatible"
Luis Gomez [Wed, 11 Mar 2015 23:55:43 +0000 (23:55 +0000)]
Revert "Moving SNBI features to not compatible"

This reverts commit 30cd4475cb028d1a0aafd6853fb05e30ed23de32.

Change-Id: Ie9740cfca58c9898136475cd7bbbd2906571d748
Signed-off-by:Luis Gomez <ecelgp@gmail.com>

9 years agoMoving SNBI features to not compatible
Luis Gomez [Wed, 11 Mar 2015 23:01:51 +0000 (16:01 -0700)]
Moving SNBI features to not compatible

Change-Id: Ifc469fd9c740f98b4733616b249b7f4a20144b4d
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoMerge "Adding features to main features.xml in integraion repo"
Luis Gomez [Wed, 11 Mar 2015 22:55:29 +0000 (22:55 +0000)]
Merge "Adding features to main features.xml in integraion repo"

9 years agoAdding features to main features.xml in integraion repo
Steve Dean [Thu, 5 Mar 2015 17:55:49 +0000 (09:55 -0800)]
Adding features to main features.xml in integraion repo

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/job/integration-distribution-verify-master/5/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=snmp.git;a=blob;f=features/src/main/resources/features.xml
   a) Feature Names (prefixed with 'odl-'): odl-snmp-plugin (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming)
   b) Features Descriptions: Present (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description)
   c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
   a) feature:install odl-snmp-plugin
   b) feature:install odl-snmp-plugin, odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: Ifacc077dd4b46db2365e38cb58fc873ed796eb49
Signed-off-by: Steve Dean <sdean@hp.com>
9 years agoDistribution to reflect splitted topoprocessing features
Vratko Polak [Wed, 11 Mar 2015 11:16:04 +0000 (12:16 +0100)]
Distribution to reflect splitted topoprocessing features

https://git.opendaylight.org/gerrit/#/c/16309/1/distribution-karaf/pom.xml
shows how topoprocessing has chosen to install their features.
This makes odl-integration-compatible-with-all
to include the same features.

This patch may be reverted when topoprocessing
re-introduces odl-topoprocessing-all feature.

Change-Id: I0d4e39e5041b9a9a61376027d315f8c8ecf45dff
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
9 years agoRemove reference to yangtools:features-test
Robert Varga [Tue, 10 Mar 2015 08:01:24 +0000 (09:01 +0100)]
Remove reference to yangtools:features-test

This reference is no longer used, remove it, as the artifact will be
removed.

Change-Id: I6b92f05a0041226f68155f13822ed32a15fee9a8
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdding neutron features
Ed Warnicke [Fri, 6 Mar 2015 16:02:05 +0000 (08:02 -0800)]
Adding neutron features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/neutron/job/neutron-merge-master/org.opendaylight.neutron$features-neutron/22/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=neutron.git;a=blob;f=features/src/main/features/features.xml;h=e54a8068d41e81e9075512e980682c1b39be55fc;hb=HEAD
  a) Feature Names (prefixed with 'odl-'): odl-neutron-service (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming)
  b) Features Descriptions: Present (check https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description)
  c) Features Start-Levels: None
3) Features Tested: Features have been tested for functionality with
  a) feature:install odl-neutron-service
  b) feature:install odl-neutron-service, odl-integration-compatible-with-all
4) Integration Test Impact: None

Change-Id: Iecf47d183446dc1bc52d2ade523f13b633232809
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBUG-2780: Fix migrated sal-compatibility feature
Michal Rehak [Tue, 3 Mar 2015 09:08:28 +0000 (10:08 +0100)]
BUG-2780: Fix migrated sal-compatibility feature

 - odl-adsal-compatibility was replaced by odl-openflowplugin-adsal-compatibility

Change-Id: Idca5da7c31603c65332a02078f733cb7a429d286
Signed-off-by: Michal Rehak <mirehak@cisco.com>
9 years agoMerge "Update bgpcep features repository names and removing plugin2oc."
Luis Gomez [Fri, 27 Feb 2015 05:12:21 +0000 (05:12 +0000)]
Merge "Update bgpcep features repository names and removing plugin2oc."

9 years agoUpdate bgpcep features repository names and removing plugin2oc.
Vratko Polak [Tue, 24 Feb 2015 17:09:51 +0000 (18:09 +0100)]
Update bgpcep features repository names and removing plugin2oc.

Bgpcep project has changed its feature layout.
Instead single feature repository, there are three of them now:
features-bgp, features-extras and features-pcep.

Among major changes, odl-bgpcep-all feature is no more.
This changes feature tests to use odl-bgpcep-bgp-all
and odl-bgpcep-pcep-all features instead.

Also: feature.bgp.version was renamed to feature.bgpcep.version

Change-Id: I48d53b544a8240e7206c163dc892e517da4ad9ba
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
9 years agoMerge "Have integration use odlparent so we get the same karaf.version as others"
Luis Gomez [Tue, 17 Feb 2015 07:18:58 +0000 (07:18 +0000)]
Merge "Have integration use odlparent so we get the same karaf.version as others"

9 years agoMerge "Migrate features-test"
Luis Gomez [Tue, 17 Feb 2015 07:17:20 +0000 (07:17 +0000)]
Merge "Migrate features-test"

9 years agoHave integration use odlparent so we get the same karaf.version as others
Ed Warnicke [Tue, 17 Feb 2015 00:02:30 +0000 (17:02 -0700)]
Have integration use odlparent so we get the same karaf.version as others

Change-Id: I750305fecff237814b2a58eb3273c91f6d2bca0d
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMigrate features-test
Robert Varga [Fri, 13 Feb 2015 22:18:08 +0000 (23:18 +0100)]
Migrate features-test

This artifact has been moved to odlparent, where it continues to be
maintained and updated. Switch to using that version instead of
yangtools.

Change-Id: I33ea2ce892d9b54013ff901e6d7df28776f9b450
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoAdding topoprocessing features
Michal Polkorab [Thu, 29 Jan 2015 13:28:23 +0000 (14:28 +0100)]
Adding topoprocessing features

1) Feature Tests Pass: https://jenkins.opendaylight.org/releng/view/topoprocessing/job/topoprocessing-merge-master/13/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=topoprocessing.git;a=blob;f=features/src/main/resources/features.xml
a) Feature Names: Prefixed with 'odl-' : odl-topoprocessing-all
b) Features Descriptions: Present
c) Features Start-Levels: No start-levels on <bundle> elements or <feature> elements
3) Features Tested: Features have been tested for functionality with
a) feature:install odl-topoprocessing-all
b) feature:install odl-integration-compatible-with-all
4) Integration Test Impact - none

Change-Id: I60734ea53ff3efb66dbc25225277f006171d193d
Signed-off-by: Michal Polkorab <michal.polkorab@pantheon.sk>
9 years agoAdd neutron feature to integration.
Ed Warnicke [Mon, 26 Jan 2015 21:02:29 +0000 (14:02 -0700)]
Add neutron feature to integration.

Change-Id: Ib83570c0058b9d62b48ea9e33e9f6c733260c047
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMove Openflow NXM Extensions to its intended home: Openflowplugin
Flavio Fernandes [Wed, 21 Jan 2015 19:51:45 +0000 (14:51 -0500)]
Move Openflow NXM Extensions to its intended home: Openflowplugin

This change stops referring to nxm extensions at the temporary location
and move it to where it was always meant to be.

Related gerrits:
https://git.opendaylight.org/gerrit/#/c/10428/
https://git.opendaylight.org/gerrit/#/c/13234/
https://git.opendaylight.org/gerrit/#/c/14289/
https://git.opendaylight.org/gerrit/#/c/14316/

Patch 2: Use constant for the version of openflow plugin feature
Patch 3: Use constant for the version of openflow plugin feature (cont.)

Change-Id: I6a1e2d3c41fee31e864fb8be415506c62518e099
Signed-off-by: Flavio Fernandes <ffernand@redhat.com>
9 years agoUpdate checkstyle version to 2.13
Thanh Ha [Tue, 20 Jan 2015 05:03:42 +0000 (00:03 -0500)]
Update checkstyle version to 2.13

Change-Id: I01fe69474fc3b07972b5080e00a6284b10215fd1
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoUse maven-enforcer-plugin to enforce Maven version
Thanh Ha [Tue, 20 Jan 2015 04:27:25 +0000 (23:27 -0500)]
Use maven-enforcer-plugin to enforce Maven version

This patch removes the unnecessary declaration of <prerequisites>
section.

As discovered in the mailing list thread linked below the <prerequisites>
section to set a minimal Maven version is deprecated and actually does
not enforce the minimal version. If we need to enforce a minimal Maven
version we need to use the maven-enforcer-plugin instead.

https://lists.opendaylight.org/pipermail/discuss/2015-January/004309.html

Change-Id: I5e5ce1af34451b0bcda51ee10ee0c181bd85393b
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoMerge "Break the repository index out separately from the test features"
Luis Gomez [Fri, 16 Jan 2015 03:13:12 +0000 (03:13 +0000)]
Merge "Break the repository index out separately from the test features"

9 years agoBreak the repository index out separately from the test features
Ed Warnicke [Mon, 5 Jan 2015 17:49:55 +0000 (11:49 -0600)]
Break the repository index out separately from the test features

Currently, we have integration/features which is doing two things:
1)  Listing the <repositories> from all of the projects
2)  Listing the test features (like compatible-with-all) that are
    being tested by integration test.

The test features are creating user confusion, with folks doing
things like loading

odl-integration-compatible-with-all

to poor effect.  By splitting into two features repos

features-integration-index:
  Which holds only the list of repositories, and not the test features
  and is included in the shipping distribution/karaf

and

features-integration-test:
  Which holds only the test features, and is *not* shipped in the
  distribution/karaf

We should be able to clear up this confusion in the future

Change-Id: I12633819bd35a0bece2da4ac557de106d3c216e7
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoSet root pom.xml <name> for Sonar
Thanh Ha [Fri, 9 Jan 2015 21:35:09 +0000 (16:35 -0500)]
Set root pom.xml <name> for Sonar

As mentioned on the mailing list Sonar uses the <name> field of the
pom.xml that is passed to the mvn command as the name of the project in
Sonar. In most cases this is the root pom.xml file in a project. This
patch sets the name to the project shortname.

https://lists.opendaylight.org/pipermail/discuss/2014-November/004024.html

Change-Id: I31fc9cd6e360079a48d1a189e89e534b9dac3b37
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
9 years agoMove distributions/extra/karaf to distributions/karaf
Ed Warnicke [Fri, 19 Dec 2014 17:32:23 +0000 (11:32 -0600)]
Move distributions/extra/karaf to distributions/karaf

Change-Id: Id875f34ceab823f3de076b2ca9b4ed558fbffa95
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoRemove toaster distribution
Ed Warnicke [Fri, 19 Dec 2014 17:30:35 +0000 (11:30 -0600)]
Remove toaster distribution

Change-Id: I85eabc1fadc4c2e6510ec3a6851b3e3f89dc369b
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoRemoving Old Hydrogen distributions from Master
Luis Gomez [Wed, 17 Dec 2014 03:24:36 +0000 (19:24 -0800)]
Removing Old Hydrogen distributions from Master

Change-Id: I83da7d073eeaafc1855b91fc8ea33d72062aaba6
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoUpdated integration to remove odl-aaa-all feature.
Liem Nguyen [Tue, 9 Dec 2014 19:43:59 +0000 (11:43 -0800)]
Updated integration to remove odl-aaa-all feature.

Change-Id: I4a75e8ab15a891af5d7ae1530d895c0af224f33b
Signed-off-by: Liem Nguyen <liem_m_nguyen@hp.com>
9 years agoMerge "Remove feature "odl-aaa-all""
Luis Gomez [Tue, 9 Dec 2014 03:45:00 +0000 (03:45 +0000)]
Merge "Remove feature "odl-aaa-all""

9 years agoRemove feature "odl-aaa-all"
Christopher O'Shea [Mon, 8 Dec 2014 23:13:48 +0000 (15:13 -0800)]
Remove feature "odl-aaa-all"

Change-Id: If6d56e30d161b755700641e9a46b033de767c416
Signed-off-by: Christopher O'Shea <christopher.o.shea@ericsson.com>
9 years agoIncrementing versions by 0.1.0 for post-helium master branch
Christopher O'Shea [Wed, 15 Oct 2014 22:44:41 +0000 (15:44 -0700)]
Incrementing versions by 0.1.0 for post-helium master branch

Change-Id: I4fe45bcfa95a65a1b9dc1f401aa67921921a7a8e
Signed-off-by: Christopher O'Shea <christopher.o.shea@ericsson.com>
9 years agoMerge "Adding feature selector application module to root pom."
Luis Gomez [Thu, 23 Oct 2014 20:32:49 +0000 (20:32 +0000)]
Merge "Adding feature selector application module to root pom."

9 years agoAdding feature selector application module to root pom.
Harman Singh [Tue, 21 Oct 2014 01:44:14 +0000 (18:44 -0700)]
Adding feature selector application module to root pom.

Change-Id: I388fa7d451d837741738da22ac42898b231f3f3a
Signed-off-by: Harman Singh <harmasin@cisco.com>
9 years agoMerge "Adding feature selector application to help download distribution with selecte...
Luis Gomez [Mon, 13 Oct 2014 02:19:06 +0000 (02:19 +0000)]
Merge "Adding feature selector application to help download distribution with selected features as boot features"

9 years agoRemoving opendove from virt edition
Luis Gomez [Fri, 10 Oct 2014 05:50:09 +0000 (22:50 -0700)]
Removing opendove from virt edition

Change-Id: I190fc771298898491f2ff7cbc0d84ba8c3e7ef93
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoAdding feature selector application to help download distribution with selected featu...
Harman Singh [Tue, 30 Sep 2014 16:33:38 +0000 (09:33 -0700)]
Adding feature selector application to help download distribution with selected features as boot features

Please check README file to understand the configuration parameters

Change-Id: I5a5b82065515ee24e46f663bfa04f0676e6fd4a9
Signed-off-by: Harman Singh <harmasin@cisco.com>
9 years agoMerge "BUG-2082: add integration test"
Luis Gomez [Thu, 25 Sep 2014 22:59:54 +0000 (22:59 +0000)]
Merge "BUG-2082: add integration test"

9 years agoBUG-2082: add integration test
Robert Varga [Thu, 25 Sep 2014 13:12:30 +0000 (15:12 +0200)]
BUG-2082: add integration test

Add missing integration test. As it turns out, this part somehow slipped
integration.

Change-Id: Ie588234a2d431d579c01745fcee9034df30b4f91
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBUG-2082: add missing unpack command
Robert Varga [Thu, 25 Sep 2014 15:13:17 +0000 (17:13 +0200)]
BUG-2082: add missing unpack command

This fixes failure to unpack the TCP-MD5 configuration in SP edition.

Change-Id: I21a59558c6a69e59d3f29c3ae884743d54d4956d
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoBug 2060: -rest and -ui features for l2switch and openflowplugin
Ed Warnicke [Wed, 24 Sep 2014 00:51:26 +0000 (19:51 -0500)]
Bug 2060: -rest and -ui features for l2switch and openflowplugin

Change-Id: I0534403cf64e3c269b8a4e7445abf71972763d45
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoBug 1948: separating features-restconf from features-mdsal
Ed Warnicke [Sun, 21 Sep 2014 19:27:27 +0000 (14:27 -0500)]
Bug 1948: separating features-restconf from features-mdsal

Needs to wait on merge of: https://git.opendaylight.org/gerrit/#/c/11472/

https://git.opendaylight.org/gerrit/#/c/11423/

Then the stuff below will be filled out.

1) Feature Tests Pass: https://jenkins.opendaylight.org/controller/job/controller-merge/org.opendaylight.controller$features-restconf/2850/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blob;f=features/restconf/src/main/resources/features.xml;h=4d17b48cadece860c8f25364c49e8bc4cad93b22;hb=HEAD
a) Feature Names: Prefixed with 'odl-' : https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Feature_Naming
b) Features Descriptions: Present https://wiki.opendaylight.org/view/Runtime:Karaf_Features_Guidelines#Description
c) Features Start-Levels: No start-levels on <bundle> elements or <feature> elements
3) Features Tested: Features have been tested for functionality with
a) feature:install odl-toaster-ui (pulls in odl-restconf-new)
4) Integration Test Impact: All restconf tests will need to use
HTTP Basic Auth for Username and password (I believe they already
do)

Change-Id: I858abdd8f2fb6954b49451f5294ea0828bfe3169
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Bug 1919 Bug 1927 copy bundles for karaf standard features into system/"
Luis Gomez [Wed, 17 Sep 2014 23:38:12 +0000 (23:38 +0000)]
Merge "Bug 1919 Bug 1927 copy bundles for karaf standard features into system/"

9 years agoBug 1919 Bug 1927 copy bundles for karaf standard features into system/
Ed Warnicke [Wed, 17 Sep 2014 00:02:06 +0000 (19:02 -0500)]
Bug 1919 Bug 1927 copy bundles for karaf standard features into system/

This patch:

Copies the bundles for the karaf standard features into system

Excludes dependencies from non-java artifacts that are conflicing
with actual java artifacts (the vtn binaries)

Adds a org.ops4j.url.mvn.cfg file that:
a)  Reorders the repos so we look in system/ first
b)  Uses system/ as the localRepo so that
i)  We don't search .m2 (and thus possible get bum artifacts)
ii) We don't copy files from system to .m2 (slow)

Change-Id: I81fc20f16c8b1a2a5642a0c3934d93857a294497
Signed-off-by: Ed Warnicke <eaw@cisco.com>
9 years agoMerge "Bump maven-dependency-plugin version"
Ed Warnicke [Tue, 16 Sep 2014 21:13:18 +0000 (21:13 +0000)]
Merge "Bump maven-dependency-plugin version"

9 years agoPut SNMP4SDN feature back to Integration
ylhsieh [Mon, 15 Sep 2014 20:05:06 +0000 (04:05 +0800)]
Put SNMP4SDN feature back to Integration
(Tested successfully: https://jenkins.opendaylight.org/snmp4sdn/job/snmp4sdn-merge/org.opendaylight.snmp4sdn$features-snmp4sdn/137/testReport/)

Signed-off-by: ylhsieh <ylhsieh@itri.org.tw>
9 years agoAdding sfc features
David Goldberg [Sun, 14 Sep 2014 20:50:55 +0000 (23:50 +0300)]
Adding sfc features

1) Feature Tests Pass: https://jenkins.opendaylight.org/sfc/job/sfc-merge/org.opendaylight.sfc$features-sfcofl2/56/testReport/

2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=sfc.git;a=blob;f=features-sfcofl2/src/main/resources/features.xml;h=431e943f0bea488e9272f3a19ae935df0012bc1c;hb=HEAD
a) Feature Names: Prefixed with 'odl-' : odl-sfcofl2
b) Features Descriptions: OpenDaylight :: sfcofl2
c) Features Start-Levels: No start-levels on <bundle> elements or <feature> elements

3) Features Tested: Features have been tested for functionality with
a) feature:install odl-sfcofl2

4) Integration Test Impact: none

Change-Id: I662a0a3359dfd4a8c9a373c22320d3478b59fa0e
Signed-off-by: David Goldberg <david.goldberg@contextream.com>
9 years agoBump maven-dependency-plugin version
Robert Varga [Thu, 4 Sep 2014 15:29:39 +0000 (17:29 +0200)]
Bump maven-dependency-plugin version

mvn dependency:tree fails with the old version (2.6) due to classpath
inconsistencies. With this bump, it succeeds.

Change-Id: I8054a1c97158f5bbf43fa41b410d8245a5ae95a4
Signed-off-by: Robert Varga <rovarga@cisco.com>
9 years agoadded sfclisp feature to integration
David Goldberg [Sun, 14 Sep 2014 12:45:34 +0000 (15:45 +0300)]
added sfclisp feature to integration

Change-Id: Ifdb7d78462a6ac49dbbf5f5965e20b338eb2fab8
Signed-off-by: David Goldberg <david.goldberg@contextream.com>
9 years agoRemoving SNMP feature due to integration issues. Will be back when resolved.
Luis Gomez [Sat, 13 Sep 2014 19:52:12 +0000 (12:52 -0700)]
Removing SNMP feature due to integration issues. Will be back when resolved.

Change-Id: Icce36dc8f8d38699c90727f7a7b3e7d51b13e58c
Signed-off-by: Luis Gomez <ecelgp@gmail.com>
9 years agoAdding sdninterfaceapp features
rafatjahan [Fri, 12 Sep 2014 17:53:02 +0000 (23:23 +0530)]
Adding sdninterfaceapp features

1) Feature Tests Pass:
https://jenkins.opendaylight.org/sdninterfaceapp/job/sdninterfaceapp-merge/org.opendaylight.sdninterfaceapp$features-sdninterfaceapp/10/testReport/
2) Features Comply with Guidelines:
https://git.opendaylight.org/gerrit/gitweb?p=sdninterfaceapp.git;a=blob;f=features/src/main/resources/features.xml;h=ef8bb78b852d0585125641418e79a2d65e77d325;hb=272b9142ddea044b401fe2dfe08422aac0b4ca45
  a) Feature Names: odl-sdninterfaceapp
  b) Features Descriptions: OpenDaylight :: sdninterfaceapp
3) Features Tested: Features have been tested for functionality with
  a) feature:install odl-sdinterfaceapp
  b) feature:install odl-integration-compatible-with-all

Change-Id: Ida13f64895c7baa3e4b4a4ff5307d844fc0c2172
Signed-off-by: rafatjahan <rafat.jahan@tcs.com>
9 years agoAdding plugin2oc features
pchopra [Fri, 12 Sep 2014 23:04:42 +0000 (04:34 +0530)]
Adding plugin2oc features

1) Feature Tests Pass: https://jenkins.opendaylight.org/plugin2oc/job/plugin2oc-merge/12/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=plugin2oc.git;a=blob;f=features-plugin2oc/src/main/resources/features.xml;h=abdf565022f48949fcf7858bd9acca74cb1ca826;hb=bfec9aaba5e14eaaa12fa26e01466f69c47c338e
a) Feature Names: odl-plugin2oc
b) Features Descriptions: OpenDaylight :: plugin2oc :: Plugin
3) Features Tested: Features have been tested for functionality with
a) feature:install odl-plugin2oc
b) feature:install odl-integration-compatible-with-plugin2oc
4) Updated version for plugin2oc

Signed-off-by: pchopra <pchopra@juniper.net>
9 years agoMerge "Added VTN Coordinator to Karaf distribution."
Christopher O'Shea [Fri, 12 Sep 2014 18:34:52 +0000 (18:34 +0000)]
Merge "Added VTN Coordinator to Karaf distribution."

9 years agoAdded VTN Coordinator to Karaf distribution.
Hideyuki Tai [Fri, 12 Sep 2014 02:29:37 +0000 (22:29 -0400)]
Added VTN Coordinator to Karaf distribution.

This patch created a directory called externalapps in Karaf
distribution, and put VTN Coordiantor in it.

Change-Id: I76d7f5bb3831be4b75d921743ab024cbf43e7d86
Signed-off-by: Hideyuki Tai <Hideyuki.Tai@necam.com>
9 years agoAdding plugin2oc features
Christopher O'Shea [Fri, 12 Sep 2014 00:29:36 +0000 (17:29 -0700)]
Adding plugin2oc features

1) Feature Tests Pass: https://jenkins.opendaylight.org/plugin2oc/job/plugin2oc-merge/9/testReport/
2) Features Comply with Guidelines: https://git.opendaylight.org/gerrit/gitweb?p=plugin2oc.git;a=blob;f=features-plugin2oc/src/main/resources/features.xml;h=1a87f27c04568ba288745a031a01b7b5bb382af1;hb=HEAD
a) Feature Names: odl-plugin2oc
b) Features Descriptions: OpenDaylight :: plugin2oc :: Plugin
3) Features Tested: Features have been tested for functionality with
a) feature:install odl-plugin2oc
b) feature:install odl-integration-compatible-with-plugin2oc

Signed-off-by: Christopher O'Shea <christopher.o.shea@ericsson.com>
Change-Id: I8272307614e134bf0018f2dfd779df1930399aec

9 years agoMerge "Reorder features for tracking purpose"
Luis Gomez [Thu, 11 Sep 2014 05:56:15 +0000 (05:56 +0000)]
Merge "Reorder features for tracking purpose"

9 years agoReorder features for tracking purpose
George Zhao [Thu, 11 Sep 2014 03:58:05 +0000 (20:58 -0700)]
Reorder features for tracking purpose

Change-Id: I74e7c0ba61d97e8e769fea7a2cce576360a74cc3
Signed-off-by: George Zhao <george.y.zhao@huawei.com>