From 7fdcc3403279ee9a8c55a04c9de1f77d637bab88 Mon Sep 17 00:00:00 2001 From: "Keith Burns (alagalah)" Date: Wed, 27 May 2015 23:00:23 -0700 Subject: [PATCH] Removal of OpenStackEndpoint YANG Change-Id: I9be44f2bf640fa59026de2d7935bf61a40078ea6 Signed-off-by: Keith Burns (alagalah) --- pom.xml | 1 - .../openstackgbp-provider-impl.yang | 57 ----- .../openstackgbp/openstackgbp.yang | 194 ------------------ 3 files changed, 252 deletions(-) delete mode 100644 renderers/ofoverlay/src/main/yang/integration/openstackgbp/openstackgbp-provider-impl.yang delete mode 100644 renderers/ofoverlay/src/main/yang/integration/openstackgbp/openstackgbp.yang diff --git a/pom.xml b/pom.xml index 85e3aceef..57c9818a6 100644 --- a/pom.xml +++ b/pom.xml @@ -26,7 +26,6 @@ renderers groupbasedpolicy-ofoverlay-config groupbasedpolicy-opflex-config - groupbasedpolicy-openstackendpoint-config neutron-mapper neutron-mapper-config neutron-ovsdb diff --git a/renderers/ofoverlay/src/main/yang/integration/openstackgbp/openstackgbp-provider-impl.yang b/renderers/ofoverlay/src/main/yang/integration/openstackgbp/openstackgbp-provider-impl.yang deleted file mode 100644 index 9eda01bd7..000000000 --- a/renderers/ofoverlay/src/main/yang/integration/openstackgbp/openstackgbp-provider-impl.yang +++ /dev/null @@ -1,57 +0,0 @@ -/* - * Copyright (c) 2014 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 - */ - -module openstack-endpoint-provider-impl { - yang-version 1; - namespace "urn:opendaylight:params:xml:ns:yang:controller:config:openstack-endpoint-provider:impl"; - prefix "openstack-endpoint-provider-impl"; - - import config { prefix config; revision-date 2013-04-05; } - import opendaylight-md-sal-binding { prefix mdsal; revision-date 2013-10-28; } - - description - "This module contains the base YANG definitions for openstack-endpoint-provider impl implementation."; - - revision "2014-12-04" { - description - "Initial revision."; - } - - // This is the definition of the service implementation as a module identity - identity openstack-endpoint-provider-impl { - base config:module-type; - - // Specifies the prefix for generated java classes. - config:java-name-prefix OpenstackEndpointProvider; - } - - // Augments the 'configuration' choice node under modules/module. - augment "/config:modules/config:module/config:configuration" { - case openstack-endpoint-provider-impl { - when "/config:modules/config:module/config:type = 'openstack-endpoint-provider-impl'"; - - //wires in the data-broker service - container data-broker { - uses config:service-ref { - refine type { - mandatory false; - config:required-identity mdsal:binding-async-data-broker; - } - } - } - container rpc-registry { - uses config:service-ref { - refine type { - mandatory true; - config:required-identity mdsal:binding-rpc-registry; - } - } - } - } - } -} diff --git a/renderers/ofoverlay/src/main/yang/integration/openstackgbp/openstackgbp.yang b/renderers/ofoverlay/src/main/yang/integration/openstackgbp/openstackgbp.yang deleted file mode 100644 index e8da4c4c6..000000000 --- a/renderers/ofoverlay/src/main/yang/integration/openstackgbp/openstackgbp.yang +++ /dev/null @@ -1,194 +0,0 @@ -/* - * Copyright (c) 2014 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 - */ - -module openstack-endpoint { - yang-version 1; - - namespace "urn:opendaylight:groupbasedpolicy:openstackendpoint"; - prefix "gbp-openstackendpoint"; - - import gbp-common {prefix gbp-common;} - import ietf-inet-types {prefix inet;} - import ietf-yang-types { - prefix yang; - revision-date 2010-09-24; - } -/* - import endpoint { - prefix endpoint; - revision-date 2014-04-21; - } -*/ - revision "2014-12-04" { - description - "Initial revision."; - } - - grouping l2-key { - description - "The fields that identify an endpoint by a layer 2 address"; - leaf l2-context { - type gbp-common:l2-bridge-domain-id; - description - "The bridge domain for the layer 2 address for this endpoint"; - } - leaf mac-address { - type yang:mac-address; - description - "The MAC address for the endpoint"; - } - } - - grouping l3-key { - description - "The fields that identify an endpoint by a layer 3 address"; - leaf l3-context { - type gbp-common:l3-context-id; - mandatory true; - description - "The context for this layer 3 address"; - } - leaf ip-address { - type inet:ip-address; - mandatory true; - description - "The actual IP address for the endpoint"; - } - } - - // A base type for an end point - grouping endpoint-fields { - description "An endpoint and its associated metadata"; - leaf tenant { - type gbp-common:tenant-id; - mandatory true; - description - "The tenant with which this endpoint is associated"; - } - - uses l2-key; - - list l3-address { - description - "All the layer 3 addresses associated with this endpoint"; - key "l3-context ip-address"; - uses l3-key; - } - leaf endpoint-group { - type gbp-common:endpoint-group-id; - description - "The group associated with this endpoint"; - } - leaf-list condition { - type gbp-common:condition-name; - description - "The conditions associated with this endpoint"; - } - leaf timestamp { - type int64; - description - "The last timestamp associated with this endpoint record. - This will be used for aging data in the registry."; - } - leaf neutron-port-id { - description - "Tap port known to neutron at time of VM creation"; - type gbp-common:name; - } - } - - grouping has-endpoint-group-conditions { - description - "Base type for object with endpoint group to condition - mappings."; - - leaf endpoint-group { - description "The endpoint group conditions to assign"; - type gbp-common:endpoint-group-id; - } - list endpoint-group-condition { - description - "The conditions associated with this endpoint - group"; - key "condition"; - leaf condition { - description "A condition name to associate."; - type gbp-common:condition-name; - } - } - } - - - // A base type for an end point - container openstack-endpoints { - description - "Repository for operational state data about endpoints needed for - policy resolution."; - config false; - - list endpoint { - description - "Endpoints indexed by layer 2 addreses. When modifying - data here, you must also modify data in the - endpoints-l3 list as well."; - key "l2-context mac-address"; - uses endpoint-fields; - } - - list endpoint-l3 { - description - "Endpoints indexed by layer 3 addreses. When modifying - data here, you must also modify data in the endpoints - list as well."; - - key "l3-context ip-address"; - uses l3-key; - - uses endpoint-fields; - } - - list condition-mapping { - description - "A list mapping conditions to entire endpoint groups. - This offers a quickly way to set a condition on many - endpoints at once."; - - key "endpoint-group"; - uses has-endpoint-group-conditions; - } - - } - - rpc unregister-endpoint { - description "Unregister an endpoint or endpoints from the registry."; - - input { - list l2 { - key "l2-context mac-address"; - uses l2-key; - } - list l3 { - key "l3-context ip-address"; - uses l3-key; - } - } - } - - rpc register-endpoint { - description - "Register a new endpoint into the registry. If there - is already an existing endpoint with the same keys, they - will be overwritten with the new information."; - - input { - uses endpoint-fields; - } - } - } - -} -- 2.36.6