From f7860861a12931d3fe139d80041ef9997a590316 Mon Sep 17 00:00:00 2001
From: Eric Fried <openstack@fried.cc>
Date: Thu, 6 Jun 2019 12:46:25 -0500
Subject: [PATCH] Pin to latest os-service-types

OpenstackSDK should always be using the latest os-service-types.

This commit bumps the lower bounds to the current latest version
(1.7.0), and adds a canary test so that the CI will fail as soon as a
new os-service-types version hits upper-constraints.

Change-Id: Ie98ec9cfd58badc2b05a2a144d1d559d7ed6553b
---
 lower-constraints.txt              |  2 +-
 openstack/tests/unit/test_utils.py | 11 +++++++++++
 requirements.txt                   |  2 +-
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/lower-constraints.txt b/lower-constraints.txt
index a8d5d7dfe..60a322a5c 100644
--- a/lower-constraints.txt
+++ b/lower-constraints.txt
@@ -21,7 +21,7 @@ mox3==0.20.0
 munch==2.1.0
 netifaces==0.10.4
 os-client-config==1.28.0
-os-service-types==1.6.0
+os-service-types==1.7.0
 oslo.config==6.1.0
 oslotest==3.2.0
 pbr==2.0.0
diff --git a/openstack/tests/unit/test_utils.py b/openstack/tests/unit/test_utils.py
index 022923982..c16cfe2dc 100644
--- a/openstack/tests/unit/test_utils.py
+++ b/openstack/tests/unit/test_utils.py
@@ -18,6 +18,7 @@ import sys
 from openstack.tests.unit import base
 
 import fixtures
+import os_service_types
 
 import openstack
 from openstack import utils
@@ -157,3 +158,13 @@ class TestMaximumSupportedMicroversion(base.TestCase):
         self.endpoint_data.min_microversion = '1.42'
         self.assertIsNone(utils.maximum_supported_microversion(self.adapter,
                                                                '1.2'))
+
+
+class TestOsServiceTypesVersion(base.TestCase):
+    def test_ost_version(self):
+        ost_version = '2019-05-01T19:53:21.498745'
+        self.assertEqual(
+            ost_version, os_service_types.ServiceTypes().version,
+            "This project must be pinned to the latest version of "
+            "os-service-types. Please bump requirements.txt and "
+            "lower-constraints.txt accordingly.")
diff --git a/requirements.txt b/requirements.txt
index 4e188856e..42da24b3c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ appdirs>=1.3.0 # MIT License
 requestsexceptions>=1.2.0 # Apache-2.0
 jsonpatch!=1.20,>=1.16 # BSD
 six>=1.10.0 # MIT
-os-service-types>=1.6.0 # Apache-2.0
+os-service-types>=1.7.0 # Apache-2.0
 keystoneauth1>=3.14.0 # Apache-2.0
 
 munch>=2.1.0 # MIT