From e29975b799ccbd6f2438fd834a0084d868c695d9 Mon Sep 17 00:00:00 2001
From: Henry Gessau <gessau@gmail.com>
Date: Tue, 5 Jan 2016 12:06:08 -0500
Subject: [PATCH] Remove obsolete plugin stuff

Some spring cleaning:
 - Remove obsolete cisco vpn configs
 - Remove obsolete references from UT check script
 - Remove obsolete script for cleaning up plugins
 - Remove obsolete mock of heleosapi module

Change-Id: I0051e0b75b17279ffb61de328d7ccc7a12dc99dc
---
 etc/neutron/plugins/cisco/cisco_vpn_agent.ini | 26 -------------------
 .../tests/functional/db/test_migrations.py    |  6 -----
 setup.cfg                                     |  2 --
 tools/check_unit_test_structure.sh            |  4 ---
 tools/clean.sh                                |  5 ----
 5 files changed, 43 deletions(-)
 delete mode 100644 etc/neutron/plugins/cisco/cisco_vpn_agent.ini
 delete mode 100755 tools/clean.sh

diff --git a/etc/neutron/plugins/cisco/cisco_vpn_agent.ini b/etc/neutron/plugins/cisco/cisco_vpn_agent.ini
deleted file mode 100644
index 0aee17eb4be..00000000000
--- a/etc/neutron/plugins/cisco/cisco_vpn_agent.ini
+++ /dev/null
@@ -1,26 +0,0 @@
-[cisco_csr_ipsec]
-# Status check interval in seconds, for VPNaaS IPSec connections used on CSR
-# status_check_interval = 60
-
-# Cisco CSR management port information for REST access used by VPNaaS
-# TODO(pcm): Remove once CSR is integrated in as a Neutron router.
-#
-# Format is:
-# [cisco_csr_rest:<public IP>]
-# rest_mgmt = <mgmt port IP>
-# tunnel_ip = <tunnel IP>
-# username = <user>
-# password = <password>
-# timeout = <timeout>
-# host = <hostname>
-# tunnel_if = <tunnel I/F>
-#
-# where:
-#   public IP ----- Public IP address of router used with a VPN service (1:1 with CSR)
-#   tunnel IP ----- Public IP address of the CSR used for the IPSec tunnel
-#   mgmt port IP -- IP address of CSR for REST API access
-#   user ---------- Username for REST management port access to Cisco CSR
-#   password ------ Password for REST management port access to Cisco CSR
-#   timeout ------- REST request timeout to Cisco CSR (optional)
-#   hostname ------ Name of host where CSR is running as a VM
-#   tunnel I/F ---- CSR port name used for tunnels' IP address
diff --git a/neutron/tests/functional/db/test_migrations.py b/neutron/tests/functional/db/test_migrations.py
index 79b87854f2a..3d6a2e6859d 100644
--- a/neutron/tests/functional/db/test_migrations.py
+++ b/neutron/tests/functional/db/test_migrations.py
@@ -16,7 +16,6 @@ import six
 
 from alembic import script as alembic_script
 from contextlib import contextmanager
-import mock
 from oslo_config import cfg
 from oslo_config import fixture as config_fixture
 from oslo_db.sqlalchemy import test_base
@@ -102,11 +101,6 @@ class _TestModelsMigrations(test_migrations.ModelsMigrationsSync):
     '''
 
     def setUp(self):
-        patch = mock.patch.dict('sys.modules', {
-            'heleosapi': mock.MagicMock(),
-        })
-        patch.start()
-        self.addCleanup(patch.stop)
         super(_TestModelsMigrations, self).setUp()
         self.cfg = self.useFixture(config_fixture.Config())
         self.cfg.config(core_plugin=CORE_PLUGIN)
diff --git a/setup.cfg b/setup.cfg
index 62b79ceb294..87e3386bfed 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -35,8 +35,6 @@ data_files =
         etc/neutron/rootwrap.d/l3.filters
         etc/neutron/rootwrap.d/linuxbridge-plugin.filters
         etc/neutron/rootwrap.d/openvswitch-plugin.filters
-    etc/neutron/plugins/cisco =
-        etc/neutron/plugins/cisco/cisco_vpn_agent.ini
 scripts =
     bin/neutron-rootwrap-xen-dom0
 
diff --git a/tools/check_unit_test_structure.sh b/tools/check_unit_test_structure.sh
index d47eba8103d..5341d6cf0c7 100755
--- a/tools/check_unit_test_structure.sh
+++ b/tools/check_unit_test_structure.sh
@@ -11,9 +11,6 @@ test_path=$neutron_path/$base_test_path
 test_files=$(find ${test_path} -iname 'test_*.py')
 
 ignore_regexes=(
-    # The following vendor plugins are not required to confrm to the
-    # structural requirements.
-    "^plugins/ibm.*$"
     # The following test is required for oslo.versionedobjects
     "^objects/test_objects.py$"
     # The following open source plugin tests are not actually unit
@@ -28,7 +25,6 @@ ignore_regexes=(
     "^plugins/ml2/test_tracked_resources.py$"
     "^plugins/ml2/drivers/openvswitch/agent/test_agent_scheduler.py$"
     "^plugins/ml2/drivers/openvswitch/agent/test_ovs_tunnel.py$"
-    "^plugins/openvswitch/test_agent_scheduler.py$"
 )
 
 error_count=0
diff --git a/tools/clean.sh b/tools/clean.sh
deleted file mode 100755
index b79f0352692..00000000000
--- a/tools/clean.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-rm -rf ./*.deb ./*.tar.gz ./*.dsc ./*.changes
-rm -rf */*.deb
-rm -rf ./plugins/**/build/ ./plugins/**/dist
-rm -rf ./plugins/**/lib/neutron_*_plugin.egg-info ./plugins/neutron-*