From bb5d7a49037cc4dbfa07371ac1467d8b9c4bb2b5 Mon Sep 17 00:00:00 2001 From: Tony Tkacik Date: Wed, 2 Sep 2015 16:13:30 +0200 Subject: [PATCH] Migration to use MD-SAL Project Change-Id: I8be5de8f8ea89d7e03f925d8a0da5a15e0a11adf Signed-off-by: Tony Tkacik --- .../features/src/main/resources/features.xml | 2 +- applications/pom.xml | 2 +- drop-test-karaf/pom.xml | 2 +- .../openflowjava-extension-nicira-api/pom.xml | 2 +- extension/openflowjava-extension-nicira/pom.xml | 4 ++-- extension/openflowplugin-extension-api/pom.xml | 2 +- extension/openflowplugin-extension-nicira/pom.xml | 2 +- extension/test-extension/pom.xml | 2 +- features-li/pom.xml | 9 +++++++++ features-li/src/main/resources/features.xml | 4 +++- features/pom.xml | 10 ++++++++++ features/src/main/resources/features.xml | 3 ++- model/model-flow-base/pom.xml | 2 +- model/model-flow-service/pom.xml | 2 +- model/model-flow-statistics/pom.xml | 2 +- model/pom.xml | 12 ++++++------ openflowplugin-api/pom.xml | 2 +- openflowplugin-impl/pom.xml | 2 +- openflowplugin/pom.xml | 2 +- parent/pom.xml | 15 ++++++++++++++- samples/learning-switch/pom.xml | 2 +- samples/sample-consumer/pom.xml | 2 +- 22 files changed, 61 insertions(+), 26 deletions(-) diff --git a/applications/features/src/main/resources/features.xml b/applications/features/src/main/resources/features.xml index b198424bc2..f8d9813dc7 100644 --- a/applications/features/src/main/resources/features.xml +++ b/applications/features/src/main/resources/features.xml @@ -5,7 +5,7 @@ xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0"> mvn:org.opendaylight.controller/features-mdsal/${mdsal.version}/xml/features - odl-yangtools-models + odl-mdsal-models mvn:org.opendaylight.openflowplugin.model/model-flow-base/${project.version} mvn:org.opendaylight.openflowplugin.model/model-flow-service/${project.version} mvn:org.opendaylight.openflowplugin.model/model-flow-statistics/${project.version} diff --git a/applications/pom.xml b/applications/pom.xml index 2500696a81..d32a4b0660 100644 --- a/applications/pom.xml +++ b/applications/pom.xml @@ -59,7 +59,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/drop-test-karaf/pom.xml b/drop-test-karaf/pom.xml index 29da07fca6..2500d1c4fc 100644 --- a/drop-test-karaf/pom.xml +++ b/drop-test-karaf/pom.xml @@ -115,7 +115,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/extension/openflowjava-extension-nicira-api/pom.xml b/extension/openflowjava-extension-nicira-api/pom.xml index 7f066381b6..d23a881929 100644 --- a/extension/openflowjava-extension-nicira-api/pom.xml +++ b/extension/openflowjava-extension-nicira-api/pom.xml @@ -66,7 +66,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/extension/openflowjava-extension-nicira/pom.xml b/extension/openflowjava-extension-nicira/pom.xml index 735db90f3a..e840f92359 100644 --- a/extension/openflowjava-extension-nicira/pom.xml +++ b/extension/openflowjava-extension-nicira/pom.xml @@ -61,7 +61,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar @@ -90,7 +90,7 @@ openflowjava-extension-nicira-api - + diff --git a/extension/openflowplugin-extension-api/pom.xml b/extension/openflowplugin-extension-api/pom.xml index 89e2b88f10..ec6fa82a8b 100644 --- a/extension/openflowplugin-extension-api/pom.xml +++ b/extension/openflowplugin-extension-api/pom.xml @@ -62,7 +62,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/extension/openflowplugin-extension-nicira/pom.xml b/extension/openflowplugin-extension-nicira/pom.xml index 6b8e87365b..2ac70418d6 100644 --- a/extension/openflowplugin-extension-nicira/pom.xml +++ b/extension/openflowplugin-extension-nicira/pom.xml @@ -62,7 +62,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/extension/test-extension/pom.xml b/extension/test-extension/pom.xml index bb2d27093b..4b9a962d33 100644 --- a/extension/test-extension/pom.xml +++ b/extension/test-extension/pom.xml @@ -62,7 +62,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/features-li/pom.xml b/features-li/pom.xml index 984e48f009..346de3d1a8 100644 --- a/features-li/pom.xml +++ b/features-li/pom.xml @@ -18,10 +18,19 @@ 30-statistics-manager.xml 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT + 0.8.0-SNAPSHOT + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + runtime + org.opendaylight.controller features-mdsal diff --git a/features-li/src/main/resources/features.xml b/features-li/src/main/resources/features.xml index 6ce441fd3e..80d54d1ab9 100644 --- a/features-li/src/main/resources/features.xml +++ b/features-li/src/main/resources/features.xml @@ -16,6 +16,8 @@ mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features + mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features + odl-openflowplugin-southbound-li @@ -63,7 +65,7 @@ - odl-yangtools-models + odl-mdsal-models mvn:org.opendaylight.controller.model/model-inventory/${controller.model.version} mvn:org.opendaylight.controller.model/model-topology/${controller.model.version} diff --git a/features/pom.xml b/features/pom.xml index 1f4126b100..0f073b4d1a 100644 --- a/features/pom.xml +++ b/features/pom.xml @@ -19,10 +19,20 @@ 40-inventory-manager.xml 1.3.0-SNAPSHOT 1.3.0-SNAPSHOT + 0.8.0-SNAPSHOT + + org.opendaylight.mdsal.model + features-mdsal-model + ${mdsal.model.version} + features + xml + runtime + + org.opendaylight.controller features-mdsal diff --git a/features/src/main/resources/features.xml b/features/src/main/resources/features.xml index 27892f0278..984fd82752 100644 --- a/features/src/main/resources/features.xml +++ b/features/src/main/resources/features.xml @@ -16,6 +16,7 @@ mvn:org.opendaylight.openflowjava/features-openflowjava/${openflowjava.version}/xml/features mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features + mvn:org.opendaylight.mdsal.model/features-mdsal-model/${mdsal.model.version}/xml/features odl-openflowplugin-southbound @@ -65,7 +66,7 @@ - odl-yangtools-models + odl-mdsal-models mvn:org.opendaylight.controller.model/model-inventory/${controller.model.version} mvn:org.opendaylight.controller.model/model-topology/${controller.model.version} diff --git a/model/model-flow-base/pom.xml b/model/model-flow-base/pom.xml index 611dc41ee5..e0191394a8 100644 --- a/model/model-flow-base/pom.xml +++ b/model/model-flow-base/pom.xml @@ -17,7 +17,7 @@ model-inventory - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model opendaylight-l2-types diff --git a/model/model-flow-service/pom.xml b/model/model-flow-service/pom.xml index 4a0d334b57..c9e977f266 100644 --- a/model/model-flow-service/pom.xml +++ b/model/model-flow-service/pom.xml @@ -21,7 +21,7 @@ model-inventory - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model opendaylight-l2-types diff --git a/model/model-flow-statistics/pom.xml b/model/model-flow-statistics/pom.xml index f6bc2160ed..8a5d313565 100644 --- a/model/model-flow-statistics/pom.xml +++ b/model/model-flow-statistics/pom.xml @@ -25,7 +25,7 @@ model-inventory - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model opendaylight-l2-types diff --git a/model/pom.xml b/model/pom.xml index 7dbdac842a..7bc1a58209 100644 --- a/model/pom.xml +++ b/model/pom.xml @@ -25,7 +25,7 @@ - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding @@ -33,15 +33,15 @@ yang-common - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-inet-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model ietf-yang-types - org.opendaylight.yangtools.model + org.opendaylight.mdsal.model yang-ext @@ -64,13 +64,13 @@ yang-maven-plugin - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding ${yangtools.version} jar diff --git a/openflowplugin-api/pom.xml b/openflowplugin-api/pom.xml index 7dcc26fd87..76353c531e 100644 --- a/openflowplugin-api/pom.xml +++ b/openflowplugin-api/pom.xml @@ -60,7 +60,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/openflowplugin-impl/pom.xml b/openflowplugin-impl/pom.xml index 99c6a01bbb..07b010f86c 100644 --- a/openflowplugin-impl/pom.xml +++ b/openflowplugin-impl/pom.xml @@ -60,7 +60,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/openflowplugin/pom.xml b/openflowplugin/pom.xml index 83deace410..a75a24677f 100644 --- a/openflowplugin/pom.xml +++ b/openflowplugin/pom.xml @@ -60,7 +60,7 @@ ${config.version} - org.opendaylight.yangtools + org.opendaylight.mdsal maven-sal-api-gen-plugin ${yangtools.version} jar diff --git a/parent/pom.xml b/parent/pom.xml index 50a76cd605..02d8e55494 100644 --- a/parent/pom.xml +++ b/parent/pom.xml @@ -75,6 +75,20 @@ import pom + + org.opendaylight.mdsal + mdsal-artifacts + 2.0.0-SNAPSHOT + import + pom + + + org.opendaylight.mdsal.model + mdsal-model-artifacts + 0.8.0-SNAPSHOT + import + pom + org.opendaylight.controller config-artifacts @@ -437,4 +451,3 @@ - diff --git a/samples/learning-switch/pom.xml b/samples/learning-switch/pom.xml index 47657b409b..8feba632c2 100644 --- a/samples/learning-switch/pom.xml +++ b/samples/learning-switch/pom.xml @@ -50,7 +50,7 @@ sal-binding-api - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding diff --git a/samples/sample-consumer/pom.xml b/samples/sample-consumer/pom.xml index 01c851169c..f0dc19853a 100644 --- a/samples/sample-consumer/pom.xml +++ b/samples/sample-consumer/pom.xml @@ -54,7 +54,7 @@ sal-binding-api - org.opendaylight.yangtools + org.opendaylight.mdsal yang-binding -- 2.36.6