</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.opendaylight.vcpe</groupId>
- <artifactId>vcpe-api</artifactId>
+ <groupId>org.opendaylight.unimgr</groupId>
+ <artifactId>unimgr-api</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
// + type : string\r
// + uniMtuSize : int = [uniMtuSize >= 1522]\r
\r
-module cl-vcpe-mef {\r
+module cl-unimgr-mef {\r
\r
yang-version 1;\r
- namespace "urn:opendaylight:params:xml:ns:yang:vcpe";\r
- prefix "vcpe";\r
+ namespace "urn:opendaylight:params:xml:ns:yang:unimgr";\r
+ prefix "unimgr";\r
\r
import ietf-yang-types { prefix yang; revision-date 2013-07-15; }\r
import ietf-inet-types { prefix inet; revision-date 2010-09-24; }\r
import network-topology { prefix topo; revision-date 2013-10-21; }\r
\r
revision "2015-06-22" {\r
- description "Initial revision of vcpe model";\r
+ description "Initial revision of unimgr model";\r
}\r
\r
grouping service-speed {\r
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
- <groupId>org.opendaylight.vcpe</groupId>
- <artifactId>vcpe-artifacts</artifactId>
+ <groupId>org.opendaylight.unimgr</groupId>
+ <artifactId>unimgr-artifacts</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-api</artifactId>
+ <artifactId>unimgr-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-impl</artifactId>
+ <artifactId>unimgr-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-features</artifactId>
+ <artifactId>unimgr-features</artifactId>
<version>${project.version}</version>
<classifier>features</classifier>
<type>xml</type>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.opendaylight.vcpe</groupId>
- <artifactId>vcpe-cli</artifactId>
+ <groupId>org.opendaylight.unimgr</groupId>
+ <artifactId>unimgr-cli</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-impl</artifactId>
+ <artifactId>unimgr-impl</artifactId>
<version>${project.version}</version>
</dependency>
* 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;
}
* 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",
description = "Adds an uni to the controller.")
public class UniAddShellCommand extends OsgiCommandSupport {
- protected IVcpeConsoleProvider provider;
+ protected IUnimgrConsoleProvider provider;
@Option(name = "-id",
aliases = { "--uni-id" },
multiValued = true)
private String speed = "any";
- public UniAddShellCommand(IVcpeConsoleProvider provider) {
+ public UniAddShellCommand(IUnimgrConsoleProvider provider) {
this.provider = provider;
}
* 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" },
multiValued = false)
Boolean isConfigurationData = false;
- public UniListShellCommand(IVcpeConsoleProvider provider) {
+ public UniListShellCommand(IUnimgrConsoleProvider provider) {
this.provider = provider;
}
* 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;
}
* 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;
}
<blueprint xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0">
- <reference id="vcpeConsoleProvider" availability="mandatory"
- activation="eager" interface="org.opendaylight.vcpe.api.IVcpeConsoleProvider">
+ <reference id="unimgrConsoleProvider" availability="mandatory"
+ activation="eager" interface="org.opendaylight.unimgr.api.IUnimgrConsoleProvider">
</reference>
<command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
<command>
- <action class="org.opendaylight.vcpe.cli.UniAddShellCommand">
- <argument ref="vcpeConsoleProvider" />
+ <action class="org.opendaylight.unimgr.cli.UniAddShellCommand">
+ <argument ref="unimgrConsoleProvider" />
</action>
</command>
<command>
- <action class="org.opendaylight.vcpe.cli.UniRemoveShellCommand">
- <argument ref="vcpeConsoleProvider" />
+ <action class="org.opendaylight.unimgr.cli.UniRemoveShellCommand">
+ <argument ref="unimgrConsoleProvider" />
</action>
</command>
<command>
- <action class="org.opendaylight.vcpe.cli.UniListShellCommand">
- <argument ref="vcpeConsoleProvider" />
+ <action class="org.opendaylight.unimgr.cli.UniListShellCommand">
+ <argument ref="unimgrConsoleProvider" />
</action>
</command>
<command>
- <action class="org.opendaylight.vcpe.cli.UniShowShellCommand" >
- <argument ref="vcpeConsoleProvider" />
+ <action class="org.opendaylight.unimgr.cli.UniShowShellCommand" >
+ <argument ref="unimgrConsoleProvider" />
</action>
</command>
<command>
- <action class="org.opendaylight.vcpe.cli.EvcRemoveShellCommand">
- <argument ref="vcpeConsoleProvider" />
+ <action class="org.opendaylight.unimgr.cli.EvcRemoveShellCommand">
+ <argument ref="unimgrConsoleProvider" />
</action>
</command>
</command-bundle>
<version>1.6.0-SNAPSHOT</version>
<relativePath/>
</parent>
- <groupId>org.opendaylight.vcpe</groupId>
- <artifactId>vcpe-features</artifactId>
+ <groupId>org.opendaylight.unimgr</groupId>
+ <artifactId>unimgr-features</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>${project.artifactId}</name>
<modelVersion>4.0.0</modelVersion>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-impl</artifactId>
+ <artifactId>unimgr-impl</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-impl</artifactId>
+ <artifactId>unimgr-impl</artifactId>
<version>${project.version}</version>
<type>xml</type>
<classifier>config</classifier>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-api</artifactId>
+ <artifactId>unimgr-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-cli</artifactId>
+ <artifactId>unimgr-cli</artifactId>
<version>${project.version}</version>
</dependency>
</dependencies>
terms of the Eclipse Public License v1.0 which accompanies this distribution,
and is available at http://www.eclipse.org/legal/epl-v10.html
-->
-<features name="odl-vcpe-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
+<features name="odl-unimgr-${project.version}" xmlns="http://karaf.apache.org/xmlns/features/v1.2.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://karaf.apache.org/xmlns/features/v1.2.0 http://karaf.apache.org/xmlns/features/v1.2.0">
<repository>mvn:org.opendaylight.yangtools/features-yangtools/${yangtools.version}/xml/features</repository>
<repository>mvn:org.opendaylight.ovsdb/southbound-features/${ovsdb.version}/xml/features</repository>
<repository>mvn:org.opendaylight.dlux/features-dlux/${dlux.version}/xml/features</repository>
- <feature name='odl-vcpe-api' version='${project.version}' description='OpenDaylight :: VCPE :: api'>
+ <feature name='odl-unimgr-api' version='${project.version}' description='OpenDaylight :: VCPE :: api'>
<feature version='${yangtools.version}'>odl-yangtools-models</feature>
- <bundle>mvn:org.opendaylight.vcpe/vcpe-api/${project.version}</bundle>
+ <bundle>mvn:org.opendaylight.unimgr/unimgr-api/${project.version}</bundle>
</feature>
- <feature name='odl-vcpe' version='${project.version}' description='OpenDaylight :: VCPE'>
+ <feature name='odl-unimgr' version='${project.version}' description='OpenDaylight :: VCPE'>
<feature version='${mdsal.version}'>odl-mdsal-broker</feature>
<feature version='${ovsdb.version}'>odl-ovsdb-southbound-impl</feature>
- <feature version='${project.version}'>odl-vcpe-api</feature>
- <bundle>mvn:org.opendaylight.vcpe/vcpe-impl/${project.version}</bundle>
- <configfile finalname="${configfile.directory}/vcpe.xml">mvn:org.opendaylight.vcpe/vcpe-impl/${project.version}/xml/config</configfile>
+ <feature version='${project.version}'>odl-unimgr-api</feature>
+ <bundle>mvn:org.opendaylight.unimgr/unimgr-impl/${project.version}</bundle>
+ <configfile finalname="${configfile.directory}/unimgr.xml">mvn:org.opendaylight.unimgr/unimgr-impl/${project.version}/xml/config</configfile>
</feature>
- <feature name='odl-vcpe-console' version='${project.version}' description='OpenDaylight :: VCPE :: CLI'>
- <feature version="${project.version}">odl-vcpe</feature>
- <bundle>mvn:org.opendaylight.vcpe/vcpe-cli/${project.version}</bundle>
+ <feature name='odl-unimgr-console' version='${project.version}' description='OpenDaylight :: VCPE :: CLI'>
+ <feature version="${project.version}">odl-unimgr</feature>
+ <bundle>mvn:org.opendaylight.unimgr/unimgr-cli/${project.version}</bundle>
</feature>
- <feature name='odl-vcpe-rest' version='${project.version}' description='OpenDaylight :: VCPE :: REST'>
- <feature version="${project.version}">odl-vcpe</feature>
+ <feature name='odl-unimgr-rest' version='${project.version}' description='OpenDaylight :: VCPE :: REST'>
+ <feature version="${project.version}">odl-unimgr</feature>
<feature version="${mdsal.version}">odl-restconf</feature>
</feature>
- <feature name='odl-vcpe-ui' version='${project.version}' description='OpenDaylight :: VCPE :: UI'>
- <feature version="${project.version}">odl-vcpe-rest</feature>
- <feature version="${project.version}">odl-vcpe-console</feature>
+ <feature name='odl-unimgr-ui' version='${project.version}' description='OpenDaylight :: VCPE :: UI'>
+ <feature version="${project.version}">odl-unimgr-rest</feature>
+ <feature version="${project.version}">odl-unimgr-console</feature>
<feature version="${mdsal.version}">odl-mdsal-apidocs</feature>
<feature version="${mdsal.version}">odl-mdsal-xsql</feature>
<feature version="${dlux.version}">odl-dlux-all</feature>
</properties>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.opendaylight.vcpe</groupId>
- <artifactId>vcpe-impl</artifactId>
+ <groupId>org.opendaylight.unimgr</groupId>
+ <artifactId>unimgr-impl</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>bundle</packaging>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-api</artifactId>
+ <artifactId>unimgr-api</artifactId>
<version>${project.version}</version>
</dependency>
<!-- OVSDB dependency -->
-->
<snapshot>
<required-capabilities>
- <capability>urn:opendaylight:params:xml:ns:yang:vcpe:impl?module=vcpe-impl&revision=2015-06-22</capability>
+ <capability>urn:opendaylight:params:xml:ns:yang:unimgr:impl?module=unimgr-impl&revision=2015-06-22</capability>
<capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&revision=2013-10-28</capability>
</required-capabilities>
<configuration>
<data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
<modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
<module>
- <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:vcpe:impl">prefix:vcpe</type>
- <name>vcpe-default</name>
+ <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:unimgr:impl">prefix:unimgr</type>
+ <name>unimgr-default</name>
<broker>
<type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
<name>binding-osgi-broker</name>
* 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);
* 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;
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<InstanceIdentifier<?>, DataObject> changes);
* 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;
* 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;
* 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;
* 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 {
* 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;
}
// Get the destination UNI
NodeId destUniNodeID = evc.getUniDest().get(0).getUni();
- InstanceIdentifier<Uni> destinationNodeIid = VcpeMapper.getUniIid(destUniNodeID);
- Optional<Uni> optionalDestination = VcpeUtils.readUniNode(dataBroker, destinationNodeIid);
+ InstanceIdentifier<Uni> destinationNodeIid = UnimgrMapper.getUniIid(destUniNodeID);
+ Optional<Uni> 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<Uni> sourceNodeIid = VcpeMapper.getUniIid(sourceUniNodeID);
- Optional<Uni> optionalSource = VcpeUtils.readUniNode(dataBroker, sourceNodeIid);
+ InstanceIdentifier<Uni> sourceNodeIid = UnimgrMapper.getUniIid(sourceUniNodeID);
+ Optional<Uni> 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");
}
}
}
* 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.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;
@Override
public void execute() {
- Map<InstanceIdentifier<Evc>, Evc> originalEvcs = VcpeUtils.extractOriginal(changes, Evc.class);
- Set<InstanceIdentifier<Evc>> removedEvcs = VcpeUtils.extractRemoved(changes, Evc.class);
+ Map<InstanceIdentifier<Evc>, Evc> originalEvcs = UnimgrUtils.extractOriginal(changes, Evc.class);
+ Set<InstanceIdentifier<Evc>> removedEvcs = UnimgrUtils.extractRemoved(changes, Evc.class);
Set<InstanceIdentifier<?>> removedPaths = changes.getRemovedPaths();
if (!removedPaths.isEmpty()) {
* 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;
* 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;
* 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;
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> node = VcpeUtils.readNode(dataBroker, VcpeMapper.getOvsdbNodeIID(ovsdbNodeId));
+ Optional<Node> 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) {
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()) {
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<Node> ovsdbNodeIid = VcpeMapper.getOvsdbNodeIID(uni.getIpAddress());
- Optional<Node> ovsdbNode = VcpeUtils.readNode(dataBroker, ovsdbNodeIid);
+ InstanceIdentifier<Node> ovsdbNodeIid = UnimgrMapper
+ .getOvsdbNodeIID(uni.getIpAddress());
+ Optional<Node> 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);
}
* 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;
@Override
public void execute() {
- Map<InstanceIdentifier<Uni>, Uni> originalUnis = VcpeUtils.extractOriginal(changes, Uni.class);
- Set<InstanceIdentifier<Uni>> removedUnis = VcpeUtils.extractRemoved(changes, Uni.class);
+ Map<InstanceIdentifier<Uni>, Uni> originalUnis = UnimgrUtils.extractOriginal(changes, Uni.class);
+ Set<InstanceIdentifier<Uni>> removedUnis = UnimgrUtils.extractRemoved(changes, Uni.class);
if (!removedUnis.isEmpty()) {
for (InstanceIdentifier<Uni> removedUniIid: removedUnis) {
LOG.info("Received a request to remove an UNI ", removedUniIid);
* 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;
* 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;
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);
public EvcDataChangeListener(DataBroker dataBroker) {
this.dataBroker = dataBroker;
evcListener = dataBroker.registerDataChangeListener(
- LogicalDatastoreType.CONFIGURATION, VcpeMapper.getEvcsIid(),
+ LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getEvcsIid(),
this, DataChangeScope.SUBTREE);
}
* 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;
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);
this.dataBroker = dataBroker;
listeners = new HashMap<String, ListenerRegistration<DataChangeListener>>();
ListenerRegistration<DataChangeListener> 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<DataChangeListener> ovsdbListener = dataBroker.registerDataChangeListener(
- LogicalDatastoreType.OPERATIONAL, VcpeMapper.getOvsdbTopologyIdentifier()
+ LogicalDatastoreType.OPERATIONAL, UnimgrMapper.getOvsdbTopologyIdentifier()
, this, DataChangeScope.SUBTREE);
listeners.put("uni", uniListener);
listeners.put("ovsdb", ovsdbListener);
* 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;
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"));
* 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;
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<String, ListenerRegistration<DataChangeListener>> 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<String, ListenerRegistration<DataChangeListener>>();
ListenerRegistration<DataChangeListener> uniListener = dataBroker.registerDataChangeListener(
- LogicalDatastoreType.CONFIGURATION, VcpeMapper.getUnisIid()
+ LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getUnisIid()
, this, DataChangeScope.SUBTREE);
ListenerRegistration<DataChangeListener> evcListener = dataBroker.registerDataChangeListener(
- LogicalDatastoreType.CONFIGURATION, VcpeMapper.getEvcIid()
+ LogicalDatastoreType.CONFIGURATION, UnimgrMapper.getEvcIid()
, this, DataChangeScope.SUBTREE);
ListenerRegistration<DataChangeListener> ovsdbListener = dataBroker.registerDataChangeListener(
- LogicalDatastoreType.OPERATIONAL, VcpeMapper.getOvsdbTopologyIdentifier()
+ LogicalDatastoreType.OPERATIONAL, UnimgrMapper.getOvsdbTopologyIdentifier()
, this, DataChangeScope.SUBTREE);
listeners.put("uni", uniListener);
listeners.put("evc", evcListener);
* 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;
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<Unis> getUnisIid() {
return InstanceIdentifier.builder(Unis.class)
public static InstanceIdentifier<Node> getOvsdbNodeIID(NodeId nodeId) {
InstanceIdentifier<Node> 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<Node> 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<Node> 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<Node> getOvsdbNodeIID(IpAddress ipAddress) {
- String nodeId = VcpeConstants.OVSDB_PREFIX
+ String nodeId = UnimgrConstants.OVSDB_PREFIX
+ ipAddress.getIpv4Address().getValue().toString()
+ ":"
- + VcpeConstants.OVSDB_PORT;
+ + UnimgrConstants.OVSDB_PORT;
InstanceIdentifier<Node> 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);
}
InstanceIdentifier<Node> 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;
}
Node bridgeNode, String portName) {
InstanceIdentifier<TerminationPoint> 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)));
* 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;
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;
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<IVcpeConsoleProvider> vcpeConsoleRegistration;
+ private ServiceRegistration<IUnimgrConsoleProvider> unimgrConsoleRegistration;
@Override
public void onSessionInitiated(ProviderContext session) {
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();
}
// 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();
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) {
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);
}
Uni uni = null;
try {
- InstanceIdentifier<Uni> iid = VcpeMapper.getUniIid(id);
- System.out.println(VcpeMapper.getUniIid(id));
+ InstanceIdentifier<Uni> iid = UnimgrMapper.getUniIid(id);
+ System.out.println(UnimgrMapper.getUniIid(id));
ReadOnlyTransaction tx = dataBroker.newReadOnlyTransaction();
uni = tx.read(LogicalDatastoreType.CONFIGURATION, iid).checkedGet().get();
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);
* 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;
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;
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<Node> readNode(DataBroker dataBroker,
InstanceIdentifier<Node> nodeIid) {
Optional<Unis> 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.");
}
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();
}
NodeId ovsdbNodeId = uni.getOvsdbNodeId();
InstanceIdentifier<Node> 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();
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();
// 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();
} 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<Node> nodeIid = VcpeMapper.getOvsdbNodeIID(ovsdbNodeId);
+ InstanceIdentifier<Node> nodeIid = UnimgrMapper.getOvsdbNodeIID(ovsdbNodeId);
Optional<Node> node = readNode(dataBroker, nodeIid);
if (node.isPresent()) {
Node ovsdbNode = node.get();
public static List<ProtocolEntry> createMdsalProtocols() {
List<ProtocolEntry> protocolList = new ArrayList<ProtocolEntry>();
ImmutableBiMap<String, Class<? extends OvsdbBridgeProtocolBase>> mapper =
- VcpeConstants.OVSDB_PROTOCOL_MAP.inverse();
+ UnimgrConstants.OVSDB_PROTOCOL_MAP.inverse();
protocolList.add(new ProtocolEntryBuilder().
setProtocol((Class<? extends OvsdbBridgeProtocolBase>) mapper.get("OpenFlow13")).build());
return protocolList;
}
public static void createOvsdbNode(DataBroker dataBroker, NodeId ovsdbNodeId, Uni uni) {
- InstanceIdentifier<Node> ovsdbNodeIid = VcpeMapper
+ InstanceIdentifier<Node> 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();
public static void createBridgeNode(DataBroker dataBroker, NodeId ovsdbNodeId, Uni uni, String bridgeName) {
LOG.info("Creating a bridge on node {}", ovsdbNodeId);
- InstanceIdentifier<Node> ovsdbNodeIid = VcpeMapper
+ InstanceIdentifier<Node> 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<Node> bridgeIid = VcpeMapper
+ InstanceIdentifier<Node> 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);
public static void createTerminationPointNode(DataBroker dataBroker, Uni uni,
Node bridgeNode, String bridgeName, String portName, String type) {
- InstanceIdentifier<TerminationPoint> tpIid = VcpeMapper
+ InstanceIdentifier<TerminationPoint> 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));
public static void createGreTunnel(DataBroker dataBroker, Uni source, Uni destination,
Node bridgeNode, String bridgeName, String portName) {
- InstanceIdentifier<TerminationPoint> tpIid = VcpeMapper
+ InstanceIdentifier<TerminationPoint> tpIid = UnimgrMapper
.createTerminationPointInstanceIdentifier(bridgeNode, portName);
OvsdbTerminationPointAugmentationBuilder tpAugmentationBuilder =
new OvsdbTerminationPointAugmentationBuilder();
.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());
--- /dev/null
+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;
+ }
+
+}
--- /dev/null
+/*
+* 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 {
+
+}
-/*
- * 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);
}
@Override
public java.lang.AutoCloseable createInstance() {
- final VcpeProvider vcpeProvider = new VcpeProvider();
- getBrokerDependency().registerProvider(vcpeProvider);
- return vcpeProvider;
+ // TODO:implement
+ throw new java.lang.UnsupportedOperationException();
}
}
/*
* 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 {
}
* 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 {
* 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;
@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;
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.opendaylight.vcpe</groupId>
- <artifactId>vcpe-it</artifactId>
+ <groupId>org.opendaylight.unimgr</groupId>
+ <artifactId>unimgr-it</artifactId>
<version>0.0.1-SNAPSHOT</version>
<packaging>jar</packaging>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-artifacts</artifactId>
+ <artifactId>unimgr-artifacts</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-features</artifactId>
+ <artifactId>unimgr-features</artifactId>
<classifier>features</classifier>
<type>xml</type>
</dependency>
<relativePath/>
</parent>
<modelVersion>4.0.0</modelVersion>
- <groupId>org.opendaylight.vcpe</groupId>
- <artifactId>vcpe-karaf</artifactId>
+ <groupId>org.opendaylight.unimgr</groupId>
+ <artifactId>unimgr-karaf</artifactId>
<version>0.0.1-SNAPSHOT</version>
<name>${project.artifactId}</name>
<prerequisites>
<maven>3.1.1</maven>
</prerequisites>
<properties>
- <karaf.localFeature>odl-vcpe-ui</karaf.localFeature>
+ <karaf.localFeature>odl-unimgr-ui</karaf.localFeature>
</properties>
<dependencyManagement>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-artifacts</artifactId>
+ <artifactId>unimgr-artifacts</artifactId>
<version>${project.version}</version>
<type>pom</type>
<scope>import</scope>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>vcpe-features</artifactId>
+ <artifactId>unimgr-features</artifactId>
<classifier>features</classifier>
<type>xml</type>
<scope>runtime</scope>
<relativePath/>
</parent>
- <groupId>org.opendaylight.vcpe</groupId>
- <artifactId>vcpe-aggregator</artifactId>
+ <groupId>org.opendaylight.unimgr</groupId>
+ <artifactId>unimgr-aggregator</artifactId>
<version>0.0.1-SNAPSHOT</version>
- <name>vcpe</name>
+ <name>unimgr</name>
<packaging>pom</packaging>
<modelVersion>4.0.0</modelVersion>
<prerequisites>
Code Review / unimgr.git / commitdiff