From 70e243d1c48f9554bd4e28e80f7ff766db6fe857 Mon Sep 17 00:00:00 2001 From: Marek Gradzki Date: Fri, 10 Jun 2016 07:36:43 +0200 Subject: HONEYCOMB-7: Remove VBD form HC VBD is now subproject of ODL: https://git.opendaylight.org/gerrit/#/admin/projects/honeycomb/vbd Change-Id: I1bf01a01cca50fe5e3f4f82a53c6b15ec5c7091d Signed-off-by: Marek Gradzki --- vbd/api/pom.xml | 76 ---------- .../VxlanTunnelIdAllocator.java | 25 ---- vbd/api/src/main/yang/odl-external-reference.yang | 41 ----- vbd/api/src/main/yang/vbridge-topology.yang | 165 --------------------- 4 files changed, 307 deletions(-) delete mode 100644 vbd/api/pom.xml delete mode 100644 vbd/api/src/main/java/io.fd.honeycomb.vbd.api/VxlanTunnelIdAllocator.java delete mode 100644 vbd/api/src/main/yang/odl-external-reference.yang delete mode 100644 vbd/api/src/main/yang/vbridge-topology.yang (limited to 'vbd/api') diff --git a/vbd/api/pom.xml b/vbd/api/pom.xml deleted file mode 100644 index d3b448d05..000000000 --- a/vbd/api/pom.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - io.fd.honeycomb.common - api-parent - 1.0.0-SNAPSHOT - ../../common/api-parent - - - io.fd.honeycomb.vbd - 4.0.0 - vbd-api - 1.0.0-SNAPSHOT - bundle - - - - - org.opendaylight.mdsal.model - mdsal-model-artifacts - 0.8.2-Beryllium-SR2 - pom - import - - - io.fd.honeycomb.v3po - v3po-artifacts - 1.0.0-SNAPSHOT - pom - import - - - - - - - org.opendaylight.mdsal.model - iana-if-type-2014-05-08 - - - - - org.opendaylight.mdsal.model - ietf-inet-types-2013-07-15 - - - org.opendaylight.mdsal.model - ietf-topology - - - - io.fd.honeycomb.v3po - v3po-api - - - diff --git a/vbd/api/src/main/java/io.fd.honeycomb.vbd.api/VxlanTunnelIdAllocator.java b/vbd/api/src/main/java/io.fd.honeycomb.vbd.api/VxlanTunnelIdAllocator.java deleted file mode 100644 index c458e5754..000000000 --- a/vbd/api/src/main/java/io.fd.honeycomb.vbd.api/VxlanTunnelIdAllocator.java +++ /dev/null @@ -1,25 +0,0 @@ -/** - * Copyright (c) 2016 Cisco Systems, Inc. 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 io.fd.honeycomb.vbd.api; - - -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; -import org.opendaylight.yangtools.yang.binding.KeyedInstanceIdentifier; - - -public interface VxlanTunnelIdAllocator { - - /** - * Allocate next available vxlan tunnel ID - * - * @param vpp specify contret vpp for which is next available vxlan id looked for - * @return next available (in order) vxlan id. - */ - Integer nextIdFor(final KeyedInstanceIdentifier vpp); -} diff --git a/vbd/api/src/main/yang/odl-external-reference.yang b/vbd/api/src/main/yang/odl-external-reference.yang deleted file mode 100644 index e82bfe2b7..000000000 --- a/vbd/api/src/main/yang/odl-external-reference.yang +++ /dev/null @@ -1,41 +0,0 @@ -module odl-external-reference { - // vi: set et smarttab sw=4 tabstop=4: - - yang-version 1; - // FIXME: this mode should go to OpenDaylight/mdsal - namespace "urn:opendaylight:params:xml:ns:yang:external:reference"; - prefix "extref"; - - organization "Cisco Systems, Inc."; - - contact "Robert Varga "; - - description - "Model defining the base type for external references for use instead - of an instance-identifier, which does not allow referencing entities - unknown in the model (due to imports, etc.). - - Copyright (c) 2016 Cisco Systems, Inc. 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"; - - revision "2016-01-29" { - description "Initial model"; - } - - typedef external-reference { - description "Reference to a YANG-modeled node which resides outside - of this system. The format must use module names as namespace - prefixes -- in a similar fashion RESTCONF does. The reference - is evaluated from the root of the external system. - - This data type does not hold the coordinates of the external - system, nor does it specify which data store on the external - system should be used to satisfy the reference. This information - should be described in the model which instantiates a leaf of - this type."; - type string; - } -} diff --git a/vbd/api/src/main/yang/vbridge-topology.yang b/vbd/api/src/main/yang/vbridge-topology.yang deleted file mode 100644 index 954982f24..000000000 --- a/vbd/api/src/main/yang/vbridge-topology.yang +++ /dev/null @@ -1,165 +0,0 @@ -module vbridge-topology { - // vi: set et smarttab sw=4 tabstop=4: - - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:vbridge:topology"; - prefix "vbridge"; - - organization "Cisco Systems, Inc."; - - contact "Robert Varga "; - - description - "Base model describing a virtual bridge domain mapped expressed - as a network topology. Implementations of this model are expected - to map this topology onto an underlay transport/managent topology, - such as a NETCONF topology talking to forwarding boxes - - Copyright (c) 2015 Cisco and/or its affiliates. - - Licensed under the Apache License, Version 2.0 (the \"License\"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at: - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an \"AS IS\" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License."; - - revision "2016-01-29" { - description "Initial cut"; - } - - import ietf-inet-types { prefix "inet"; } - import network-topology { prefix nt; revision-date 2013-10-21; } - import odl-external-reference { prefix extref; } - import v3po { prefix "v3po"; } - import yang-ext { prefix ext; revision-date "2013-07-09"; } - - identity tunnel-type { - description "Type of tunneling technology"; - } - - typedef tunnel-type-ref { - description "Reference to a tunneling technology"; - type identityref { - base tunnel-type; - } - } - - identity tunnel-type-vxlan { - // FIXME: should be in a vxlan-specific model - description "VXLAN tunneling"; - base tunnel-type; - } - - augment "/nt:network-topology/nt:topology/nt:topology-types" { - ext:augment-identifier "topology-types-vbridge-augment"; - container vbridge-topology { - presence "Indicates a virtual bridge domain topology"; - } - } - - augment "/nt:network-topology/nt:topology" { - ext:augment-identifier "topology-vbridge-augment"; - when "./nt:topology-types/vbridge-topology"; - - // Pointer to the NETCONF topology which supports this bridge domain - // FIXME: must "../../nt:underlay-topology"; - - leaf tunnel-type { - description "Tunnel technology to use for encapsulation"; - type tunnel-type-ref; - } - - choice tunnel-parameters { - container vxlan { - // FIXME: should be in a vxlan-specific model - when "../type = tunnel-type-vxlan"; - leaf vni { - description "VNI to use for encap"; - type v3po:vxlan-vni; - mandatory true; - } - } - } - - uses v3po:bridge-domain-attributes; - } - - augment "/nt:network-topology/nt:topology/nt:node" { - ext:augment-identifier "node-vbridge-augment"; - when "../nt:topology-types/vbridge-topology"; - - - container bridge-member { - presence "Indicates this node is part of the bridge domain"; - - // Pointer to the NETCONF node which supports this bridge member - must "../../nt:supporting-node"; - - // FIXME: this is implementation specific, depends on whether - // the underlay has an a concept of a bridge domain. - leaf supporting-bridge-domain { - description - "Reference to the network element bridge domain, which has - been configured to support this virtual bridge domain on - this bridge member. - - This reference needs to be resolved against the supporting - node's configuration data store."; - config false; - type extref:external-reference; - } - } - } - - augment "/nt:network-topology/nt:topology/nt:node/nt:termination-point" { - ext:augment-identifier "termination-point-vbridge-augment"; - when "../bridge-member"; - - choice interface-type { - leaf user-interface { - description - "Reference to the network element interface, which is - configured to be a member of this virtual bridge domain. - - This reference needs to be resolved against the supporting - node's configuration data store."; - type extref:external-reference; - mandatory true; - } - leaf tunnel-interface { - description - "Reference to the network element interface, which is - configured to on the member to support exchange of packet - passing through this virtual bridge domain towards other - domain members. - - This reference needs to be resolved against the supporting - node's configuration data store."; - config false; - type extref:external-reference; - mandatory true; - } - } - } - - augment "/nt:network-topology/nt:topology/nt:link" { - when "../nt:topology-types/vbridge-topology"; - ext:augment-identifier "link-vbridge-augment"; - leaf tunnel { - description - "Reference to the network element tunnel interface supporting - cross-connect between two bridge members. - - This reference needs to be resolved against the supporting - node's operational data store."; - config false; - type extref:external-reference; - } - } -} -- cgit 1.2.3-korg