From c5951ef90773e03426d5c11c222bf9061209bd28 Mon Sep 17 00:00:00 2001
From: CR_hui <CR_hui@126.com>
Date: Thu, 8 Dec 2016 15:55:18 +0800
Subject: [PATCH] Synchronize some patches and fix the requirement.txt

1. What is the problem?
   A. After Removing networking related code from the Trio2o, there are
also some patches need to synchroniz.
   B. Kombu 4.0.1 was released and it's breaking everything 4.0.0 was
breaking.

2. What is the solution to the problem?
   A. Synchronize some patches and the IDs of these patches are:
             374559;
             373812;
             373616;
             378159;
             373891;
             375201;
   B. Fix the requirement.txt

3. What the features need to be implemented to the Tricircle to realize
the solution?
No new features.

Change-Id: Ie7e5ee6fc525455afdb0602f5ea7ba2b092f507b
---
 MANIFEST.in                   | 6 ------
 devstack/plugin.sh            | 2 +-
 requirements.txt              | 1 +
 setup.cfg                     | 1 -
 tox.ini                       | 5 ++---
 trio2o/api/controllers/pod.py | 2 ++
 6 files changed, 6 insertions(+), 11 deletions(-)
 delete mode 100644 MANIFEST.in

diff --git a/MANIFEST.in b/MANIFEST.in
deleted file mode 100644
index c978a52..0000000
--- a/MANIFEST.in
+++ /dev/null
@@ -1,6 +0,0 @@
-include AUTHORS
-include ChangeLog
-exclude .gitignore
-exclude .gitreview
-
-global-exclude *.pyc
diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 3ca0a0d..6beca2a 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -238,7 +238,7 @@ if [[ "$Q_ENABLE_TRIO2O" == "True" ]]; then
         echo_summary "Installing Trio2o"
     elif [[ "$1" == "stack" && "$2" == "post-config" ]]; then
         echo_summary "Configuring Trio2o"
-
+        export NEUTRON_CREATE_INITIAL_NETWORKS=False
         sudo install -d -o $STACK_USER -m 755 $TRIO2O_CONF_DIR
 
         enable_service t-api t-job t-ngw t-cgw
diff --git a/requirements.txt b/requirements.txt
index 9ff7310..99d2754 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -45,3 +45,4 @@ oslo.service>=1.10.0 # Apache-2.0
 oslo.utils>=3.18.0 # Apache-2.0
 oslo.versionedobjects>=1.13.0 # Apache-2.0
 sqlalchemy-migrate>=0.9.6 # Apache-2.0
+kombu>=3.0.25,!=4.0.0,!=4.0.1  # BSD
diff --git a/setup.cfg b/setup.cfg
index 5630215..580cd25 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -15,7 +15,6 @@ classifier =
     Programming Language :: Python :: 2
     Programming Language :: Python :: 2.7
     Programming Language :: Python :: 3
-    Programming Language :: Python :: 3.3
     Programming Language :: Python :: 3.4
 
 [files]
diff --git a/tox.ini b/tox.ini
index 73bec9e..e62efbb 100644
--- a/tox.ini
+++ b/tox.ini
@@ -38,9 +38,8 @@ commands = python setup.py build_sphinx
 commands = oslo_debug_helper {posargs}
 
 [flake8]
-# E123, E125 skipped as they are invalid PEP-8.
 
 show-source = True
-ignore = E123,E125
+
 builtins = _
-exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
+exclude=.venv,.git,.tox,dist,doc,*lib/python*,*egg,build
diff --git a/trio2o/api/controllers/pod.py b/trio2o/api/controllers/pod.py
index c9e69f4..6814bfa 100644
--- a/trio2o/api/controllers/pod.py
+++ b/trio2o/api/controllers/pod.py
@@ -174,6 +174,7 @@ class PodsController(rest.RestController):
                         az_ag.delete_ag(context, ag['id'])
                 core.delete_resource(context, models.Pod, _id)
                 pecan.response.status = 200
+                return {}
         except t_exc.ResourceNotFound:
             return Response(_('Pod not found'), 404)
         except Exception as e:
@@ -316,6 +317,7 @@ class BindingsController(rest.RestController):
             with context.session.begin():
                 core.delete_resource(context, models.PodBinding, _id)
                 pecan.response.status = 200
+                return {}
         except t_exc.ResourceNotFound:
             pecan.abort(404, _('Pod binding not found'))
             return