openstack/heat
Code Issues Proposed changes

Merge "Fix stack deleting problem in magnum stacks"

Browse Source
This commit is contained in:
Jenkins 2016-04-15 15:30:52 +00:00 committed by Gerrit Code Review
commit a2d829f312
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
heat/engine/clients/os/magnum.py
View File

@ -11,13 +11,18 @@
# License for the specific language governing permissions and limitations # License for the specific language governing permissions and limitations
# under the License. # under the License.
from magnumclient.openstack.common.apiclient import exceptions as mc_exc
from magnumclient.v1 import client as magnum_client from magnumclient.v1 import client as magnum_client
from heat.common import exception from heat.common import exception
from heat.engine.clients import client_plugin from heat.engine.clients import client_plugin
from heat.engine import constraints from heat.engine import constraints
try:
from magnumclient.common.apiclient import exceptions as mc_exc
except ImportError:
# NOTE (duvarenkov): For magnumclient versions before 2.0.0.
from magnumclient.openstack.common.apiclient import exceptions as mc_exc
CLIENT_NAME = 'magnum' CLIENT_NAME = 'magnum'

8
heat/tests/openstack/magnum/test_bay.py
View File

@ -16,8 +16,6 @@ import mock
from oslo_config import cfg from oslo_config import cfg
import six import six
from magnumclient.openstack.common.apiclient import exceptions as mc_exc
from heat.common import exception from heat.common import exception
from heat.common import template_format from heat.common import template_format
from heat.engine.clients.os import magnum as mc from heat.engine.clients.os import magnum as mc
@ -28,6 +26,12 @@ from heat.engine import template
from heat.tests import common from heat.tests import common
from heat.tests import utils from heat.tests import utils
try:
from magnumclient.common.apiclient import exceptions as mc_exc
except ImportError:
# NOTE (duvarenkov): For magnumclient versions before 2.0.0.
from magnumclient.openstack.common.apiclient import exceptions as mc_exc
magnum_template = ''' magnum_template = '''
heat_template_version: 2015-04-30 heat_template_version: 2015-04-30