From 6627847988116701d432d21a3f69fdd5a18e9b75 Mon Sep 17 00:00:00 2001 From: Gabriel Robitaille-Montpetit Date: Tue, 25 Aug 2015 16:36:54 -0400 Subject: [PATCH] Renamed artifacts to reflect the project's name. Change-Id: I30a4c94f5c87a8f5d9bac29147345cec9dbab053 Signed-off-by: Gabriel Robitaille-Montpetit --- api/pom.xml | 4 +- .../{cl-vcpe-mef.yang => cl-unimgr-mef.yang} | 8 +-- artifacts/pom.xml | 10 +-- cli/pom.xml | 6 +- .../cli/EvcRemoveShellCommand.java | 8 +-- .../cli/UniAddShellCommand.java | 22 +++--- .../cli/UniListShellCommand.java | 10 +-- .../cli/UniRemoveShellCommand.java | 8 +-- .../cli/UniShowShellCommand.java | 10 +-- .../resources/OSGI-INF/blueprint/commands.xml | 24 +++---- features/pom.xml | 12 ++-- features/src/main/features/features.xml | 30 ++++---- impl/pom.xml | 6 +- impl/src/main/config/default-config.xml | 6 +- .../api/IUnimgrConsoleProvider.java} | 8 +-- .../api/IUnimgrDataChangeListener.java} | 4 +- .../command/AbstractCreateCommand.java | 2 +- .../command/AbstractDeleteCommand.java | 2 +- .../command/AbstractUpdateCommand.java | 2 +- .../{vcpe => unimgr}/command/Command.java | 2 +- .../command/EvcCreateCommand.java | 68 +++++++++---------- .../command/EvcDeleteCommand.java | 10 +-- .../command/EvcUpdateCommand.java | 2 +- .../command/TransactionInvoker.java | 2 +- .../command/UniCreateCommand.java | 37 +++++----- .../command/UniDeleteCommand.java | 10 +-- .../command/UniUpdateCommand.java | 2 +- .../impl/EvcDataChangeListener.java | 8 +-- .../impl/UniDataChangeListener.java | 10 +-- .../impl/UnimgrConstants.java} | 4 +- .../impl/UnimgrDataChangeListener.java} | 32 ++++----- .../impl/UnimgrMapper.java} | 38 +++++------ .../impl/UnimgrProvider.java} | 62 ++++++++--------- .../impl/UnimgrUtils.java} | 52 +++++++------- .../unimgr/impl/rev150622/UnimgrModule.java | 26 +++++++ .../impl/rev150622/UnimgrModuleFactory.java | 13 ++++ .../impl/rev150622/VcpeModule.java | 21 ++---- .../impl/rev150622/VcpeModuleFactory.java | 8 +-- .../yang/{vcpe-impl.yang => unimgr-impl.yang} | 14 ++-- .../impl/UnimgrProviderTest.java} | 10 +-- it/pom.xml | 8 +-- karaf/pom.xml | 10 +-- pom.xml | 6 +- 43 files changed, 333 insertions(+), 304 deletions(-) rename api/src/main/yang/{cl-vcpe-mef.yang => cl-unimgr-mef.yang} (92%) rename cli/src/main/java/org/opendaylight/{vcpe => unimgr}/cli/EvcRemoveShellCommand.java (82%) rename cli/src/main/java/org/opendaylight/{vcpe => unimgr}/cli/UniAddShellCommand.java (89%) rename cli/src/main/java/org/opendaylight/{vcpe => unimgr}/cli/UniListShellCommand.java (86%) rename cli/src/main/java/org/opendaylight/{vcpe => unimgr}/cli/UniRemoveShellCommand.java (82%) rename cli/src/main/java/org/opendaylight/{vcpe => unimgr}/cli/UniShowShellCommand.java (87%) rename impl/src/main/java/org/opendaylight/{vcpe/api/IVcpeConsoleProvider.java => unimgr/api/IUnimgrConsoleProvider.java} (81%) rename impl/src/main/java/org/opendaylight/{vcpe/api/IVcpeDataChangeListener.java => unimgr/api/IUnimgrDataChangeListener.java} (88%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/AbstractCreateCommand.java (94%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/AbstractDeleteCommand.java (95%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/AbstractUpdateCommand.java (94%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/Command.java (89%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/EvcCreateCommand.java (54%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/EvcDeleteCommand.java (85%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/EvcUpdateCommand.java (96%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/TransactionInvoker.java (95%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/UniCreateCommand.java (79%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/UniDeleteCommand.java (80%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/command/UniUpdateCommand.java (98%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/impl/EvcDataChangeListener.java (89%) rename impl/src/main/java/org/opendaylight/{vcpe => unimgr}/impl/UniDataChangeListener.java (89%) rename impl/src/main/java/org/opendaylight/{vcpe/impl/VcpeConstants.java => unimgr/impl/UnimgrConstants.java} (98%) rename impl/src/main/java/org/opendaylight/{vcpe/impl/VcpeDataChangeListener.java => unimgr/impl/UnimgrDataChangeListener.java} (78%) rename impl/src/main/java/org/opendaylight/{vcpe/impl/VcpeMapper.java => unimgr/impl/UnimgrMapper.java} (83%) rename impl/src/main/java/org/opendaylight/{vcpe/impl/VcpeProvider.java => unimgr/impl/UnimgrProvider.java} (75%) rename impl/src/main/java/org/opendaylight/{vcpe/impl/VcpeUtils.java => unimgr/impl/UnimgrUtils.java} (91%) create mode 100644 impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/UnimgrModule.java create mode 100644 impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/UnimgrModuleFactory.java rename impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/{vcpe => unimgr}/impl/rev150622/VcpeModule.java (52%) mode change 100755 => 100644 rename impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/{vcpe => unimgr}/impl/rev150622/VcpeModuleFactory.java (56%) mode change 100755 => 100644 rename impl/src/main/yang/{vcpe-impl.yang => unimgr-impl.yang} (79%) rename impl/src/test/java/org/opendaylight/{vcpe/impl/VcpeProviderTest.java => unimgr/impl/UnimgrProviderTest.java} (85%) diff --git a/api/pom.xml b/api/pom.xml index 07846eec..5de3a927 100755 --- a/api/pom.xml +++ b/api/pom.xml @@ -15,8 +15,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - org.opendaylight.vcpe - vcpe-api + org.opendaylight.unimgr + unimgr-api 0.0.1-SNAPSHOT bundle diff --git a/api/src/main/yang/cl-vcpe-mef.yang b/api/src/main/yang/cl-unimgr-mef.yang similarity index 92% rename from api/src/main/yang/cl-vcpe-mef.yang rename to api/src/main/yang/cl-unimgr-mef.yang index 5276e6db..81c9d625 100755 --- a/api/src/main/yang/cl-vcpe-mef.yang +++ b/api/src/main/yang/cl-unimgr-mef.yang @@ -16,18 +16,18 @@ // + type : string // + uniMtuSize : int = [uniMtuSize >= 1522] -module cl-vcpe-mef { +module cl-unimgr-mef { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:vcpe"; - prefix "vcpe"; + namespace "urn:opendaylight:params:xml:ns:yang:unimgr"; + prefix "unimgr"; import ietf-yang-types { prefix yang; revision-date 2013-07-15; } import ietf-inet-types { prefix inet; revision-date 2010-09-24; } import network-topology { prefix topo; revision-date 2013-10-21; } revision "2015-06-22" { - description "Initial revision of vcpe model"; + description "Initial revision of unimgr model"; } grouping service-speed { diff --git a/artifacts/pom.xml b/artifacts/pom.xml index 8c9bd3e5..1bb69b6e 100755 --- a/artifacts/pom.xml +++ b/artifacts/pom.xml @@ -9,8 +9,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - org.opendaylight.vcpe - vcpe-artifacts + org.opendaylight.unimgr + unimgr-artifacts 0.0.1-SNAPSHOT pom @@ -18,17 +18,17 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${project.groupId} - vcpe-api + unimgr-api ${project.version} ${project.groupId} - vcpe-impl + unimgr-impl ${project.version} ${project.groupId} - vcpe-features + unimgr-features ${project.version} features xml diff --git a/cli/pom.xml b/cli/pom.xml index 389933aa..4faf79b3 100755 --- a/cli/pom.xml +++ b/cli/pom.xml @@ -16,14 +16,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - org.opendaylight.vcpe - vcpe-cli + org.opendaylight.unimgr + unimgr-cli 0.0.1-SNAPSHOT bundle ${project.groupId} - vcpe-impl + unimgr-impl ${project.version} diff --git a/cli/src/main/java/org/opendaylight/vcpe/cli/EvcRemoveShellCommand.java b/cli/src/main/java/org/opendaylight/unimgr/cli/EvcRemoveShellCommand.java similarity index 82% rename from cli/src/main/java/org/opendaylight/vcpe/cli/EvcRemoveShellCommand.java rename to cli/src/main/java/org/opendaylight/unimgr/cli/EvcRemoveShellCommand.java index b47a4821..122bb3fe 100644 --- a/cli/src/main/java/org/opendaylight/vcpe/cli/EvcRemoveShellCommand.java +++ b/cli/src/main/java/org/opendaylight/unimgr/cli/EvcRemoveShellCommand.java @@ -5,22 +5,22 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.cli; +package org.opendaylight.unimgr.cli; import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.opendaylight.vcpe.api.IVcpeConsoleProvider; +import org.opendaylight.unimgr.api.IUnimgrConsoleProvider; @Command(name = "remove", scope = "Evc", description = "Removes Evc.") public class EvcRemoveShellCommand extends OsgiCommandSupport { - protected IVcpeConsoleProvider provider; + protected IUnimgrConsoleProvider provider; @Argument(index = 0, name = "id", description = "Evc Id", required = true, multiValued = false) String id; - public EvcRemoveShellCommand(IVcpeConsoleProvider provider) { + public EvcRemoveShellCommand(IUnimgrConsoleProvider provider) { this.provider = provider; } diff --git a/cli/src/main/java/org/opendaylight/vcpe/cli/UniAddShellCommand.java b/cli/src/main/java/org/opendaylight/unimgr/cli/UniAddShellCommand.java similarity index 89% rename from cli/src/main/java/org/opendaylight/vcpe/cli/UniAddShellCommand.java rename to cli/src/main/java/org/opendaylight/unimgr/cli/UniAddShellCommand.java index 899211b9..1331aac2 100755 --- a/cli/src/main/java/org/opendaylight/vcpe/cli/UniAddShellCommand.java +++ b/cli/src/main/java/org/opendaylight/unimgr/cli/UniAddShellCommand.java @@ -5,22 +5,22 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.cli; +package org.opendaylight.unimgr.cli; import java.math.BigInteger; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.commands.Option; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.opendaylight.vcpe.api.IVcpeConsoleProvider; +import org.opendaylight.unimgr.api.IUnimgrConsoleProvider; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.yang.types.rev130715.MacAddress; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.service.speed.speed.Speed100MBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.service.speed.speed.Speed10GBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.service.speed.speed.Speed10MBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.service.speed.speed.Speed1GBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.uni.Speed; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.Uni; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.UniBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.service.speed.speed.Speed100MBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.service.speed.speed.Speed10GBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.service.speed.speed.Speed10MBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.service.speed.speed.Speed1GBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.uni.Speed; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.Uni; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.UniBuilder; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; @Command(name = "add", @@ -28,7 +28,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. description = "Adds an uni to the controller.") public class UniAddShellCommand extends OsgiCommandSupport { - protected IVcpeConsoleProvider provider; + protected IUnimgrConsoleProvider provider; @Option(name = "-id", aliases = { "--uni-id" }, @@ -86,7 +86,7 @@ public class UniAddShellCommand extends OsgiCommandSupport { multiValued = true) private String speed = "any"; - public UniAddShellCommand(IVcpeConsoleProvider provider) { + public UniAddShellCommand(IUnimgrConsoleProvider provider) { this.provider = provider; } diff --git a/cli/src/main/java/org/opendaylight/vcpe/cli/UniListShellCommand.java b/cli/src/main/java/org/opendaylight/unimgr/cli/UniListShellCommand.java similarity index 86% rename from cli/src/main/java/org/opendaylight/vcpe/cli/UniListShellCommand.java rename to cli/src/main/java/org/opendaylight/unimgr/cli/UniListShellCommand.java index 570b6a10..87725158 100755 --- a/cli/src/main/java/org/opendaylight/vcpe/cli/UniListShellCommand.java +++ b/cli/src/main/java/org/opendaylight/unimgr/cli/UniListShellCommand.java @@ -6,20 +6,20 @@ * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.cli; +package org.opendaylight.unimgr.cli; import java.util.List; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.commands.Option; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.opendaylight.vcpe.api.IVcpeConsoleProvider; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.Uni; +import org.opendaylight.unimgr.api.IUnimgrConsoleProvider; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.Uni; @Command(name = "list", scope = "uni", description = "Lists all uni in the controller.") public class UniListShellCommand extends OsgiCommandSupport { - protected IVcpeConsoleProvider provider; + protected IUnimgrConsoleProvider provider; @Option(name = "-c", aliases = { "--config" }, @@ -28,7 +28,7 @@ public class UniListShellCommand extends OsgiCommandSupport { multiValued = false) Boolean isConfigurationData = false; - public UniListShellCommand(IVcpeConsoleProvider provider) { + public UniListShellCommand(IUnimgrConsoleProvider provider) { this.provider = provider; } diff --git a/cli/src/main/java/org/opendaylight/vcpe/cli/UniRemoveShellCommand.java b/cli/src/main/java/org/opendaylight/unimgr/cli/UniRemoveShellCommand.java similarity index 82% rename from cli/src/main/java/org/opendaylight/vcpe/cli/UniRemoveShellCommand.java rename to cli/src/main/java/org/opendaylight/unimgr/cli/UniRemoveShellCommand.java index 7b3003cb..7b8cc7ba 100755 --- a/cli/src/main/java/org/opendaylight/vcpe/cli/UniRemoveShellCommand.java +++ b/cli/src/main/java/org/opendaylight/unimgr/cli/UniRemoveShellCommand.java @@ -5,22 +5,22 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.cli; +package org.opendaylight.unimgr.cli; import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.opendaylight.vcpe.api.IVcpeConsoleProvider; +import org.opendaylight.unimgr.api.IUnimgrConsoleProvider; @Command(name = "remove", scope = "uni", description = "Removes an Uni from the controller.") public class UniRemoveShellCommand extends OsgiCommandSupport { - protected IVcpeConsoleProvider provider; + protected IUnimgrConsoleProvider provider; @Argument(index = 0, name = "id", description = "Uni Id", required = true, multiValued = false) String id; - public UniRemoveShellCommand(IVcpeConsoleProvider provider) { + public UniRemoveShellCommand(IUnimgrConsoleProvider provider) { this.provider = provider; } diff --git a/cli/src/main/java/org/opendaylight/vcpe/cli/UniShowShellCommand.java b/cli/src/main/java/org/opendaylight/unimgr/cli/UniShowShellCommand.java similarity index 87% rename from cli/src/main/java/org/opendaylight/vcpe/cli/UniShowShellCommand.java rename to cli/src/main/java/org/opendaylight/unimgr/cli/UniShowShellCommand.java index 235d3ad2..d3e8cc6b 100755 --- a/cli/src/main/java/org/opendaylight/vcpe/cli/UniShowShellCommand.java +++ b/cli/src/main/java/org/opendaylight/unimgr/cli/UniShowShellCommand.java @@ -5,23 +5,23 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.cli; +package org.opendaylight.unimgr.cli; import org.apache.karaf.shell.commands.Argument; import org.apache.karaf.shell.commands.Command; import org.apache.karaf.shell.console.OsgiCommandSupport; -import org.opendaylight.vcpe.api.IVcpeConsoleProvider; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.Uni; +import org.opendaylight.unimgr.api.IUnimgrConsoleProvider; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.Uni; @Command(name = "show", scope = "uni", description = "Shows detailed information about an uni.") public class UniShowShellCommand extends OsgiCommandSupport { - protected IVcpeConsoleProvider provider; + protected IUnimgrConsoleProvider provider; @Argument(index = 0, name = "id", description = "Uni Id", required = true, multiValued = false) String id; - public UniShowShellCommand(IVcpeConsoleProvider provider) { + public UniShowShellCommand(IUnimgrConsoleProvider provider) { this.provider = provider; } diff --git a/cli/src/main/resources/OSGI-INF/blueprint/commands.xml b/cli/src/main/resources/OSGI-INF/blueprint/commands.xml index 2a2eb979..0aaab7c9 100755 --- a/cli/src/main/resources/OSGI-INF/blueprint/commands.xml +++ b/cli/src/main/resources/OSGI-INF/blueprint/commands.xml @@ -1,33 +1,33 @@ - + - - + + - - + + - - + + - - + + - - + + diff --git a/features/pom.xml b/features/pom.xml index a9ecaa68..8e8c043c 100755 --- a/features/pom.xml +++ b/features/pom.xml @@ -13,8 +13,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 1.6.0-SNAPSHOT - org.opendaylight.vcpe - vcpe-features + org.opendaylight.unimgr + unimgr-features 0.0.1-SNAPSHOT ${project.artifactId} 4.0.0 @@ -82,24 +82,24 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${project.groupId} - vcpe-impl + unimgr-impl ${project.version} ${project.groupId} - vcpe-impl + unimgr-impl ${project.version} xml config ${project.groupId} - vcpe-api + unimgr-api ${project.version} ${project.groupId} - vcpe-cli + unimgr-cli ${project.version} diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml index 14abb3a7..db588344 100755 --- a/features/src/main/features/features.xml +++ b/features/src/main/features/features.xml @@ -7,7 +7,7 @@ This program and the accompanying materials are made available under the terms of the Eclipse Public License v1.0 which accompanies this distribution, and is available at http://www.eclipse.org/legal/epl-v10.html --> - mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features @@ -16,32 +16,32 @@ and is available at http://www.eclipse.org/legal/epl-v10.html mvn:org.opendaylight.ovsdb/southbound-features/${ovsdb.version}/xml/features mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features - + odl-yangtools-models - mvn:org.opendaylight.vcpe/vcpe-api/${project.version} + mvn:org.opendaylight.unimgr/unimgr-api/${project.version} - + odl-mdsal-broker odl-ovsdb-southbound-impl - odl-vcpe-api - mvn:org.opendaylight.vcpe/vcpe-impl/${project.version} - mvn:org.opendaylight.vcpe/vcpe-impl/${project.version}/xml/config + odl-unimgr-api + mvn:org.opendaylight.unimgr/unimgr-impl/${project.version} + mvn:org.opendaylight.unimgr/unimgr-impl/${project.version}/xml/config - - odl-vcpe - mvn:org.opendaylight.vcpe/vcpe-cli/${project.version} + + odl-unimgr + mvn:org.opendaylight.unimgr/unimgr-cli/${project.version} - - odl-vcpe + + odl-unimgr odl-restconf - - odl-vcpe-rest - odl-vcpe-console + + odl-unimgr-rest + odl-unimgr-console odl-mdsal-apidocs odl-mdsal-xsql odl-dlux-all diff --git a/impl/pom.xml b/impl/pom.xml index c131c4e7..7cae3c21 100755 --- a/impl/pom.xml +++ b/impl/pom.xml @@ -21,14 +21,14 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - org.opendaylight.vcpe - vcpe-impl + org.opendaylight.unimgr + unimgr-impl 0.0.1-SNAPSHOT bundle ${project.groupId} - vcpe-api + unimgr-api ${project.version} diff --git a/impl/src/main/config/default-config.xml b/impl/src/main/config/default-config.xml index 83268b10..da05a8cc 100755 --- a/impl/src/main/config/default-config.xml +++ b/impl/src/main/config/default-config.xml @@ -8,7 +8,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL --> - urn:opendaylight:params:xml:ns:yang:vcpe:impl?module=vcpe-impl&revision=2015-06-22 + urn:opendaylight:params:xml:ns:yang:unimgr:impl?module=unimgr-impl&revision=2015-06-22 urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28 @@ -16,8 +16,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - prefix:vcpe - vcpe-default + prefix:unimgr + unimgr-default binding:binding-broker-osgi-registry binding-osgi-broker diff --git a/impl/src/main/java/org/opendaylight/vcpe/api/IVcpeConsoleProvider.java b/impl/src/main/java/org/opendaylight/unimgr/api/IUnimgrConsoleProvider.java similarity index 81% rename from impl/src/main/java/org/opendaylight/vcpe/api/IVcpeConsoleProvider.java rename to impl/src/main/java/org/opendaylight/unimgr/api/IUnimgrConsoleProvider.java index 3fcbd0fa..bf946e0c 100755 --- a/impl/src/main/java/org/opendaylight/vcpe/api/IVcpeConsoleProvider.java +++ b/impl/src/main/java/org/opendaylight/unimgr/api/IUnimgrConsoleProvider.java @@ -5,14 +5,14 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.api; +package org.opendaylight.unimgr.api; import java.util.List; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.evcs.Evc; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.Uni; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.evcs.Evc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.Uni; -public interface IVcpeConsoleProvider extends AutoCloseable { +public interface IUnimgrConsoleProvider extends AutoCloseable { public boolean addUni(Uni uni); diff --git a/impl/src/main/java/org/opendaylight/vcpe/api/IVcpeDataChangeListener.java b/impl/src/main/java/org/opendaylight/unimgr/api/IUnimgrDataChangeListener.java similarity index 88% rename from impl/src/main/java/org/opendaylight/vcpe/api/IVcpeDataChangeListener.java rename to impl/src/main/java/org/opendaylight/unimgr/api/IUnimgrDataChangeListener.java index 3e79820b..7294cb31 100755 --- a/impl/src/main/java/org/opendaylight/vcpe/api/IVcpeDataChangeListener.java +++ b/impl/src/main/java/org/opendaylight/unimgr/api/IUnimgrDataChangeListener.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.api; +package org.opendaylight.unimgr.api; import java.util.Map; @@ -14,7 +14,7 @@ import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; -public interface IVcpeDataChangeListener extends DataChangeListener, +public interface IUnimgrDataChangeListener extends DataChangeListener, AutoCloseable { public void create(Map, DataObject> changes); diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/AbstractCreateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/AbstractCreateCommand.java similarity index 94% rename from impl/src/main/java/org/opendaylight/vcpe/command/AbstractCreateCommand.java rename to impl/src/main/java/org/opendaylight/unimgr/command/AbstractCreateCommand.java index e2e6002c..50ec65e1 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/AbstractCreateCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/AbstractCreateCommand.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import java.util.Map; diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/AbstractDeleteCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/AbstractDeleteCommand.java similarity index 95% rename from impl/src/main/java/org/opendaylight/vcpe/command/AbstractDeleteCommand.java rename to impl/src/main/java/org/opendaylight/unimgr/command/AbstractDeleteCommand.java index 3ef87b38..4b66a69e 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/AbstractDeleteCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/AbstractDeleteCommand.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/AbstractUpdateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/AbstractUpdateCommand.java similarity index 94% rename from impl/src/main/java/org/opendaylight/vcpe/command/AbstractUpdateCommand.java rename to impl/src/main/java/org/opendaylight/unimgr/command/AbstractUpdateCommand.java index c3505caf..8dcb2849 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/AbstractUpdateCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/AbstractUpdateCommand.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import java.util.Map; diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/Command.java b/impl/src/main/java/org/opendaylight/unimgr/command/Command.java similarity index 89% rename from impl/src/main/java/org/opendaylight/vcpe/command/Command.java rename to impl/src/main/java/org/opendaylight/unimgr/command/Command.java index c6506212..82ec728a 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/Command.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/Command.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; public interface Command { diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/EvcCreateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/EvcCreateCommand.java similarity index 54% rename from impl/src/main/java/org/opendaylight/vcpe/command/EvcCreateCommand.java rename to impl/src/main/java/org/opendaylight/unimgr/command/EvcCreateCommand.java index f61af9fb..ea18ae76 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/EvcCreateCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/EvcCreateCommand.java @@ -5,17 +5,17 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import java.util.Map; import java.util.Map.Entry; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.vcpe.impl.VcpeConstants; -import org.opendaylight.vcpe.impl.VcpeMapper; -import org.opendaylight.vcpe.impl.VcpeUtils; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.evcs.Evc; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.Uni; +import org.opendaylight.unimgr.impl.UnimgrConstants; +import org.opendaylight.unimgr.impl.UnimgrMapper; +import org.opendaylight.unimgr.impl.UnimgrUtils; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.evcs.Evc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.Uni; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yangtools.yang.binding.DataObject; @@ -52,50 +52,50 @@ public class EvcCreateCommand extends AbstractCreateCommand { } // Get the destination UNI NodeId destUniNodeID = evc.getUniDest().get(0).getUni(); - InstanceIdentifier destinationNodeIid = VcpeMapper.getUniIid(destUniNodeID); - Optional optionalDestination = VcpeUtils.readUniNode(dataBroker, destinationNodeIid); + InstanceIdentifier destinationNodeIid = UnimgrMapper.getUniIid(destUniNodeID); + Optional optionalDestination = UnimgrUtils.readUniNode(dataBroker, destinationNodeIid); Uni destinationUni = optionalDestination.get(); - NodeId ovsdbDestinationNodeId = VcpeMapper.createNodeId(destinationUni.getIpAddress()); + NodeId ovsdbDestinationNodeId = UnimgrMapper.createNodeId(destinationUni.getIpAddress()); // Get the source UNI NodeId sourceUniNodeID = evc.getUniSource().get(0).getUni(); - InstanceIdentifier sourceNodeIid = VcpeMapper.getUniIid(sourceUniNodeID); - Optional optionalSource = VcpeUtils.readUniNode(dataBroker, sourceNodeIid); + InstanceIdentifier sourceNodeIid = UnimgrMapper.getUniIid(sourceUniNodeID); + Optional optionalSource = UnimgrUtils.readUniNode(dataBroker, sourceNodeIid); Uni sourceUni = optionalSource.get(); - NodeId ovsdbSourceNodeId = VcpeMapper.createNodeId(sourceUni.getIpAddress()); + NodeId ovsdbSourceNodeId = UnimgrMapper.createNodeId(sourceUni.getIpAddress()); // Set source - Node sourceBr1 = VcpeUtils.readNode( + Node sourceBr1 = UnimgrUtils.readNode( dataBroker, - VcpeMapper.getOvsdbBridgeNodeIID(ovsdbSourceNodeId, - VcpeConstants.DEFAULT_BRIDGE_NAME)).get(); - VcpeUtils.createTerminationPointNode(dataBroker, + UnimgrMapper.getOvsdbBridgeNodeIID(ovsdbSourceNodeId, + UnimgrConstants.DEFAULT_BRIDGE_NAME)).get(); + UnimgrUtils.createTerminationPointNode(dataBroker, destinationUni, sourceBr1, - VcpeConstants.DEFAULT_BRIDGE_NAME, - VcpeConstants.DEFAULT_INTERNAL_IFACE, null); - Node sourceBr2 = VcpeUtils.readNode( + UnimgrConstants.DEFAULT_BRIDGE_NAME, + UnimgrConstants.DEFAULT_INTERNAL_IFACE, null); + Node sourceBr2 = UnimgrUtils.readNode( dataBroker, - VcpeMapper.getOvsdbBridgeNodeIID(ovsdbSourceNodeId, - VcpeConstants.DEFAULT_BRIDGE_NAME)).get(); - VcpeUtils.createGreTunnel(dataBroker, sourceUni, + UnimgrMapper.getOvsdbBridgeNodeIID(ovsdbSourceNodeId, + UnimgrConstants.DEFAULT_BRIDGE_NAME)).get(); + UnimgrUtils.createGreTunnel(dataBroker, sourceUni, destinationUni, sourceBr2, - VcpeConstants.DEFAULT_BRIDGE_NAME, "gre0"); + UnimgrConstants.DEFAULT_BRIDGE_NAME, "gre0"); // Set destination - Node destinationBr1 = VcpeUtils.readNode( + Node destinationBr1 = UnimgrUtils.readNode( dataBroker, - VcpeMapper.getOvsdbBridgeNodeIID(ovsdbDestinationNodeId, - VcpeConstants.DEFAULT_BRIDGE_NAME)).get(); - VcpeUtils.createTerminationPointNode(dataBroker, + UnimgrMapper.getOvsdbBridgeNodeIID(ovsdbDestinationNodeId, + UnimgrConstants.DEFAULT_BRIDGE_NAME)).get(); + UnimgrUtils.createTerminationPointNode(dataBroker, destinationUni, destinationBr1, - VcpeConstants.DEFAULT_BRIDGE_NAME, - VcpeConstants.DEFAULT_INTERNAL_IFACE, null); - Node destinationBr2 = VcpeUtils.readNode( + UnimgrConstants.DEFAULT_BRIDGE_NAME, + UnimgrConstants.DEFAULT_INTERNAL_IFACE, null); + Node destinationBr2 = UnimgrUtils.readNode( dataBroker, - VcpeMapper.getOvsdbBridgeNodeIID(ovsdbDestinationNodeId, - VcpeConstants.DEFAULT_BRIDGE_NAME)).get(); - VcpeUtils.createGreTunnel(dataBroker, destinationUni, + UnimgrMapper.getOvsdbBridgeNodeIID(ovsdbDestinationNodeId, + UnimgrConstants.DEFAULT_BRIDGE_NAME)).get(); + UnimgrUtils.createGreTunnel(dataBroker, destinationUni, sourceUni, destinationBr2, - VcpeConstants.DEFAULT_BRIDGE_NAME, "gre0"); + UnimgrConstants.DEFAULT_BRIDGE_NAME, "gre0"); } } } diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/EvcDeleteCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/EvcDeleteCommand.java similarity index 85% rename from impl/src/main/java/org/opendaylight/vcpe/command/EvcDeleteCommand.java rename to impl/src/main/java/org/opendaylight/unimgr/command/EvcDeleteCommand.java index a36bde53..805e88dd 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/EvcDeleteCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/EvcDeleteCommand.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import java.util.Map; import java.util.Map.Entry; @@ -13,8 +13,8 @@ import java.util.Set; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; -import org.opendaylight.vcpe.impl.VcpeUtils; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.Evc; +import org.opendaylight.unimgr.impl.UnimgrUtils; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.Evc; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; @@ -32,8 +32,8 @@ public class EvcDeleteCommand extends AbstractDeleteCommand { @Override public void execute() { - Map, Evc> originalEvcs = VcpeUtils.extractOriginal(changes, Evc.class); - Set> removedEvcs = VcpeUtils.extractRemoved(changes, Evc.class); + Map, Evc> originalEvcs = UnimgrUtils.extractOriginal(changes, Evc.class); + Set> removedEvcs = UnimgrUtils.extractRemoved(changes, Evc.class); Set> removedPaths = changes.getRemovedPaths(); if (!removedPaths.isEmpty()) { diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/EvcUpdateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/EvcUpdateCommand.java similarity index 96% rename from impl/src/main/java/org/opendaylight/vcpe/command/EvcUpdateCommand.java rename to impl/src/main/java/org/opendaylight/unimgr/command/EvcUpdateCommand.java index f3f3e222..7e6bbe9f 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/EvcUpdateCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/EvcUpdateCommand.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import java.util.Map; diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/TransactionInvoker.java b/impl/src/main/java/org/opendaylight/unimgr/command/TransactionInvoker.java similarity index 95% rename from impl/src/main/java/org/opendaylight/vcpe/command/TransactionInvoker.java rename to impl/src/main/java/org/opendaylight/unimgr/command/TransactionInvoker.java index 3a69c4f5..32e4338e 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/TransactionInvoker.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/TransactionInvoker.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import java.util.List; diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/UniCreateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/UniCreateCommand.java similarity index 79% rename from impl/src/main/java/org/opendaylight/vcpe/command/UniCreateCommand.java rename to impl/src/main/java/org/opendaylight/unimgr/command/UniCreateCommand.java index 74e731bd..7cd52a0a 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/UniCreateCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/UniCreateCommand.java @@ -5,19 +5,19 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import java.util.Map; import java.util.Map.Entry; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.vcpe.impl.VcpeConstants; -import org.opendaylight.vcpe.impl.VcpeMapper; -import org.opendaylight.vcpe.impl.VcpeUtils; +import org.opendaylight.unimgr.impl.UnimgrConstants; +import org.opendaylight.unimgr.impl.UnimgrMapper; +import org.opendaylight.unimgr.impl.UnimgrUtils; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.OvsdbNodeAugmentation; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.Unis; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.Uni; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.Unis; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.Uni; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeKey; @@ -61,12 +61,12 @@ public class UniCreateCommand extends AbstractCreateCommand { NodeId ovsdbNodeId = uni.getOvsdbNodeId(); if (ovsdbNodeId == null || ovsdbNodeId.getValue().isEmpty()) { // We assume the ovs is in passive mode - ovsdbNodeId = VcpeMapper.createNodeId(uni.getIpAddress()); + ovsdbNodeId = UnimgrMapper.createNodeId(uni.getIpAddress()); } // We retrieve the node from the store - Optional node = VcpeUtils.readNode(dataBroker, VcpeMapper.getOvsdbNodeIID(ovsdbNodeId)); + Optional node = UnimgrUtils.readNode(dataBroker, UnimgrMapper.getOvsdbNodeIID(ovsdbNodeId)); if (!node.isPresent()) { - VcpeUtils.createOvsdbNode(dataBroker, ovsdbNodeId, uni); + UnimgrUtils.createOvsdbNode(dataBroker, ovsdbNodeId, uni); } } if (created.getValue() != null && created.getValue() instanceof OvsdbNodeAugmentation) { @@ -76,7 +76,7 @@ public class UniCreateCommand extends AbstractCreateCommand { LOG.info("Received an OVSDB node create {}", ovsdbNodeAugmentation.getConnectionInfo() .getRemoteIp().getIpv4Address().getValue()); - Unis unis = VcpeUtils.readUnisFromStore(dataBroker, LogicalDatastoreType.CONFIGURATION); + Unis unis = UnimgrUtils.readUnisFromStore(dataBroker, LogicalDatastoreType.CONFIGURATION); if (unis != null && unis.getUni() != null) { // This will not scale up very well when the UNI quantity gets to higher numbers. for (Uni uni: unis.getUni()) { @@ -85,27 +85,28 @@ public class UniCreateCommand extends AbstractCreateCommand { NodeKey key = created.getKey().firstKeyOf(Node.class, NodeKey.class); if (uni.getOvsdbNodeId().equals(key.getNodeId())) { - VcpeUtils.createBridgeNode(dataBroker, + UnimgrUtils.createBridgeNode(dataBroker, uni.getOvsdbNodeId(), uni, - VcpeConstants.DEFAULT_BRIDGE_NAME); + UnimgrConstants.DEFAULT_BRIDGE_NAME); - VcpeUtils.copyUniToDataStore(dataBroker, uni, LogicalDatastoreType.OPERATIONAL); + UnimgrUtils.copyUniToDataStore(dataBroker, uni, LogicalDatastoreType.OPERATIONAL); } // The OVS instance is in ptcp mode. } else if (ovsdbNodeAugmentation .getConnectionInfo() .getRemoteIp() .equals(uni.getIpAddress())) { - InstanceIdentifier ovsdbNodeIid = VcpeMapper.getOvsdbNodeIID(uni.getIpAddress()); - Optional ovsdbNode = VcpeUtils.readNode(dataBroker, ovsdbNodeIid); + InstanceIdentifier ovsdbNodeIid = UnimgrMapper + .getOvsdbNodeIID(uni.getIpAddress()); + Optional ovsdbNode = UnimgrUtils.readNode(dataBroker, ovsdbNodeIid); NodeId ovsdbNodeId; if (ovsdbNode.isPresent()) { ovsdbNodeId = ovsdbNode.get().getNodeId(); - VcpeUtils.createBridgeNode(dataBroker, + UnimgrUtils.createBridgeNode(dataBroker, ovsdbNodeId, uni, - VcpeConstants.DEFAULT_BRIDGE_NAME); + UnimgrConstants.DEFAULT_BRIDGE_NAME); - VcpeUtils.copyUniToDataStore(dataBroker, uni, LogicalDatastoreType.OPERATIONAL); + UnimgrUtils.copyUniToDataStore(dataBroker, uni, LogicalDatastoreType.OPERATIONAL); } else { LOG.error("Unable to read node with IID {}", ovsdbNodeIid); } diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/UniDeleteCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/UniDeleteCommand.java similarity index 80% rename from impl/src/main/java/org/opendaylight/vcpe/command/UniDeleteCommand.java rename to impl/src/main/java/org/opendaylight/unimgr/command/UniDeleteCommand.java index 51a0c3bd..edb76be2 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/UniDeleteCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/UniDeleteCommand.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import java.util.Map; import java.util.Set; import org.opendaylight.controller.md.sal.binding.api.DataBroker; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; -import org.opendaylight.vcpe.impl.VcpeUtils; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.Uni; +import org.opendaylight.unimgr.impl.UnimgrUtils; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.Uni; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; @@ -31,8 +31,8 @@ public class UniDeleteCommand extends AbstractDeleteCommand { @Override public void execute() { - Map, Uni> originalUnis = VcpeUtils.extractOriginal(changes, Uni.class); - Set> removedUnis = VcpeUtils.extractRemoved(changes, Uni.class); + Map, Uni> originalUnis = UnimgrUtils.extractOriginal(changes, Uni.class); + Set> removedUnis = UnimgrUtils.extractRemoved(changes, Uni.class); if (!removedUnis.isEmpty()) { for (InstanceIdentifier removedUniIid: removedUnis) { LOG.info("Received a request to remove an UNI ", removedUniIid); diff --git a/impl/src/main/java/org/opendaylight/vcpe/command/UniUpdateCommand.java b/impl/src/main/java/org/opendaylight/unimgr/command/UniUpdateCommand.java similarity index 98% rename from impl/src/main/java/org/opendaylight/vcpe/command/UniUpdateCommand.java rename to impl/src/main/java/org/opendaylight/unimgr/command/UniUpdateCommand.java index d49e485d..351a9307 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/command/UniUpdateCommand.java +++ b/impl/src/main/java/org/opendaylight/unimgr/command/UniUpdateCommand.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.command; +package org.opendaylight.unimgr.command; import java.util.List; import java.util.Map; diff --git a/impl/src/main/java/org/opendaylight/vcpe/impl/EvcDataChangeListener.java b/impl/src/main/java/org/opendaylight/unimgr/impl/EvcDataChangeListener.java similarity index 89% rename from impl/src/main/java/org/opendaylight/vcpe/impl/EvcDataChangeListener.java rename to impl/src/main/java/org/opendaylight/unimgr/impl/EvcDataChangeListener.java index 81b2e2e7..6e1aec6e 100755 --- a/impl/src/main/java/org/opendaylight/vcpe/impl/EvcDataChangeListener.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/EvcDataChangeListener.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.impl; +package org.opendaylight.unimgr.impl; import java.util.Map; @@ -14,14 +14,14 @@ import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.vcpe.api.IVcpeDataChangeListener; +import org.opendaylight.unimgr.api.IUnimgrDataChangeListener; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class EvcDataChangeListener implements IVcpeDataChangeListener { +public class EvcDataChangeListener implements IUnimgrDataChangeListener { private static final Logger LOG = LoggerFactory.getLogger(EvcDataChangeListener.class); @@ -31,7 +31,7 @@ public class EvcDataChangeListener implements IVcpeDataChangeListener { public EvcDataChangeListener(DataBroker dataBroker) { this.dataBroker = dataBroker; evcListener = dataBroker.registerDataChangeListener( - LogicalDatastoreType.CONFIGURATION, VcpeMapper.getEvcsIid(), + LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getEvcsIid(), this, DataChangeScope.SUBTREE); } diff --git a/impl/src/main/java/org/opendaylight/vcpe/impl/UniDataChangeListener.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UniDataChangeListener.java similarity index 89% rename from impl/src/main/java/org/opendaylight/vcpe/impl/UniDataChangeListener.java rename to impl/src/main/java/org/opendaylight/unimgr/impl/UniDataChangeListener.java index 02605779..1dee61df 100755 --- a/impl/src/main/java/org/opendaylight/vcpe/impl/UniDataChangeListener.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UniDataChangeListener.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.impl; +package org.opendaylight.unimgr.impl; import java.util.HashMap; import java.util.Map; @@ -15,14 +15,14 @@ import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; -import org.opendaylight.vcpe.api.IVcpeDataChangeListener; +import org.opendaylight.unimgr.api.IUnimgrDataChangeListener; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class UniDataChangeListener implements IVcpeDataChangeListener { +public class UniDataChangeListener implements IUnimgrDataChangeListener { private static final Logger LOG = LoggerFactory.getLogger(UniDataChangeListener.class); @@ -33,13 +33,13 @@ public class UniDataChangeListener implements IVcpeDataChangeListener { this.dataBroker = dataBroker; listeners = new HashMap>(); ListenerRegistration uniListener = dataBroker.registerDataChangeListener( - LogicalDatastoreType.CONFIGURATION, VcpeMapper.getUnisIid() + LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getUnisIid() , this, DataChangeScope.SUBTREE); // We want to listen for operational store changes on the ovsdb:1 network topology // because this is when we know Southbound has successfully connected to the // OVS instance. ListenerRegistration ovsdbListener = dataBroker.registerDataChangeListener( - LogicalDatastoreType.OPERATIONAL, VcpeMapper.getOvsdbTopologyIdentifier() + LogicalDatastoreType.OPERATIONAL, UnimgrMapper.getOvsdbTopologyIdentifier() , this, DataChangeScope.SUBTREE); listeners.put("uni", uniListener); listeners.put("ovsdb", ovsdbListener); diff --git a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeConstants.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrConstants.java similarity index 98% rename from impl/src/main/java/org/opendaylight/vcpe/impl/VcpeConstants.java rename to impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrConstants.java index ed98b155..543078d7 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeConstants.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrConstants.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.impl; +package org.opendaylight.unimgr.impl; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Ipv4Address; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.Uri; @@ -36,7 +36,7 @@ import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology. import com.google.common.collect.ImmutableBiMap; -public class VcpeConstants { +public class UnimgrConstants { public static final TopologyId OVSDB_TOPOLOGY_ID = new TopologyId(new Uri("ovsdb:1")); diff --git a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeDataChangeListener.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrDataChangeListener.java similarity index 78% rename from impl/src/main/java/org/opendaylight/vcpe/impl/VcpeDataChangeListener.java rename to impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrDataChangeListener.java index 28ffee5f..c9319371 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeDataChangeListener.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrDataChangeListener.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.impl; +package org.opendaylight.unimgr.impl; import java.util.ArrayList; import java.util.HashMap; @@ -17,40 +17,40 @@ import org.opendaylight.controller.md.sal.binding.api.DataChangeListener; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataChangeEvent; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.md.sal.common.api.data.AsyncDataBroker.DataChangeScope; -import org.opendaylight.vcpe.api.IVcpeDataChangeListener; -import org.opendaylight.vcpe.command.Command; -import org.opendaylight.vcpe.command.EvcCreateCommand; -import org.opendaylight.vcpe.command.EvcDeleteCommand; -import org.opendaylight.vcpe.command.EvcUpdateCommand; -import org.opendaylight.vcpe.command.TransactionInvoker; -import org.opendaylight.vcpe.command.UniCreateCommand; -import org.opendaylight.vcpe.command.UniDeleteCommand; -import org.opendaylight.vcpe.command.UniUpdateCommand; +import org.opendaylight.unimgr.api.IUnimgrDataChangeListener; +import org.opendaylight.unimgr.command.Command; +import org.opendaylight.unimgr.command.EvcCreateCommand; +import org.opendaylight.unimgr.command.EvcDeleteCommand; +import org.opendaylight.unimgr.command.EvcUpdateCommand; +import org.opendaylight.unimgr.command.TransactionInvoker; +import org.opendaylight.unimgr.command.UniCreateCommand; +import org.opendaylight.unimgr.command.UniDeleteCommand; +import org.opendaylight.unimgr.command.UniUpdateCommand; import org.opendaylight.yangtools.concepts.ListenerRegistration; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VcpeDataChangeListener implements IVcpeDataChangeListener { +public class UnimgrDataChangeListener implements IUnimgrDataChangeListener { - private static final Logger LOG = LoggerFactory.getLogger(VcpeDataChangeListener.class); + private static final Logger LOG = LoggerFactory.getLogger(UnimgrDataChangeListener.class); private Map> listeners; private DataBroker dataBroker; private TransactionInvoker invoker; - public VcpeDataChangeListener(DataBroker dataBroker, TransactionInvoker invoker) { + public UnimgrDataChangeListener(DataBroker dataBroker, TransactionInvoker invoker) { this.dataBroker = dataBroker; this.invoker = invoker; listeners = new HashMap>(); ListenerRegistration uniListener = dataBroker.registerDataChangeListener( - LogicalDatastoreType.CONFIGURATION, VcpeMapper.getUnisIid() + LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getUnisIid() , this, DataChangeScope.SUBTREE); ListenerRegistration evcListener = dataBroker.registerDataChangeListener( - LogicalDatastoreType.CONFIGURATION, VcpeMapper.getEvcIid() + LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getEvcIid() , this, DataChangeScope.SUBTREE); ListenerRegistration ovsdbListener = dataBroker.registerDataChangeListener( - LogicalDatastoreType.OPERATIONAL, VcpeMapper.getOvsdbTopologyIdentifier() + LogicalDatastoreType.OPERATIONAL, UnimgrMapper.getOvsdbTopologyIdentifier() , this, DataChangeScope.SUBTREE); listeners.put("uni", uniListener); listeners.put("evc", evcListener); diff --git a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeMapper.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java similarity index 83% rename from impl/src/main/java/org/opendaylight/vcpe/impl/VcpeMapper.java rename to impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java index 301fc251..c84ee9eb 100755 --- a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeMapper.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrMapper.java @@ -5,15 +5,15 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.impl; +package org.opendaylight.unimgr.impl; import org.opendaylight.yang.gen.v1.urn.ietf.params.xml.ns.yang.ietf.inet.types.rev100924.IpAddress; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.Evcs; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.Unis; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.evcs.Evc; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.evcs.EvcKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.Uni; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.UniKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.Evcs; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.Unis; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.evcs.Evc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.evcs.EvcKey; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.Uni; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.UniKey; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NetworkTopology; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.TpId; @@ -27,9 +27,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VcpeMapper { +public class UnimgrMapper { - private static final Logger LOG = LoggerFactory.getLogger(VcpeMapper.class); + private static final Logger LOG = LoggerFactory.getLogger(UnimgrMapper.class); public static InstanceIdentifier getUnisIid() { return InstanceIdentifier.builder(Unis.class) @@ -86,37 +86,37 @@ public class VcpeMapper { public static InstanceIdentifier getOvsdbNodeIID(NodeId nodeId) { InstanceIdentifier nodePath = InstanceIdentifier .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(VcpeConstants.OVSDB_TOPOLOGY_ID)) + .child(Topology.class, new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) .child(Node.class,new NodeKey(nodeId)); return nodePath; } public static InstanceIdentifier getOvsdbBridgeNodeIID(NodeId ovsdbNode, String bridgeName) { - NodeId bridgeNodeId = new NodeId(ovsdbNode + VcpeConstants.DEFAULT_BRIDGE_NODE_ID_SUFFIX + bridgeName); + NodeId bridgeNodeId = new NodeId(ovsdbNode + UnimgrConstants.DEFAULT_BRIDGE_NODE_ID_SUFFIX + bridgeName); InstanceIdentifier nodePath = InstanceIdentifier .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(VcpeConstants.OVSDB_TOPOLOGY_ID)) + .child(Topology.class, new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) .child(Node.class,new NodeKey(bridgeNodeId)); return nodePath; } public static InstanceIdentifier getOvsdbNodeIID(IpAddress ipAddress) { - String nodeId = VcpeConstants.OVSDB_PREFIX + String nodeId = UnimgrConstants.OVSDB_PREFIX + ipAddress.getIpv4Address().getValue().toString() + ":" - + VcpeConstants.OVSDB_PORT; + + UnimgrConstants.OVSDB_PORT; InstanceIdentifier nodePath = InstanceIdentifier .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(VcpeConstants.OVSDB_TOPOLOGY_ID)) + .child(Topology.class, new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) .child(Node.class,new NodeKey(new NodeId(nodeId))); return nodePath; } public static NodeId createNodeId(IpAddress ipAddress) { - String nodeId = VcpeConstants.OVSDB_PREFIX + String nodeId = UnimgrConstants.OVSDB_PREFIX + ipAddress.getIpv4Address().getValue().toString() + ":" - + VcpeConstants.OVSDB_PORT; + + UnimgrConstants.OVSDB_PORT; return new NodeId(nodeId); } @@ -124,7 +124,7 @@ public class VcpeMapper { InstanceIdentifier path = InstanceIdentifier .create(NetworkTopology.class) .child(Topology.class, - new TopologyKey(VcpeConstants.OVSDB_TOPOLOGY_ID)) + new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) .child(Node.class); return path; } @@ -133,7 +133,7 @@ public class VcpeMapper { Node bridgeNode, String portName) { InstanceIdentifier terminationPointPath = InstanceIdentifier .create(NetworkTopology.class) - .child(Topology.class, new TopologyKey(VcpeConstants.OVSDB_TOPOLOGY_ID)) + .child(Topology.class, new TopologyKey(UnimgrConstants.OVSDB_TOPOLOGY_ID)) .child(Node.class,bridgeNode.getKey()) .child(TerminationPoint.class, new TerminationPointKey(new TpId(portName))); diff --git a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeProvider.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java similarity index 75% rename from impl/src/main/java/org/opendaylight/vcpe/impl/VcpeProvider.java rename to impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java index cd469b07..03ed1e33 100755 --- a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeProvider.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrProvider.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.impl; +package org.opendaylight.unimgr.impl; import java.util.ArrayList; import java.util.List; @@ -16,14 +16,14 @@ import org.opendaylight.controller.md.sal.binding.api.WriteTransaction; import org.opendaylight.controller.md.sal.common.api.data.LogicalDatastoreType; import org.opendaylight.controller.sal.binding.api.BindingAwareBroker.ProviderContext; import org.opendaylight.controller.sal.binding.api.BindingAwareProvider; -import org.opendaylight.vcpe.api.IVcpeConsoleProvider; -import org.opendaylight.vcpe.command.TransactionInvoker; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.Evcs; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.EvcsBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.Unis; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.UnisBuilder; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.evcs.Evc; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.Uni; +import org.opendaylight.unimgr.api.IUnimgrConsoleProvider; +import org.opendaylight.unimgr.command.TransactionInvoker; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.Evcs; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.EvcsBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.Unis; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.UnisBuilder; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.evcs.Evc; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.Uni; import org.opendaylight.yangtools.yang.binding.DataObject; import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.osgi.framework.BundleContext; @@ -35,17 +35,17 @@ import org.slf4j.LoggerFactory; import com.google.common.util.concurrent.FutureCallback; import com.google.common.util.concurrent.Futures; -public class VcpeProvider implements BindingAwareProvider, AutoCloseable, IVcpeConsoleProvider { +public class UnimgrProvider implements BindingAwareProvider, AutoCloseable, IUnimgrConsoleProvider { - private static final Logger LOG = LoggerFactory.getLogger(VcpeProvider.class); + private static final Logger LOG = LoggerFactory.getLogger(UnimgrProvider.class); - private UniDataChangeListener vcpeDataChangeListener; + private UniDataChangeListener unimgrDataChangeListener; private EvcDataChangeListener evcDataChangeListener; - private VcpeDataChangeListener listener; + private UnimgrDataChangeListener listener; private TransactionInvoker invoker; private DataBroker dataBroker; - private ServiceRegistration vcpeConsoleRegistration; + private ServiceRegistration unimgrConsoleRegistration; @Override public void onSessionInitiated(ProviderContext session) { @@ -55,27 +55,27 @@ public class VcpeProvider implements BindingAwareProvider, AutoCloseable, IVcpeC invoker = new TransactionInvoker(); // Initialize operational and default config data in MD-SAL data store BundleContext context = FrameworkUtil.getBundle(this.getClass()).getBundleContext(); - vcpeConsoleRegistration = context.registerService(IVcpeConsoleProvider.class, this, null); + unimgrConsoleRegistration = context.registerService(IUnimgrConsoleProvider.class, this, null); - vcpeDataChangeListener = new UniDataChangeListener(dataBroker); + unimgrDataChangeListener = new UniDataChangeListener(dataBroker); evcDataChangeListener = new EvcDataChangeListener(dataBroker); - listener = new VcpeDataChangeListener(dataBroker, invoker); + listener = new UnimgrDataChangeListener(dataBroker, invoker); // Init UNI Config & Operational stores Unis unis = new UnisBuilder().build(); - initDatastore(LogicalDatastoreType.CONFIGURATION, VcpeMapper.getUnisIid(), unis); - initDatastore(LogicalDatastoreType.OPERATIONAL, VcpeMapper.getUnisIid(), unis); + initDatastore(LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getUnisIid(), unis); + initDatastore(LogicalDatastoreType.OPERATIONAL, UnimgrMapper.getUnisIid(), unis); // Init EVC Config & Operational stores Evcs evcs = new EvcsBuilder().build(); - initDatastore(LogicalDatastoreType.CONFIGURATION, VcpeMapper.getEvcsIid(), evcs); - initDatastore(LogicalDatastoreType.OPERATIONAL, VcpeMapper.getEvcsIid(), evcs); + initDatastore(LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getEvcsIid(), evcs); + initDatastore(LogicalDatastoreType.OPERATIONAL, UnimgrMapper.getEvcsIid(), evcs); } @Override public void close() throws Exception { LOG.info("VcpeProvider Closed"); - vcpeConsoleRegistration.unregister(); - vcpeDataChangeListener.close(); + unimgrConsoleRegistration.unregister(); + unimgrDataChangeListener.close(); evcDataChangeListener.close(); listener.close(); } @@ -109,7 +109,7 @@ public class VcpeProvider implements BindingAwareProvider, AutoCloseable, IVcpeC // Place default config data in data store tree WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); - tx.put(LogicalDatastoreType.CONFIGURATION, VcpeMapper.getUnisIid(), unis); + tx.put(LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getUnisIid(), unis); // Perform the tx.submit synchronously tx.submit(); @@ -125,8 +125,8 @@ public class VcpeProvider implements BindingAwareProvider, AutoCloseable, IVcpeC try { // Removes default config data in data store tree WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); - tx.delete(LogicalDatastoreType.CONFIGURATION, VcpeMapper.getUniIid(id)); - System.out.println(VcpeMapper.getUniIid(id)); + tx.delete(LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getUniIid(id)); + System.out.println(UnimgrMapper.getUniIid(id)); // Perform the tx.submit synchronously tx.submit(); } catch (Exception e) { @@ -143,7 +143,7 @@ public class VcpeProvider implements BindingAwareProvider, AutoCloseable, IVcpeC try { ReadOnlyTransaction tx = dataBroker.newReadOnlyTransaction(); listOfUnis = tx.read((isConfigurationDatastore) ? LogicalDatastoreType.CONFIGURATION - : LogicalDatastoreType.OPERATIONAL, VcpeMapper.getUnisIid()).checkedGet().get().getUni(); + : LogicalDatastoreType.OPERATIONAL, UnimgrMapper.getUnisIid()).checkedGet().get().getUni(); } catch (Exception e) { LOG.error("ListIntents: failed: {}", e); } @@ -160,8 +160,8 @@ public class VcpeProvider implements BindingAwareProvider, AutoCloseable, IVcpeC Uni uni = null; try { - InstanceIdentifier iid = VcpeMapper.getUniIid(id); - System.out.println(VcpeMapper.getUniIid(id)); + InstanceIdentifier iid = UnimgrMapper.getUniIid(id); + System.out.println(UnimgrMapper.getUniIid(id)); ReadOnlyTransaction tx = dataBroker.newReadOnlyTransaction(); uni = tx.read(LogicalDatastoreType.CONFIGURATION, iid).checkedGet().get(); @@ -181,8 +181,8 @@ public class VcpeProvider implements BindingAwareProvider, AutoCloseable, IVcpeC public boolean removeEvc(String uuid) { try { WriteTransaction tx = dataBroker.newWriteOnlyTransaction(); - tx.delete(LogicalDatastoreType.CONFIGURATION, VcpeMapper.getEvcIid(uuid)); - System.out.println(VcpeMapper.getEvcIid(uuid)); + tx.delete(LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getEvcIid(uuid)); + System.out.println(UnimgrMapper.getEvcIid(uuid)); tx.submit(); } catch (Exception e) { LOG.info("Remove Evc: failed: {}", e); diff --git a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeUtils.java b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java similarity index 91% rename from impl/src/main/java/org/opendaylight/vcpe/impl/VcpeUtils.java rename to impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java index c40cd435..865ef986 100644 --- a/impl/src/main/java/org/opendaylight/vcpe/impl/VcpeUtils.java +++ b/impl/src/main/java/org/opendaylight/unimgr/impl/UnimgrUtils.java @@ -5,7 +5,7 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.impl; +package org.opendaylight.unimgr.impl; import java.net.InetAddress; import java.net.UnknownHostException; @@ -56,8 +56,8 @@ import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.re import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.Options; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.OptionsBuilder; import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.ovsdb.rev150105.ovsdb.port._interface.attributes.OptionsKey; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.Unis; -import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.rev150622.unis.Uni; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.Unis; +import org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.rev150622.unis.Uni; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.NodeId; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.Node; import org.opendaylight.yang.gen.v1.urn.tbd.params.xml.ns.yang.network.topology.rev131021.network.topology.topology.NodeBuilder; @@ -69,9 +69,9 @@ import org.opendaylight.yangtools.yang.binding.InstanceIdentifier; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -public class VcpeUtils { +public class UnimgrUtils { - private static final Logger LOG = LoggerFactory.getLogger(VcpeUtils.class); + private static final Logger LOG = LoggerFactory.getLogger(UnimgrUtils.class); public static final Optional readNode(DataBroker dataBroker, InstanceIdentifier nodeIid) { @@ -112,7 +112,7 @@ public class VcpeUtils { Optional dataObject = null; try { dataObject = read.read(storetype, - VcpeMapper.getUnisIid()).get(); + UnimgrMapper.getUnisIid()).get(); } catch (InterruptedException | ExecutionException e) { LOG.error("Error retrieving the UNIs from the Configuration tree."); } @@ -128,7 +128,7 @@ public class VcpeUtils { public static void copyUniToDataStore(DataBroker dataBroker, Uni uni, LogicalDatastoreType dataStoreType) { WriteTransaction write = dataBroker.newWriteOnlyTransaction(); - write.put(dataStoreType, VcpeMapper.getUniIid(uni), uni); + write.put(dataStoreType, UnimgrMapper.getUniIid(uni), uni); write.submit(); } @@ -136,14 +136,14 @@ public class VcpeUtils { NodeId ovsdbNodeId = uni.getOvsdbNodeId(); InstanceIdentifier ovsdbNodeIid; if (ovsdbNodeId == null || ovsdbNodeId.getValue().isEmpty()) { - ovsdbNodeIid = VcpeMapper.getOvsdbNodeIID(uni.getIpAddress()); + ovsdbNodeIid = UnimgrMapper.getOvsdbNodeIID(uni.getIpAddress()); } else { - ovsdbNodeIid = VcpeMapper.getOvsdbNodeIID(ovsdbNodeId); + ovsdbNodeIid = UnimgrMapper.getOvsdbNodeIID(ovsdbNodeId); } OvsdbNodeRef ovsdbNodeRef = new OvsdbNodeRef(ovsdbNodeIid); UUID bridgeUuid = UUID.randomUUID(); OvsdbBridgeAugmentation ovsdbBridge = new OvsdbBridgeAugmentationBuilder() - .setBridgeName(new OvsdbBridgeName(VcpeConstants.DEFAULT_BRIDGE_NAME)) + .setBridgeName(new OvsdbBridgeName(UnimgrConstants.DEFAULT_BRIDGE_NAME)) .setManagedBy(ovsdbNodeRef) .setBridgeUuid(new Uuid(bridgeUuid.toString())) .build(); @@ -153,7 +153,7 @@ public class VcpeUtils { public static OvsdbNodeAugmentation createOvsdbNodeAugmentation(Uni uni) { ConnectionInfo connectionInfos = new ConnectionInfoBuilder() .setRemoteIp(uni.getIpAddress()) - .setRemotePort(new PortNumber(VcpeConstants.OVSDB_PORT)) + .setRemotePort(new PortNumber(UnimgrConstants.OVSDB_PORT)) .build(); OvsdbNodeAugmentation ovsdbNode = new OvsdbNodeAugmentationBuilder() .setConnectionInfo(connectionInfos).build(); @@ -164,7 +164,7 @@ public class VcpeUtils { // we will use nodeId to set interface port id VlanId vlanID = new VlanId(1); OvsdbTerminationPointAugmentation terminationPoint = new OvsdbTerminationPointAugmentationBuilder() - .setName(VcpeConstants.DEFAULT_INTERNAL_IFACE) + .setName(UnimgrConstants.DEFAULT_INTERNAL_IFACE) .setVlanTag(vlanID) .setVlanMode(VlanMode.Access) .build(); @@ -181,11 +181,11 @@ public class VcpeUtils { } catch (UnknownHostException e) { LOG.info("Unable to retrieve controller's ip address, using loopback."); } - return new IpAddress(VcpeConstants.LOCAL_IP); + return new IpAddress(UnimgrConstants.LOCAL_IP); } public static ConnectionInfo getConnectionInfo(DataBroker dataBroker, NodeId ovsdbNodeId) { - InstanceIdentifier nodeIid = VcpeMapper.getOvsdbNodeIID(ovsdbNodeId); + InstanceIdentifier nodeIid = UnimgrMapper.getOvsdbNodeIID(ovsdbNodeId); Optional node = readNode(dataBroker, nodeIid); if (node.isPresent()) { Node ovsdbNode = node.get(); @@ -208,20 +208,20 @@ public class VcpeUtils { public static List createMdsalProtocols() { List protocolList = new ArrayList(); ImmutableBiMap> mapper = - VcpeConstants.OVSDB_PROTOCOL_MAP.inverse(); + UnimgrConstants.OVSDB_PROTOCOL_MAP.inverse(); protocolList.add(new ProtocolEntryBuilder(). setProtocol((Class) mapper.get("OpenFlow13")).build()); return protocolList; } public static void createOvsdbNode(DataBroker dataBroker, NodeId ovsdbNodeId, Uni uni) { - InstanceIdentifier ovsdbNodeIid = VcpeMapper + InstanceIdentifier ovsdbNodeIid = UnimgrMapper .getOvsdbNodeIID(uni.getIpAddress()); try { NodeKey ovsdbNodeKey = new NodeKey(ovsdbNodeId); Node nodeData = new NodeBuilder().setNodeId(ovsdbNodeId) .setKey(ovsdbNodeKey) - .addAugmentation(OvsdbNodeAugmentation.class, VcpeUtils.createOvsdbNodeAugmentation(uni)) + .addAugmentation(OvsdbNodeAugmentation.class, UnimgrUtils.createOvsdbNodeAugmentation(uni)) .build(); // Submit the node to the datastore WriteTransaction transaction = dataBroker.newWriteOnlyTransaction(); @@ -238,22 +238,22 @@ public class VcpeUtils { public static void createBridgeNode(DataBroker dataBroker, NodeId ovsdbNodeId, Uni uni, String bridgeName) { LOG.info("Creating a bridge on node {}", ovsdbNodeId); - InstanceIdentifier ovsdbNodeIid = VcpeMapper + InstanceIdentifier ovsdbNodeIid = UnimgrMapper .getOvsdbNodeIID(uni.getIpAddress()); - ConnectionInfo connectionInfo = VcpeUtils.getConnectionInfo(dataBroker, ovsdbNodeId); + ConnectionInfo connectionInfo = UnimgrUtils.getConnectionInfo(dataBroker, ovsdbNodeId); if (connectionInfo != null) { NodeBuilder bridgeNodeBuilder = new NodeBuilder(); - InstanceIdentifier bridgeIid = VcpeMapper + InstanceIdentifier bridgeIid = UnimgrMapper .getOvsdbBridgeNodeIID(ovsdbNodeId, bridgeName); NodeId bridgeNodeId = new NodeId(ovsdbNodeId - + VcpeConstants.DEFAULT_BRIDGE_NODE_ID_SUFFIX + bridgeName); + + UnimgrConstants.DEFAULT_BRIDGE_NODE_ID_SUFFIX + bridgeName); bridgeNodeBuilder.setNodeId(bridgeNodeId); OvsdbBridgeAugmentationBuilder ovsdbBridgeAugmentationBuilder = new OvsdbBridgeAugmentationBuilder(); // String target = VcpeUtils.getLocalIp().toString(); // ovsdbBridgeAugmentationBuilder.setControllerEntry(VcpeUtils.createControllerEntries(target)); ovsdbBridgeAugmentationBuilder.setBridgeName(new OvsdbBridgeName( bridgeName)); - ovsdbBridgeAugmentationBuilder.setProtocolEntry(VcpeUtils + ovsdbBridgeAugmentationBuilder.setProtocolEntry(UnimgrUtils .createMdsalProtocols()); OvsdbNodeRef ovsdbNodeRef = new OvsdbNodeRef(ovsdbNodeIid); ovsdbBridgeAugmentationBuilder.setManagedBy(ovsdbNodeRef); @@ -270,13 +270,13 @@ public class VcpeUtils { public static void createTerminationPointNode(DataBroker dataBroker, Uni uni, Node bridgeNode, String bridgeName, String portName, String type) { - InstanceIdentifier tpIid = VcpeMapper + InstanceIdentifier tpIid = UnimgrMapper .createTerminationPointInstanceIdentifier(bridgeNode, portName); OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder(); tpAugmentationBuilder.setName(portName); if (type != null) { - tpAugmentationBuilder.setInterfaceType(VcpeConstants.OVSDB_INTERFACE_TYPE_MAP.get(type)); + tpAugmentationBuilder.setInterfaceType(UnimgrConstants.OVSDB_INTERFACE_TYPE_MAP.get(type)); } TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); @@ -288,7 +288,7 @@ public class VcpeUtils { public static void createGreTunnel(DataBroker dataBroker, Uni source, Uni destination, Node bridgeNode, String bridgeName, String portName) { - InstanceIdentifier tpIid = VcpeMapper + InstanceIdentifier tpIid = UnimgrMapper .createTerminationPointInstanceIdentifier(bridgeNode, portName); OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder = new OvsdbTerminationPointAugmentationBuilder(); @@ -302,7 +302,7 @@ public class VcpeUtils { .build(); options.add(destinationIp); tpAugmentationBuilder.setOptions(options); - tpAugmentationBuilder.setInterfaceType(VcpeConstants.OVSDB_INTERFACE_TYPE_MAP.get("gre")); + tpAugmentationBuilder.setInterfaceType(UnimgrConstants.OVSDB_INTERFACE_TYPE_MAP.get("gre")); TerminationPointBuilder tpBuilder = new TerminationPointBuilder(); tpBuilder.setKey(InstanceIdentifier.keyOf(tpIid)); tpBuilder.addAugmentation(OvsdbTerminationPointAugmentation.class, tpAugmentationBuilder.build()); diff --git a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/UnimgrModule.java b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/UnimgrModule.java new file mode 100644 index 00000000..f8f91d56 --- /dev/null +++ b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/UnimgrModule.java @@ -0,0 +1,26 @@ +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622; + +import org.opendaylight.unimgr.impl.UnimgrProvider; + +public class UnimgrModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622.AbstractVcpeModule { + public UnimgrModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { + super(identifier, dependencyResolver); + } + + public UnimgrModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622.UnimgrModule oldModule, java.lang.AutoCloseable oldInstance) { + super(identifier, dependencyResolver, oldModule, oldInstance); + } + + @Override + public void customValidation() { + // add custom validation form module attributes here. + } + + @Override + public java.lang.AutoCloseable createInstance() { + final UnimgrProvider unimgrProvider = new UnimgrProvider(); + getBrokerDependency().registerProvider(unimgrProvider); + return unimgrProvider; + } + +} diff --git a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/UnimgrModuleFactory.java b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/UnimgrModuleFactory.java new file mode 100644 index 00000000..3dda3201 --- /dev/null +++ b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/UnimgrModuleFactory.java @@ -0,0 +1,13 @@ +/* +* Generated file +* +* Generated from: yang module name: unimgr-impl yang module local name: unimgr +* Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator +* Generated at: Tue Aug 25 16:07:47 EDT 2015 +* +* Do not modify this file unless it is present under src/main directory +*/ +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622; +public class UnimgrModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622.AbstractVcpeModuleFactory { + +} diff --git a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/vcpe/impl/rev150622/VcpeModule.java b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/VcpeModule.java old mode 100755 new mode 100644 similarity index 52% rename from impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/vcpe/impl/rev150622/VcpeModule.java rename to impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/VcpeModule.java index 29821cd7..907c5f3e --- a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/vcpe/impl/rev150622/VcpeModule.java +++ b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/VcpeModule.java @@ -1,20 +1,10 @@ -/* - * Copyright (c) 2015 CableLabs and others. All rights reserved. - * - * This program and the accompanying materials are made available under the - * terms of the Eclipse Public License v1.0 which accompanies this distribution, - * and is available at http://www.eclipse.org/legal/epl-v10.html - */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.impl.rev150622; - -import org.opendaylight.vcpe.impl.VcpeProvider; - -public class VcpeModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.impl.rev150622.AbstractVcpeModule { +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622; +public class VcpeModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622.AbstractVcpeModule { public VcpeModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver) { super(identifier, dependencyResolver); } - public VcpeModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.impl.rev150622.VcpeModule oldModule, java.lang.AutoCloseable oldInstance) { + public VcpeModule(org.opendaylight.controller.config.api.ModuleIdentifier identifier, org.opendaylight.controller.config.api.DependencyResolver dependencyResolver, org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622.VcpeModule oldModule, java.lang.AutoCloseable oldInstance) { super(identifier, dependencyResolver, oldModule, oldInstance); } @@ -25,9 +15,8 @@ public class VcpeModule extends org.opendaylight.yang.gen.v1.urn.opendaylight.pa @Override public java.lang.AutoCloseable createInstance() { - final VcpeProvider vcpeProvider = new VcpeProvider(); - getBrokerDependency().registerProvider(vcpeProvider); - return vcpeProvider; + // TODO:implement + throw new java.lang.UnsupportedOperationException(); } } diff --git a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/vcpe/impl/rev150622/VcpeModuleFactory.java b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/VcpeModuleFactory.java old mode 100755 new mode 100644 similarity index 56% rename from impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/vcpe/impl/rev150622/VcpeModuleFactory.java rename to impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/VcpeModuleFactory.java index b700a906..56359cb0 --- a/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/vcpe/impl/rev150622/VcpeModuleFactory.java +++ b/impl/src/main/java/org/opendaylight/yang/gen/v1/urn/opendaylight/params/xml/ns/yang/unimgr/impl/rev150622/VcpeModuleFactory.java @@ -1,13 +1,13 @@ /* * Generated file * -* Generated from: yang module name: vcpe-impl yang module local name: vcpe +* Generated from: yang module name: unimgr-impl yang module local name: unimgr * Generated by: org.opendaylight.controller.config.yangjmxgenerator.plugin.JMXGenerator -* Generated at: Mon Jun 22 15:07:08 EDT 2015 +* Generated at: Tue Aug 25 16:18:23 EDT 2015 * * Do not modify this file unless it is present under src/main directory */ -package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.impl.rev150622; -public class VcpeModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.vcpe.impl.rev150622.AbstractVcpeModuleFactory { +package org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622; +public class VcpeModuleFactory extends org.opendaylight.yang.gen.v1.urn.opendaylight.params.xml.ns.yang.unimgr.impl.rev150622.AbstractVcpeModuleFactory { } diff --git a/impl/src/main/yang/vcpe-impl.yang b/impl/src/main/yang/unimgr-impl.yang similarity index 79% rename from impl/src/main/yang/vcpe-impl.yang rename to impl/src/main/yang/unimgr-impl.yang index 16118ff2..e457ef21 100755 --- a/impl/src/main/yang/vcpe-impl.yang +++ b/impl/src/main/yang/unimgr-impl.yang @@ -5,30 +5,30 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL */ -module vcpe-impl { +module unimgr-impl { yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:vcpe:impl"; - prefix "vcpe-impl"; + namespace "urn:opendaylight:params:xml:ns:yang:unimgr:impl"; + prefix "unimgr-impl"; import config { prefix config; revision-date 2013-04-05; } import opendaylight-md-sal-binding { prefix md-sal-binding; revision-date 2013-10-28;} description - "Service definition for vcpe project"; + "Service definition for unimgr project"; revision "2015-06-22" { description "Initial revision"; } - identity vcpe { + identity unimgr { base config:module-type; config:java-name-prefix Vcpe; } augment "/config:modules/config:module/config:configuration" { - case vcpe { - when "/config:modules/config:module/config:type = 'vcpe'"; + case unimgr { + when "/config:modules/config:module/config:type = 'unimgr'"; container broker { uses config:service-ref { refine type { diff --git a/impl/src/test/java/org/opendaylight/vcpe/impl/VcpeProviderTest.java b/impl/src/test/java/org/opendaylight/unimgr/impl/UnimgrProviderTest.java similarity index 85% rename from impl/src/test/java/org/opendaylight/vcpe/impl/VcpeProviderTest.java rename to impl/src/test/java/org/opendaylight/unimgr/impl/UnimgrProviderTest.java index aba262f9..95a33047 100755 --- a/impl/src/test/java/org/opendaylight/vcpe/impl/VcpeProviderTest.java +++ b/impl/src/test/java/org/opendaylight/unimgr/impl/UnimgrProviderTest.java @@ -5,13 +5,13 @@ * terms of the Eclipse Public License v1.0 which accompanies this distribution, * and is available at http://www.eclipse.org/legal/epl-v10.html */ -package org.opendaylight.vcpe.impl; +package org.opendaylight.unimgr.impl; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; import org.opendaylight.controller.md.sal.binding.api.DataBroker; -import org.opendaylight.vcpe.command.TransactionInvoker; +import org.opendaylight.unimgr.command.TransactionInvoker; import org.osgi.framework.FrameworkUtil; import org.powermock.core.classloader.annotations.PrepareForTest; import org.powermock.modules.junit4.PowerMockRunner; @@ -19,11 +19,11 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) @PrepareForTest({FrameworkUtil.class}) -public class VcpeProviderTest { +public class UnimgrProviderTest { - @Mock private UniDataChangeListener vcpeDataChangeListener; + @Mock private UniDataChangeListener unimgrDataChangeListener; @Mock private EvcDataChangeListener evcDataChangeListener; - @Mock private VcpeDataChangeListener listener; + @Mock private UnimgrDataChangeListener listener; @Mock private TransactionInvoker invoker; @Mock private DataBroker dataBroker; diff --git a/it/pom.xml b/it/pom.xml index a0aec96a..c4893793 100755 --- a/it/pom.xml +++ b/it/pom.xml @@ -16,15 +16,15 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - org.opendaylight.vcpe - vcpe-it + org.opendaylight.unimgr + unimgr-it 0.0.1-SNAPSHOT jar ${project.groupId} - vcpe-artifacts + unimgr-artifacts ${project.version} pom import @@ -56,7 +56,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${project.groupId} - vcpe-features + unimgr-features features xml diff --git a/karaf/pom.xml b/karaf/pom.xml index 6216089f..34e4946e 100755 --- a/karaf/pom.xml +++ b/karaf/pom.xml @@ -14,21 +14,21 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL 4.0.0 - org.opendaylight.vcpe - vcpe-karaf + org.opendaylight.unimgr + unimgr-karaf 0.0.1-SNAPSHOT ${project.artifactId} 3.1.1 - odl-vcpe-ui + odl-unimgr-ui ${project.groupId} - vcpe-artifacts + unimgr-artifacts ${project.version} pom import @@ -46,7 +46,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL ${project.groupId} - vcpe-features + unimgr-features features xml runtime diff --git a/pom.xml b/pom.xml index 688afdd6..83661778 100755 --- a/pom.xml +++ b/pom.xml @@ -15,10 +15,10 @@ and is available at http://www.eclipse.org/legal/epl-v10.html INTERNAL - org.opendaylight.vcpe - vcpe-aggregator + org.opendaylight.unimgr + unimgr-aggregator 0.0.1-SNAPSHOT - vcpe + unimgr pom 4.0.0 -- 2.36.6