Merge pull request #21 from HapLifeMan/master

Add region in KeystoneV3Authenticator credentials

KeystoneV3Authenticator.js

@@ -11,7 +11,7 @@ class KeystoneV3Authenticator extends EventEmitter {
     this.currentToken = null;
   }
 
-  tryFindEndpointUrl(catalog, service, iface) {
+  tryFindEndpointUrl(catalog, service, iface, regionId) {
     if (typeof iface === 'undefined') {
       iface = "public";
     }
@@ -21,7 +21,7 @@ class KeystoneV3Authenticator extends EventEmitter {
       return null;
     }
 
-    const endpoint = catalogEntry.endpoints.find(x => x.interface === iface);
+    const endpoint = catalogEntry.endpoints.find(x => x.interface === iface && (regionId ? x.region_id == regionId : true));
     if (!endpoint) {
       return null;
     }
@@ -71,8 +71,8 @@ class KeystoneV3Authenticator extends EventEmitter {
 
     const catalog = response.body.token.catalog;
     const swiftUrl =
-      this.tryFindEndpointUrl(catalog, 'swift', credentials.endpointUrlInterface)
-      || this.tryFindEndpointUrl(catalog, 'radosgw-swift', credentials.endpointUrlInterface); // many OpenStack clouds use ceph radosgw to provide swift
+      this.tryFindEndpointUrl(catalog, 'swift', credentials.endpointUrlInterface, credentials.regionId)
+      || this.tryFindEndpointUrl(catalog, 'radosgw-swift', credentials.endpointUrlInterface, credentials.regionId); // many OpenStack clouds use ceph radosgw to provide swift
 
     if (!swiftUrl) {
       throw new Error('could not find swift or radosgw-swift service in catalog');
@@ -84,7 +84,7 @@ class KeystoneV3Authenticator extends EventEmitter {
       swiftUrl: swiftUrl
     }
   };
-  
+
   async authenticate() {
     if (!this.currentToken) {
       this.currentToken = await this.getToken();
@@ -101,4 +101,4 @@ class KeystoneV3Authenticator extends EventEmitter {
   }
 }
 
-module.exports = KeystoneV3Authenticator;
+module.exports = KeystoneV3Authenticator;

README.md

@@ -82,7 +82,8 @@ let credentials = {
   "password": "pasword",
   "domainId": "e6efe92d05c2430ea7eb6f626815d0d8",
   "projectId": "ff912d95d2eb46099e755cd268714d37",
-  "endpointUrlInterface": "public" // admin, internal or public. Value default: public
+  "endpointUrlInterface": "public", // admin, internal or public. Value default: public
+  "regionId": "GRA", // Optional
 }
 
 let client = new SwiftClient(new SwiftClient.KeystoneV3Authenticator(credentials));

package.json

@@ -1,6 +1,6 @@
 {
   "name": "openstack-swift-client",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "description": "Connects to OpenStack Swift storage servers",
   "main": "index.js",
   "types": "index.d.ts",