From 52ef41e5e0c57256680c2532dc24734c4b27c4bf Mon Sep 17 00:00:00 2001
From: Viktor Ryzhenkin <vryzhenkin@mirantis.com>
Date: Thu, 5 Feb 2015 13:49:01 +0300
Subject: [PATCH] Fix for DSVM gate

Fixed dsvm gate job after a change in tempest_lib
Fixed requirements.txt

Change-Id: I532174e22af2c0f01d12f14d64683dade15351f5
(cherry picked from commit 08ceb10dfafae148262fcff72b2d90b4514ce114)
---
 murano/tests/functional/api/v1/test_repository.py | 12 ++++++------
 murano/tests/functional/api/v1/test_services.py   |  4 ++--
 requirements.txt                                  |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/murano/tests/functional/api/v1/test_repository.py b/murano/tests/functional/api/v1/test_repository.py
index 70bf9c14e..25b1f2bb7 100644
--- a/murano/tests/functional/api/v1/test_repository.py
+++ b/murano/tests/functional/api/v1/test_repository.py
@@ -201,38 +201,38 @@ class TestRepositoryNegativeForbidden(base.NegativeTestCase,
             }
         ]
 
-        self.assertRaises(exceptions.Unauthorized,
+        self.assertRaises(exceptions.Forbidden,
                           self.alt_client.update_package,
                           self.package['id'],
                           post_body)
 
     @attr(type='negative')
     def test_get_package_from_another_tenant(self):
-        self.assertRaises(exceptions.Unauthorized,
+        self.assertRaises(exceptions.Forbidden,
                           self.alt_client.get_package,
                           self.package['id'])
 
     @attr(type='negative')
     def test_delete_package_from_another_tenant(self):
-        self.assertRaises(exceptions.Unauthorized,
+        self.assertRaises(exceptions.Forbidden,
                           self.alt_client.delete_package,
                           self.package['id'])
 
     @attr(type='negative')
     def test_download_package_from_another_tenant(self):
-        self.assertRaises(exceptions.Unauthorized,
+        self.assertRaises(exceptions.Forbidden,
                           self.alt_client.download_package,
                           self.package['id'])
 
     @attr(type='negative')
     def test_get_ui_definition_from_another_tenant(self):
-        self.assertRaises(exceptions.Unauthorized,
+        self.assertRaises(exceptions.Forbidden,
                           self.alt_client.get_ui_definition,
                           self.package['id'])
 
     @attr(type='negative')
     def test_get_logo_from_another_tenant(self):
-        self.assertRaises(exceptions.Unauthorized,
+        self.assertRaises(exceptions.Forbidden,
                           self.alt_client.get_logo,
                           self.package['id'])
 
diff --git a/murano/tests/functional/api/v1/test_services.py b/murano/tests/functional/api/v1/test_services.py
index e25211472..f7d99d9e9 100644
--- a/murano/tests/functional/api/v1/test_services.py
+++ b/murano/tests/functional/api/v1/test_services.py
@@ -114,7 +114,7 @@ class TestServices(base.TestCase):
 
         self.client.create_session(env['id'])
 
-        self.assertRaises(exceptions.Unauthorized,
+        self.assertRaises(exceptions.Forbidden,
                           self.create_demo_service,
                           env['id'],
                           "")
@@ -141,7 +141,7 @@ class TestServices(base.TestCase):
 
         service = self.create_demo_service(env['id'], sess['id'])[1]
 
-        self.assertRaises(exceptions.Unauthorized,
+        self.assertRaises(exceptions.Forbidden,
                           self.client.delete_service,
                           env['id'],
                           "",
diff --git a/requirements.txt b/requirements.txt
index 278d25d9a..ed8b6c39c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -34,7 +34,7 @@ python-heatclient>=0.2.9
 python-neutronclient>=2.3.6,<3
 oslo.db>=1.0.0  # Apache-2.0
 oslo.config>=1.4.0  # Apache-2.0
-oslo.messaging>=1.4.0,!=1.5.0
+oslo.messaging>=1.4.0,!=1.5.0,<1.6.0
 oslo.utils>=1.0.0                       # Apache-2.0
 
 # not listed in global requirements