Merge "Separate service catalog to prepare for v3"

examples/00-authentication.go

@@ -76,4 +76,11 @@ func main() {
 		fmt.Println("There was an error. The auth token has an invalid expiration.")
 		return
 	}
+
+	// Get the first endpoint
+	ep, err := auth.GetEndpoint("compute", "")
+	if err != nil {
+		fmt.Println("No compute endpoint found:", err)
+		return
+	}
 }

openstack/auth-token.go

@@ -41,22 +41,6 @@ type Token struct {
 	} `json:"tenant"`
 }
 
-type ServiceCatalogEntry struct {
-	Name      string            `json:"name"`
-	Type      string            `json:"type"`
-	Endpoints []ServiceEndpoint `json:"endpoints"`
-	// Endpoints []map[string]string `json:"endpoints"`
-}
-
-type ServiceEndpoint struct {
-	Type        string `json:"type"`
-	Region      string `json:"region"`
-	PublicURL   string `json:"publicurl"`
-	AdminURL    string `json:"adminurl"`
-	InternalURL string `json:"internalurl"`
-	VersionID   string `json:"versionid"`
-}
-
 func (s AuthToken) GetToken() string {
 	return s.Access.Token.ID
 }
@@ -69,13 +53,14 @@ func (s AuthToken) GetEndpoint(serviceType string, regionName string) (string, e
 
 	// Parse service catalog
 	for _, v := range s.Access.ServiceCatalog {
-		if v.Type == serviceType {
-			for _, r := range v.Endpoints {
-				if regionName == "" || r.Region == regionName {
-					return r.PublicURL, nil
-				}
-			}
+		ep, err := v.GetEndpoint(serviceType, "public", regionName)
+		if err == nil {
+			return ep, nil
 		}
 	}
 	return "", errors.New("err: endpoint not found")
 }
+
+func (s AuthToken) GetProject() string {
+	return s.Access.Token.Project.Name
+}

openstack/auth.go

@@ -30,6 +30,7 @@ type AuthRef interface {
 	GetToken() string
 	GetExpiration() time.Time
 	GetEndpoint(string, string) (string, error)
+	GetProject() string
 }
 
 // AuthOpts is the set of credentials used to authenticate to OpenStack

openstack/service-catalog.go

@@ -0,0 +1,77 @@
+// service-catalog - Service Catalog structs
+// Copyright 2015 Dean Troyer
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package openstack
+
+import (
+	"errors"
+	"fmt"
+	"strings"
+)
+
+type ServiceCatalogEntry struct {
+	Name      string            `json:"name"`
+	Type      string            `json:"type"`
+	Endpoints []ServiceEndpoint `json:"endpoints"`
+	// Endpoints []map[string]string `json:"endpoints"`
+}
+
+type ServiceEndpoint struct {
+	Type        string `json:"type"`
+	Region      string `json:"region"`
+	PublicURL   string `json:"publicurl"`
+	AdminURL    string `json:"adminurl"`
+	InternalURL string `json:"internalurl"`
+	VersionID   string `json:"versionid"`
+}
+
+// Valid interfaceType values: 'public', 'publicURL', 'admin', 'admin URL', 'internal', 'internalURL'
+func (sce ServiceCatalogEntry) GetEndpoint(
+	serviceType string,
+	interfaceType string,
+	regionName string,
+) (string, error) {
+	if interfaceType == "" {
+		// Set the default value
+		interfaceType = "public"
+	}
+	if sce.Type == serviceType {
+		for _, r := range sce.Endpoints {
+			if regionName == "" || r.Region == regionName {
+				// Translate passed interface types
+				sc_int := strings.ToLower(interfaceType)
+				if sc_int == "public" || sc_int == "publicurl" {
+					return r.PublicURL, nil
+				}
+				if sc_int == "admin" || sc_int == "adminurl" {
+					return r.AdminURL, nil
+				}
+				if sc_int == "internal" || sc_int == "internalURL" {
+					return r.InternalURL, nil
+				}
+			}
+		}
+	}
+
+	var msg string
+	if regionName != "" {
+		msg = fmt.Sprintf("%s endpoint for %s service in %s region not found",
+			interfaceType, serviceType, regionName)
+	} else {
+		msg = fmt.Sprintf("%s endpoint for %s service not found",
+			interfaceType, serviceType)
+	}
+	return "", errors.New(msg)
+}