Merge pull request #18 from PatrykMatyjasek/pm-auth-api-v3-support

Add support for authentication API v3

README.md

@@ -63,6 +63,9 @@ Global configuration files are described in [Snap's documentation](https://githu
 - `"openstack_user"` - user name used to authenticate (ex. `"admin"`)
 - `"openstack_password"`- password used to authenticate (ex. `"admin"`)
 - `"openstack_tenant"` - tenant name used to authenticate (ex. `"admin"`)
+If you're using authentication API in v3 you need to set one of those two configuration options:
+- `"domain_name"` - domain name
+- `"domain_id"` - domain name
 
 Example global configuration file for snap-plugin-collector-neutron plugin (exemplary file in [examples/cfg/] (https://github.com/intelsdi-x/snap-plugin-collector-neutron/blob/master/examples/cfg/):
 

collector/collector.go

@@ -39,7 +39,7 @@ import (
 
 const (
 	// version of neutron plugin
-	version = 2
+	version = 3
 
 	//vendor namespace part
 	vendor = "intel"
@@ -207,13 +207,23 @@ func (c *Collector) GetMetricTypes(cfg plugin.ConfigType) ([]plugin.MetricType,
 	if err != nil {
 		return nil, err
 	}
+	domain_name := ""
+	domain_id := ""
+
 	endpoint := items[cfgURL].(string)
 	user := items[cfgUser].(string)
 	password := items[cfgPassword].(string)
 	tenant := items[cfgTenant].(string)
-
+	dom_name, _ := config.GetConfigItem(cfg, "domain_name")
+	dom_id, _ := config.GetConfigItem(cfg, "domain_id")
+	if dom_name != nil {
+		domain_name = dom_name.(string)
+	}
+	if dom_id != nil {
+		domain_id = dom_id.(string)
+	}
 	if c.provider == nil {
-		provider, serr := openstackintel.Authenticate(endpoint, user, password, tenant)
+		provider, serr := openstackintel.Authenticate(endpoint, user, password, tenant, domain_name, domain_id)
 		if serr != nil {
 			log.WithFields(serr.Fields()).Warn(serr.Error())
 			return nil, serr
@@ -276,13 +286,24 @@ func (c *Collector) CollectMetrics(metricTypes []plugin.MetricType) ([]plugin.Me
 		return nil, err
 	}
 
+	domain_name := ""
+	domain_id := ""
+
 	endpoint := items[cfgURL].(string)
 	user := items[cfgUser].(string)
 	password := items[cfgPassword].(string)
 	tenant := items[cfgTenant].(string)
+	dom_name, _ := config.GetConfigItem(metricTypes[0], "domain_name")
+	dom_id, _ := config.GetConfigItem(metricTypes[0], "domain_id")
+	if dom_name != nil {
+		domain_name = dom_name.(string)
+	}
+	if dom_id != nil {
+		domain_id = dom_id.(string)
+	}
 
 	if c.provider == nil {
-		provider, serr := openstackintel.Authenticate(endpoint, user, password, tenant)
+		provider, serr := openstackintel.Authenticate(endpoint, user, password, tenant, domain_name, domain_id)
 		if serr != nil {
 			log.WithFields(serr.Fields()).Warn(serr.Error())
 			return nil, serr

openstack/common.go

@@ -27,14 +27,20 @@ import (
 
 // Authenticate is used to authenticate user for given tenant. Request is send to provided endpoint
 // Returns authenticated provider client, which is used as a base for service clients.
-func Authenticate(endpoint, user, password, tenant string) (*gophercloud.ProviderClient, serror.SnapError) {
+func Authenticate(endpoint, user, password, tenant, domain_name, domain_id string) (*gophercloud.ProviderClient, serror.SnapError) {
 	authOpts := gophercloud.AuthOptions{
 		IdentityEndpoint: endpoint,
 		Username:         user,
 		Password:         password,
 		TenantName:       tenant,
 		AllowReauth:      true,
 	}
+	if domain_name != "" && domain_id == "" {
+		authOpts.DomainName = domain_name
+	}
+	if domain_id != "" && domain_name == "" {
+		authOpts.DomainID = domain_id
+	}
 
 	provider, err := openstack.AuthenticatedClient(authOpts)
 	if err != nil {

openstack/neutron_test.go

@@ -67,7 +67,7 @@ func (s *TestSuite) TestGetAllTenants() {
 	Convey("Given list of OpenStack tenants is requested", s.T(), func() {
 
 		Convey("When authentication is required", func() {
-			provider, err := Authenticate(th.Endpoint(), "me", "secret", "admin")
+			provider, err := Authenticate(th.Endpoint(), "me", "secret", "admin", "", "")
 			th.AssertNoErr(s.T(), err)
 			th.CheckEquals(s.T(), s.Token, provider.TokenID)
 
@@ -93,7 +93,7 @@ func (s *TestSuite) TestGetNetworkCountPerTenant() {
 	Convey("Number of OpenStack networks per tenant is requested", s.T(), func() {
 
 		Convey("When authentication is required", func() {
-			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin")
+			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin", "", "")
 			th.AssertNoErr(s.T(), serr)
 			th.CheckEquals(s.T(), s.Token, provider.TokenID)
 			identityClient := openstackgophercloud.NewIdentityV2(provider)
@@ -126,7 +126,7 @@ func (s *TestSuite) TestGetSubnetsCountPerTenant() {
 	Convey("Number of OpenStack subnets per tenant is requested", s.T(), func() {
 
 		Convey("When authentication is required", func() {
-			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin")
+			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin", "", "")
 			th.AssertNoErr(s.T(), serr)
 			th.CheckEquals(s.T(), s.Token, provider.TokenID)
 			identityClient := openstackgophercloud.NewIdentityV2(provider)
@@ -158,7 +158,7 @@ func (s *TestSuite) TestGetRoutersCountPerTenant() {
 	Convey("Number of OpenStack routers per tenant is requested", s.T(), func() {
 
 		Convey("When authentication is required", func() {
-			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin")
+			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin", "", "")
 			th.AssertNoErr(s.T(), serr)
 			th.CheckEquals(s.T(), s.Token, provider.TokenID)
 			identityClient := openstackgophercloud.NewIdentityV2(provider)
@@ -190,7 +190,7 @@ func (s *TestSuite) TestGetPortsCountPerTenant() {
 	Convey("Number of OpenStack ports per tenant is requested", s.T(), func() {
 
 		Convey("When authentication is required", func() {
-			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin")
+			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin", "", "")
 			th.AssertNoErr(s.T(), serr)
 			th.CheckEquals(s.T(), s.Token, provider.TokenID)
 			identityClient := openstackgophercloud.NewIdentityV2(provider)
@@ -222,7 +222,7 @@ func (s *TestSuite) TestGetFloatingIPsCountPerTenant() {
 	Convey("Number of OpenStack floating IPs per tenant is requested", s.T(), func() {
 
 		Convey("When authentication is required", func() {
-			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin")
+			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin", "", "")
 			th.AssertNoErr(s.T(), serr)
 			th.CheckEquals(s.T(), s.Token, provider.TokenID)
 			identityClient := openstackgophercloud.NewIdentityV2(provider)
@@ -253,7 +253,7 @@ func (s *TestSuite) TestGetQuotasPerTenant() {
 	Convey("Given list of OpenStack quotas per tenant is requested", s.T(), func() {
 
 		Convey("When authentication is required", func() {
-			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin")
+			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin", "", "")
 			th.AssertNoErr(s.T(), serr)
 			th.CheckEquals(s.T(), s.Token, provider.TokenID)
 			identityClient := openstackgophercloud.NewIdentityV2(provider)
@@ -298,7 +298,7 @@ func (s *TestSuite) TestGetQuotasForTenant() {
 	Convey("Given list of OpenStack quotas for particular is requested", s.T(), func() {
 
 		Convey("When authentication is required", func() {
-			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin")
+			provider, serr := Authenticate(th.Endpoint(), "me", "secret", "admin", "", "")
 			th.AssertNoErr(s.T(), serr)
 			th.CheckEquals(s.T(), s.Token, provider.TokenID)