From 5349f8cf8f55c0fd52289e2ce54f187af9c9e44f Mon Sep 17 00:00:00 2001
From: Michael Vorburger <vorburger@redhat.com>
Date: Tue, 22 Jan 2019 21:05:27 +0100
Subject: [PATCH] manually remove some clearly very old and outdated
 OpenDaylight models (fixes #554)

---
 experimental/odp/config-logging.yang          | 194 ------------------
 experimental/odp/config.yang                  | 190 -----------------
 .../odp/opendaylight-binding-broker-impl.yang | 173 ----------------
 .../odp/opendaylight-dom-broker-impl.yang     | 102 ---------
 4 files changed, 659 deletions(-)
 delete mode 100644 experimental/odp/config-logging.yang
 delete mode 100644 experimental/odp/config.yang
 delete mode 100644 experimental/odp/opendaylight-binding-broker-impl.yang
 delete mode 100644 experimental/odp/opendaylight-dom-broker-impl.yang

diff --git a/experimental/odp/config-logging.yang b/experimental/odp/config-logging.yang
deleted file mode 100644
index 477876c66..000000000
--- a/experimental/odp/config-logging.yang
+++ /dev/null
@@ -1,194 +0,0 @@
-// vi: set smarttab et sw=4 tabstop=4:
-module config-logging {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:logback:config";
-    prefix "logging";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import rpc-context { prefix rpcx; revision-date 2013-06-17; }
-
-    organization "Cisco Systems, Inc.";
-
-    description
-        "This module contains the base YANG definitions for NS-OS
-         logging module.";
-
-    revision "2013-07-16" {
-        description
-            "Initial revision.";
-    }
-
-    identity logback {
-        description
-            "Actual state of logback configuration.";
-        base config:module-type;
-        config:java-name-prefix Logback;
-    }
-
-    identity logback-rpc;
-
-    augment "/config:modules/config:module/config:configuration" {
-        case logback {
-            when "/config:modules/config:module/config:type = 'logback'";
-
-            list file-appenders {
-                leaf append {
-                    type boolean;
-                    mandatory false;
-                }
-
-                leaf file-name {
-                    type string;
-                    mandatory true;
-                }
-
-                leaf encoder-pattern {
-                    type string;
-                    mandatory true;
-                }
-
-                leaf name {
-                    type string;
-                    mandatory true;
-                }
-                key name;
-                config:java-name-prefix FileAppenderTO;
-            }
-
-            list rolling-appenders {
-                leaf append {
-                    type boolean;
-                    mandatory false;
-                }
-
-                leaf file-name {
-                    type string;
-                    mandatory true;
-                }
-
-                leaf encoder-pattern {
-                    type string;
-                    mandatory true;
-                }
-
-                leaf min-index {
-                    type int32;
-                    mandatory true;
-                }
-
-                leaf max-index {
-                    type int32;
-                    mandatory true;
-                }
-
-                leaf max-file-size {
-                    type string;
-                    mandatory true;
-                }
-
-                leaf name {
-                    type string;
-                    mandatory true;
-                }
-                key name;
-
-                leaf file-name-pattern {
-                    type string;
-                    mandatory true;
-                }
-
-                leaf rolling-policy-type {
-                    type string;
-                    mandatory true;
-                }
-
-                leaf max-history {
-                    type int32;
-                    mandatory true;
-                }
-
-                leaf clean-history-on-start {
-                    type boolean;
-                    default false;
-                }
-                config:java-name-prefix RollingFileAppenderTO;
-            }
-
-            list console-appenders {
-
-                leaf encoder-pattern {
-                    type string;
-                    mandatory true;
-                }
-
-                leaf threshold-filter {
-                    type string;
-                    default 'ALL';
-                }
-
-                leaf name {
-                    type string;
-                    mandatory true;
-                }
-                key name;
-
-                config:java-name-prefix ConsoleAppenderTO;
-            }
-
-            list loggers {
-                leaf logger-name {
-                    type string;
-                    mandatory true;
-                }
-                key logger-name;
-
-                leaf level {
-                    type string;
-                    mandatory true;
-                }
-
-                leaf-list appenders {
-                    type string;
-                }
-                config:java-name-prefix LoggerTO;
-            }
-        }
-    }
-
-
-    augment "/config:modules/config:module/config:state" {
-        case logback {
-            when "/config:modules/config:module/config:type = 'logback'";
-
-            rpcx:rpc-context-instance "logback-rpc";
-
-            list status {
-                config:java-name-prefix StatusTO;
-
-                leaf level {
-                    type string;
-                }
-
-                leaf message {
-                    type string;
-                }
-
-                leaf date {
-                    type uint32;
-                }
-            }
-        }
-    }
-
-    rpc reset {
-        input {
-            uses rpcx:rpc-context-ref {
-                refine context-instance {
-                    rpcx:rpc-context-instance logback-rpc;
-                }
-            }
-        }
-    }
-
-}
-
diff --git a/experimental/odp/config.yang b/experimental/odp/config.yang
deleted file mode 100644
index a0a4292ad..000000000
--- a/experimental/odp/config.yang
+++ /dev/null
@@ -1,190 +0,0 @@
-// vi: set smarttab et sw=4 tabstop=4:
-module config {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:config";
-    prefix "config";
-
-
-    description
-         "This module contains the base YANG definitions for NS-OS
-         configuration subsystem. The system modeled revolves around two
-         major concepts: modules and services.";
-
-    revision "2013-04-05" {
-        description
-            "Reworked to give modules their own space.";
-    }
-
-    revision "2013-04-03" {
-        description
-            "Initial revision.";
-    }
-
-    extension java-class {
-        description
-            "YANG language extension carrying the fully-qualified name of
-             a Java class. Code generation tools use the provided reference
-             to tie a specific construct to its Java representation.";
-
-        argument "name";
-    }
-
-    extension required-identity {
-        description
-            "YANG language extension which indicates that a particular
-             leafref, which points to a identityref, should additionally
-             require the target node is actually set to a descendant to
-             of a particular identity.
-
-             This is a workaround to two YANG deficiencies:
-             1) not being able to leafref instances of identityref
-             2) not being able to refine an identityref
-
-             This extension takes one argument, name, which MUST be the name
-             of an identity. Furthermore, that identity MUST be based,
-             directly or indirectly, on the identity, which is referenced by
-             the leaf reference, which is annotated with this extension.";
-
-        argument "name";
-    }
-
-    extension inner-state-bean {
-        description
-            "YANG language extension which indicates that a particular
-             list located under module's state should be treated as a list
-             of child state beans instead of just an ordinary list attribute";
-    }
-
-    extension provided-service {
-        description
-            "YANG language extension which indicates that a particular
-            module provides certain service. This extension can be placed
-            on identities that are based on module-type. Zero or more services
-            can be provided.
-            This extension takes one argument - name - which MUST be the name
-            of an identity. Furthermore, this identity MUST be based on
-            service-type.";
-
-        argument "name";
-    }
-
-    extension java-name-prefix {
-        description
-            "YANG language extension carrying java simple class name prefix
-            that will be taken into account when generating java code from
-            identities that are based on module-type.";
-            argument "java-prefix";
-    }
-
-    identity module-type {
-        description
-            "Module identity base type. All module identities must be derived
-            from this type. A module type uniquely defines a single atomic
-            component, such as an application. Each such component is assumed
-            to have its unique, stable and versioned configuration structure.";
-    }
-
-    identity service-type {
-        description
-            "Service identity base type. All service identities must be
-             derived from this type. A service type uniquely defines a single
-             atomic API contract, such as a Java interface, a set of C
-             function declarations, or similar.
-
-             If the service type has a corresponding Java interface, the name
-             of that interface should be attached to the derived identity MUST
-             include a java-class keyword, whose name argument points to that
-             interface.";
-    }
-
-    typedef service-type-ref {
-        description
-            "Internal type of references to service type identity.";
-
-        type identityref {
-            base service-type;
-        }
-    }
-
-    grouping service-ref {
-        description
-            "Type of references to a particular service instance. This type
-             can be used when defining module configuration to refer to a
-             particular service instance. Containers using this grouping
-             should not define anything else. The run-time implementation
-             is expected to inject a reference to the service as the value
-             of the container.";
-
-        leaf type {
-            description
-                "Type of the service being referenced. Users of this grouping
-                 should refine this leaf with required-identity pointing to
-                 the actual service-type which is actually required.";
-
-            mandatory true;
-            type service-type-ref;
-        }
-
-        leaf name {
-            mandatory true;
-            type leafref {
-                path "/config:services/config:service[config:type=current()/../type]/config:instance/config:name";
-            }
-        }
-    }
-
-    container modules {
-        description
-            "Top level container encapsulating configuration of all modules.";
-
-        list module {
-            key "name";
-            leaf name {
-                description "Unique module instance name";
-                type string;
-                mandatory true;
-            }
-
-            leaf type {
-                type identityref {
-                    base module-type;
-                }
-                mandatory true;
-            }
-
-            choice configuration {
-                mandatory true;
-                config true;
-            }
-
-            choice state {
-                config false;
-            }
-        }
-    }
-
-
-    container services {
-        list service {
-            key "type";
-            leaf type {
-                type service-type-ref;
-            }
-            list instance {
-                key "name";
-                leaf name {
-                    type string;
-                }
-
-                leaf provider {
-                    mandatory true;
-                    type leafref {
-                        path "/modules/module/name";
-                    }
-                }
-            }
-        }
-    }
-
-
-}
diff --git a/experimental/odp/opendaylight-binding-broker-impl.yang b/experimental/odp/opendaylight-binding-broker-impl.yang
deleted file mode 100644
index 428025a58..000000000
--- a/experimental/odp/opendaylight-binding-broker-impl.yang
+++ /dev/null
@@ -1,173 +0,0 @@
-module opendaylight-sal-binding-broker-impl {
-    yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding:impl";
-    prefix "binding-impl";
-
-    import config { prefix config; revision-date 2013-04-05; }
-    import opendaylight-md-sal-binding {prefix sal;}
-    import opendaylight-md-sal-dom {prefix dom;}
-    import opendaylight-md-sal-common {prefix common;}
-
-    description
-        "Service definition for Binding Aware MD-SAL.";
-
-    revision "2013-10-28" {
-        description
-            "Initial revision";
-    }
-
-    identity binding-dom-mapping-service {
-        base config:service-type;
-        config:java-class "org.opendaylight.yangtools.yang.data.impl.codec.BindingIndependentMappingService";
-    }
-
-
-    identity binding-broker-impl {
-        base config:module-type;
-        config:provided-service sal:binding-broker-osgi-registry;
-        config:provided-service sal:binding-rpc-registry;
-        config:java-name-prefix BindingBrokerImpl;
-    }
-
-    identity binding-data-broker {
-        base config:module-type;
-        config:provided-service sal:binding-data-broker;
-        config:provided-service sal:binding-data-consumer-broker;
-        config:java-name-prefix DataBrokerImpl;
-    }
-
-    identity binding-data-compatible-broker {
-        base config:module-type;
-        config:provided-service sal:binding-data-broker;
-        config:provided-service sal:binding-data-consumer-broker;
-        config:java-name-prefix ForwardedCompatibleDataBrokerImpl;
-    }
-
-    identity binding-rpc-broker {
-        base config:module-type;
-        config:provided-service sal:binding-rpc-registry;
-        config:java-name-prefix RpcBrokerImpl;
-    }
-
-    identity binding-notification-broker {
-        base config:module-type;
-        config:provided-service sal:binding-notification-service;
-        config:provided-service sal:binding-notification-subscription-service;
-        config:java-name-prefix NotificationBrokerImpl;
-    }
-
-    identity runtime-generated-mapping {
-        base config:module-type;
-        config:provided-service binding-dom-mapping-service;
-        config:java-name-prefix RuntimeMapping;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case binding-broker-impl {
-            when "/config:modules/config:module/config:type = 'binding-broker-impl'";
-
-            /*
-            container rpc-registry {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal:binding-rpc-registry;
-                    }
-                }
-            }*/
-
-            container data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal:binding-data-broker;
-                    }
-                }
-            }
-
-            container notification-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity sal:binding-notification-service;
-                    }
-                }
-            }
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case binding-data-broker {
-            when "/config:modules/config:module/config:type = 'binding-data-broker'";
-            container dom-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity dom:dom-broker-osgi-registry;
-                    }
-                }
-            }
-
-            container mapping-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity binding-dom-mapping-service;
-                    }
-                }
-            }
-        }
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case binding-data-compatible-broker {
-            when "/config:modules/config:module/config:type = 'binding-data-compatible-broker'";
-
-            container dom-async-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity dom:dom-broker-osgi-registry;
-                    }
-                }
-            }
-
-            container binding-mapping-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory true;
-                        config:required-identity binding-dom-mapping-service;
-                    }
-                }
-            }
-        }
-    }
-
-
-    augment "/config:modules/config:module/config:state" {
-        case runtime-generated-mapping {
-            when "/config:modules/config:module/config:type = 'runtime-generated-mapping'";
-        }
-    }
-
-    augment "/config:modules/config:module/config:state" {
-        case binding-data-broker {
-            when "/config:modules/config:module/config:type = 'binding-data-broker'";
-            container data {
-                uses common:data-state;
-            }
-        }
-    }
-    augment "/config:modules/config:module/config:state" {
-        case binding-rpc-broker {
-            when "/config:modules/config:module/config:type = 'binding-rpc-broker'";
-            uses common:rpc-state;
-        }
-    }
-    augment "/config:modules/config:module/config:state" {
-        case binding-notification-broker {
-            when "/config:modules/config:module/config:type = 'binding-notification-broker'";
-            uses common:notification-state;
-        }
-    }
-}
diff --git a/experimental/odp/opendaylight-dom-broker-impl.yang b/experimental/odp/opendaylight-dom-broker-impl.yang
deleted file mode 100644
index 099cb3372..000000000
--- a/experimental/odp/opendaylight-dom-broker-impl.yang
+++ /dev/null
@@ -1,102 +0,0 @@
-module opendaylight-sal-dom-broker-impl {
-	yang-version 1;
-    namespace "urn:opendaylight:params:xml:ns:yang:controller:md:sal:dom:impl";
-    prefix "binding-impl";
-
-	import config { prefix config; revision-date 2013-04-05; }
- 	import opendaylight-md-sal-dom {prefix sal;}
- 	import opendaylight-md-sal-common {prefix common;}
-
-    description
-        "Service definition for Binding Aware MD-SAL.";
- 
-    revision "2013-10-28" {
-        description
-            "Initial revision";
-    }
-
-    identity dom-broker-impl {
-        base config:module-type;
-        config:provided-service sal:dom-broker-osgi-registry;
-        config:java-name-prefix DomBrokerImpl;
-    }    
-    
-    
-    identity dom-inmemory-data-broker {
-        base config:module-type;
-        config:provided-service sal:dom-async-data-broker;
-    }
-    
-    identity hash-map-data-store {
-        base config:module-type;
-        config:provided-service sal:dom-data-store;
-        config:java-name-prefix HashMapDataStore;
-    }
-    
-    identity schema-service-singleton {
-        base config:module-type;
-        config:provided-service sal:schema-service;
-        config:java-name-prefix SchemaServiceImplSingleton;
-    }
-
-    augment "/config:modules/config:module/config:configuration" {
-        case dom-broker-impl {
-            when "/config:modules/config:module/config:type = 'dom-broker-impl'";
-            container data-store {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity sal:dom-data-store;
-                    }
-                }
-            }
-            
-            container async-data-broker {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity sal:dom-async-data-broker;
-                    }
-                }
-            
-            }
-        }
-    }
-    
-    augment "/config:modules/config:module/config:configuration" {
-        case dom-inmemory-data-broker {
-            when "/config:modules/config:module/config:type = 'dom-inmemory-data-broker'";
-            
-            container schema-service {
-                uses config:service-ref {
-                    refine type {
-                        mandatory false;
-                        config:required-identity sal:schema-service;
-                    }
-                }
-            
-            }
-        }
-    }
-    
-    augment "/config:modules/config:module/config:state" {
-        case hash-map-data-store {
-            when "/config:modules/config:module/config:type = 'hash-map-data-store'";
-        }
-    }
-    
-    augment "/config:modules/config:module/config:state" {
-        case schema-service-singleton {
-            when "/config:modules/config:module/config:type = 'schema-service-singleton'";
-        }
-    }
-    
-    augment "/config:modules/config:module/config:state" {
-        case dom-broker-impl {
-            when "/config:modules/config:module/config:type = 'dom-broker-impl'";
-            container data {
-                uses common:data-state;
-            } 
-        }
-    }
-}