From f9a4f6d4d86a208ba84ea81e5738c0501425e6e2 Mon Sep 17 00:00:00 2001
From: Mark Vanderwiel <vanderwl@us.ibm.com>
Date: Fri, 26 Feb 2016 10:30:46 -0600
Subject: [PATCH] Use new openstack heat plugins for validation

Make use of new openstack orchestration template validate
heat plugin command in ver 1.2.0.

Depends-On: Icf5794ad6bb35574a060f095d7ef10e6a46ca2fe
Change-Id: I516da8cee501fab47cf34bdd3bb98cc5d7299c4a
Blueprint: heat-support-python-openstackclient
---
 test-requirements.txt    | 3 ++-
 tools/validate-templates | 9 +++------
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/test-requirements.txt b/test-requirements.txt
index fb052cdd..1630ea44 100644
--- a/test-requirements.txt
+++ b/test-requirements.txt
@@ -12,5 +12,6 @@ testrepository>=0.0.18
 testscenarios>=0.4
 testtools>=0.9.34
 
-python-heatclient>=1.0.0
+python-heatclient>=1.2.0
 python-keystoneclient>=0.10.0
+python-openstackclient>=2.1.0
diff --git a/tools/validate-templates b/tools/validate-templates
index a8580b08..2ebb12ac 100755
--- a/tools/validate-templates
+++ b/tools/validate-templates
@@ -29,12 +29,9 @@ def validate(base, name):
     basename, ext = os.path.splitext(name)
     if basename.endswith("_env"):
         return False
-    args = ["heat",
-            "template-validate",
-            "-f",
-            os.path.join(base, name),
-            "--ignore-errors",
-            '99001']
+    args = ["openstack", "orchestration", "template", "validate",
+            "-t", os.path.join(base, name),
+            "--ignore-errors", "99001"]
     base_env = "%s_env%s" % (basename, ext)
     env = os.path.join(base, base_env)
     if os.path.exists(env):