From 04f52c87b29c7fdcecf3b2bcf12d6e427e21599c Mon Sep 17 00:00:00 2001
From: Patrick Bonnell <patrick.bonnell@windriver.com>
Date: Wed, 28 Nov 2018 14:51:17 -0500
Subject: [PATCH] Removal of custom QoS HEAT templates.

This commit removes the HEAT templates involved with
the custom QoS extension.

Story: 2003948
Task: 26862

Change-Id: Ibec78b67fff5baa2d43d9e6ddb643b1e7ff5b2dd
Signed-off-by: Patrick Bonnell <patrick.bonnell@windriver.com>
---
 .../python-heat/python-heat/templates/README  |  6 +-
 .../templates/hot/scenarios/WRSQoSPolicy.yaml | 59 ----------------
 .../hot/simple/WR_Neutron_QoSPolicy.yaml      | 67 -------------------
 3 files changed, 1 insertion(+), 131 deletions(-)
 delete mode 100644 openstack/python-heat/python-heat/templates/hot/scenarios/WRSQoSPolicy.yaml
 delete mode 100644 openstack/python-heat/python-heat/templates/hot/simple/WR_Neutron_QoSPolicy.yaml

diff --git a/openstack/python-heat/python-heat/templates/README b/openstack/python-heat/python-heat/templates/README
index 9f1268de..30dcd056 100644
--- a/openstack/python-heat/python-heat/templates/README
+++ b/openstack/python-heat/python-heat/templates/README
@@ -1,4 +1,4 @@
-Copyright © 2014-2017 Wind River Systems, Inc.
+Copyright © 2014-2018 Wind River Systems, Inc.
 
 SPDX-License-Identifier: Apache-2.0
 -----------------------------------------------------------------------
@@ -123,10 +123,6 @@ the hot/simple/ directory, in a YAML file named after the heat resource.
     WR_Neutron_ProviderNetRange.yaml    - Creates a segment id range for a Provider Network; 
                                           specifying the providerNet, and the min and max values 
                                           of the segment id range.
-    WR_Neutron_QoSPolicy.yaml           - Creates a Neutron QoS Policy which specifies a packet 
-                                          scheduling weight. This QoS Policy can be referenced 
-                                          by a Tenant Network to modify the scheduling weight of 
-                                          AVS ingress traffic from VMs for this Tenant Network.
 
 
 
diff --git a/openstack/python-heat/python-heat/templates/hot/scenarios/WRSQoSPolicy.yaml b/openstack/python-heat/python-heat/templates/hot/scenarios/WRSQoSPolicy.yaml
deleted file mode 100644
index c00b1ecd..00000000
--- a/openstack/python-heat/python-heat/templates/hot/scenarios/WRSQoSPolicy.yaml
+++ /dev/null
@@ -1,59 +0,0 @@
-################################################################################
-## Copyright (c) 2017 Wind River Systems, Inc.
-##
-## SPDX-License-Identifier: Apache-2.0
-##
-#################################################################################
-##
-## Objectives:
-##   Create a wrs-qos policy and a new network with it attached
-##
-##
-## Mandatory Template Parameters:
-##   None
-##
-## Tenant Considerations:
-##    None
-##
-## Sample CLI syntax:
-##    heat stack-create -f WRSQoSPolicy.yaml  STACK
-##
-## Expected Outcome:
-##   A new WRS_qos policy and network are created
-##   The new wrs_qos policy is attached to the network
-##
-#################################################################################
-heat_template_version: 2015-04-30
-
-description: >
-   Demonstrate creating a wrs-qos policy and a new network with it attached
-
-parameters:
-
-    QOS_NAME:
-        description: name for the new wrs_qos
-        type: string
-        default: example_qos
-
-    NET_NAME:
-        description: name for the new network
-        type: string
-        default: example_net
-
-resources:
-
-    ex-qos:
-        type: WR::Neutron::QoSPolicy
-        properties:
-            description: 'Example Network Policy'
-            name: { get_param: QOS_NAME }
-            policies:
-                scheduler:
-                    weight: 16
-
-    ex-net:
-        type: OS::Neutron::Net
-        properties:
-            name: { get_param: NET_NAME }
-            shared: true
-            wrs_qos: {get_resource: ex-qos }
diff --git a/openstack/python-heat/python-heat/templates/hot/simple/WR_Neutron_QoSPolicy.yaml b/openstack/python-heat/python-heat/templates/hot/simple/WR_Neutron_QoSPolicy.yaml
deleted file mode 100644
index 52b9ca2e..00000000
--- a/openstack/python-heat/python-heat/templates/hot/simple/WR_Neutron_QoSPolicy.yaml
+++ /dev/null
@@ -1,67 +0,0 @@
-###############################################################################
-# Copyright (c) 2013-2015 Wind River Systems, Inc.
-#
-# SPDX-License-Identifier: Apache-2.0
-#
-################################################################################
-#
-# Objective:
-#    Demonstrate constructing the heat resource WR::Neutron::QosPolicy
-#
-# Pre-Reqs:
-#    Normal Lab Setup (networks, host interfaces, glance images)
-#
-# Mandatory Template Parameters:
-#    None
-#
-# Tenant Considerations:
-#    An admin activity
-#
-# Sample CLI syntax:
-#    heat stack-create -f   WR_Neutron_QoSPolicy.yaml STACK
-#
-# Expected Outcome:
-#  A new qos policy called SampleQoS
-#    neutron qos-list
-#
-################################################################################
-
-heat_template_version: 2015-04-30
-
-description: >
-   Demonstrate the WR::Neutron::QoSPolicy heat resource
-
-parameters:
-
-    NAME:
-        description: Name of the QoS policy
-        type: string
-        default: SampleQoS
-
-    DESCRIPTION:
-        description: Description of the QoS policy
-        type: string
-        default: 'A simple QoS policy'
-
-resources:
-
-    WR_Neutron_QoSPolicy:
-        type: WR::Neutron::QoSPolicy
-        properties:
-            # required properties
-            name: { get_param: NAME }
-
-            # optional properties
-            description: { get_param: DESCRIPTION }
-
-            # tenant-id: { get_param: TENANT_ID}
-
-            policies: {
-                scheduler: { weight: 16 },
-                # dscp: { dscp: 10 }
-            }
-
-outputs:
-    qos_show:
-        description: All attributes of the QoS policy
-        value: { get_attr: [ WR_Neutron_QoSPolicy, show] }