updating to use keystone v3 api

Author: logan2211

server/externalscripts/openstack-discovery

@@ -6,22 +6,22 @@ from sys import argv
 from sys import stderr
 import json
 from datetime import datetime
-import re
+from urlparse import urlparse
 
 
 try:
-  from keystoneclient.v2_0 import client as keystone_client
-  from keystoneclient.auth.identity import v2
+  from keystoneclient.v3 import client as keystone_client
+  from keystoneclient.auth.identity import v3
   from keystoneclient import session
   from novaclient import client as nova_client
 except ImportError:
   print 'ZBX_NOTSUPPORTED\x00 Failed to import openstack python modules'
   exit(1)
 
 def get_host_port(url):
-    m = re.match('https?://(\d+\.\d+\.\d+\.\d+):(\d+)',url)
-    if m:
-        return (m.group(1),m.group(2))
+    parsed = urlparse(url)
+    if parsed:
+      return (parsed.hostname, parsed.port)
 
 def print_json(data):
     print json.dumps({'data':data},sort_keys=True,indent=7,separators=(',',':'))
@@ -31,15 +31,17 @@ def discover_endpoints(auth_url, tenant_name, username, password):
 
     services = []
     for e in conn.endpoints.list():
-        host = get_host_port(e.publicurl)
+        if e.interface != 'public':
+            continue
+        host = get_host_port(e.url)
         if e.enabled:
             service = conn.services.get(e.service_id)
-            services.append({'{#OS_SERVICENAME}':service.name, '{#OS_SERVICEURL}':e.publicurl, '{#OS_SERVICEHOST}':host[0], '{#OS_SERVICEPORT}':host[1] })
+            services.append({'{#OS_SERVICENAME}':service.name, '{#OS_SERVICEURL}':e.url, '{#OS_SERVICEHOST}':host[0], '{#OS_SERVICEPORT}':host[1] })
 
     print_json(services)
 
 def discover_hypervisors(auth_url, tenant_name, username, password):
-    auth = v2.Password(username=username, password=password, tenant_name=tenant_name, auth_url=auth_url)
+    auth = v3.Password(username=username, password=password, user_domain_name='Default', project_name=tenant_name, project_domain_name='Default', auth_url=auth_url)
     sess = session.Session(auth=auth)
 
     conn = nova_client.Client(2, session=sess)