rgw: rename openstack to swift

16 files changed, 187 insertions, 187 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 3e9fa587142..49ddaa80fb7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -321,8 +321,8 @@ my_radosgw_src = \
 	rgw/rgw_rest_s3.cc \
 	rgw/rgw_common.cc \
 	rgw/rgw_cache.cc \
-	rgw/rgw_os.cc \
-	rgw/rgw_os_auth.cc \
+	rgw/rgw_swift.cc \
+	rgw/rgw_swift_auth.cc \
 	rgw/rgw_formats.cc \
 	rgw/rgw_log.cc \
 	rgw/rgw_multi.cc \
@@ -1333,8 +1333,8 @@ noinst_HEADERS = \
 	rgw/rgw_log.h\
 	rgw/rgw_multi.h\
 	rgw/rgw_op.h\
-	rgw/rgw_os.h\
-	rgw/rgw_os_auth.h\
+	rgw/rgw_swift.h\
+	rgw/rgw_swift_auth.h\
 	rgw/rgw_rados.h\
 	rgw/rgw_rest.h\
 	rgw/rgw_rest_os.h\
diff --git a/src/rgw/rgw_admin.cc b/src/rgw/rgw_admin.cc
index 170f2dbe38e..db7339b6449 100644
--- a/src/rgw/rgw_admin.cc
+++ b/src/rgw/rgw_admin.cc
@@ -292,8 +292,8 @@ static void show_user_info(RGWUserInfo& info, const char *format, Formatter *for
     }
     cout << "Display Name: " << info.display_name << std::endl;
     cout << "Email: " << info.user_email << std::endl;
-    cout << "Swift User: " << (info.openstack_name.size() ? info.openstack_name : "<undefined>")<< std::endl;
-    cout << "Swift Key: " << (info.openstack_key.size() ? info.openstack_key : "<undefined>")<< std::endl;
+    cout << "Swift User: " << (info.swift_name.size() ? info.swift_name : "<undefined>")<< std::endl;
+    cout << "Swift Key: " << (info.swift_key.size() ? info.swift_key : "<undefined>")<< std::endl;
   } else {
     formatter->open_object_section("user_info");
 
@@ -301,8 +301,8 @@ static void show_user_info(RGWUserInfo& info, const char *format, Formatter *for
     formatter->dump_format("rados_uid", "%lld", info.auid);
     formatter->dump_string("display_name", info.display_name.c_str());
     formatter->dump_string("email", info.user_email.c_str());
-    formatter->dump_string("swift_user", info.openstack_name.c_str());
-    formatter->dump_string("swift_key", info.openstack_key.c_str());
+    formatter->dump_string("swift_user", info.swift_name.c_str());
+    formatter->dump_string("swift_key", info.swift_key.c_str());
 
     // keys
     formatter->open_array_section("keys");
@@ -402,11 +402,11 @@ static void remove_old_indexes(RGWUserInfo& old_info, RGWUserInfo new_info)
     }
   }
 
-  if (!old_info.openstack_name.empty() &&
-      old_info.openstack_name.compare(new_info.openstack_name) != 0) {
-    ret = rgw_remove_openstack_name_index(new_info.user_id, old_info.openstack_name);
+  if (!old_info.swift_name.empty() &&
+      old_info.swift_name.compare(new_info.swift_name) != 0) {
+    ret = rgw_remove_swift_name_index(new_info.user_id, old_info.swift_name);
     if (ret < 0 && ret != -ENOENT) {
-      cerr << "ERROR: could not remove index for openstack_name " << old_info.openstack_name << " return code: " << ret << std::endl;
+      cerr << "ERROR: could not remove index for swift_name " << old_info.swift_name << " return code: " << ret << std::endl;
       success = false;
     }
   }
@@ -541,8 +541,8 @@ int main(int argc, char **argv)
   const char *bucket_name = 0;
   rgw_bucket bucket;
   const char *object = 0;
-  const char *openstack_user = 0;
-  const char *openstack_key = 0;
+  const char *swift_user = 0;
+  const char *swift_key = 0;
   const char *date = 0;
   const char *time = 0;
   const char *subuser = 0;
@@ -593,9 +593,9 @@ int main(int argc, char **argv)
     } else if (CEPH_ARGPARSE_EQ("auth-uid", 'a')) {
       CEPH_ARGPARSE_SET_ARG_VAL(&auid, OPT_LONGLONG);
     } else if (CEPH_ARGPARSE_EQ("os-user", '\0')) {
-      CEPH_ARGPARSE_SET_ARG_VAL(&openstack_user, OPT_STR);
+      CEPH_ARGPARSE_SET_ARG_VAL(&swift_user, OPT_STR);
     } else if (CEPH_ARGPARSE_EQ("os-secret", '\0')) {
-      CEPH_ARGPARSE_SET_ARG_VAL(&openstack_key, OPT_STR);
+      CEPH_ARGPARSE_SET_ARG_VAL(&swift_key, OPT_STR);
     } else if (CEPH_ARGPARSE_EQ("date", '\0')) {
       CEPH_ARGPARSE_SET_ARG_VAL(&date, OPT_STR);
     } else if (CEPH_ARGPARSE_EQ("time", '\0')) {
@@ -700,12 +700,12 @@ int main(int argc, char **argv)
 	cerr << "could not find user by specified access key" << std::endl;
       }
     }
-    if (!found && openstack_user) {
-      s = openstack_user;
-      if (rgw_get_user_info_by_openstack(s, info) >= 0) {
+    if (!found && swift_user) {
+      s = swift_user;
+      if (rgw_get_user_info_by_swift(s, info) >= 0) {
 	found = true;
       } else
-        cerr << "could not find user by specified openstack username" << std::endl;
+        cerr << "could not find user by specified swift username" << std::endl;
     }
     if (found)
       user_id = info.user_id.c_str();
@@ -847,10 +847,10 @@ int main(int argc, char **argv)
       info.user_email = user_email;
     if (auid != (uint64_t)-1)
       info.auid = auid;
-    if (openstack_user)
-      info.openstack_name = openstack_user;
-    if (openstack_key)
-      info.openstack_key = openstack_key;
+    if (swift_user)
+      info.swift_name = swift_user;
+    if (swift_key)
+      info.swift_key = swift_key;
     if (subuser) {
       RGWSubUser u;
       u.name = subuser;
diff --git a/src/rgw/rgw_common.h b/src/rgw/rgw_common.h
index 2834337d84b..23f6460c9f4 100644
--- a/src/rgw/rgw_common.h
+++ b/src/rgw/rgw_common.h
@@ -272,8 +272,8 @@ struct RGWUserInfo
   string user_id;
   string display_name;
   string user_email;
-  string openstack_name;
-  string openstack_key;
+  string swift_name;
+  string swift_key;
   map<string, RGWAccessKey> access_keys;
   map<string, RGWSubUser> subusers;
   __u8 suspended;
@@ -296,8 +296,8 @@ struct RGWUserInfo
      ::encode(secret_key, bl);
      ::encode(display_name, bl);
      ::encode(user_email, bl);
-     ::encode(openstack_name, bl);
-     ::encode(openstack_key, bl);
+     ::encode(swift_name, bl);
+     ::encode(swift_key, bl);
      ::encode(user_id, bl);
      ::encode(access_keys, bl);
      ::encode(subusers, bl);
@@ -320,8 +320,8 @@ struct RGWUserInfo
     }
     ::decode(display_name, bl);
     ::decode(user_email, bl);
-    if (ver >= 3) ::decode(openstack_name, bl);
-    if (ver >= 4) ::decode(openstack_key, bl);
+    if (ver >= 3) ::decode(swift_name, bl);
+    if (ver >= 4) ::decode(swift_key, bl);
     if (ver >= 5)
       ::decode(user_id, bl);
     else
diff --git a/src/rgw/rgw_formats.h b/src/rgw/rgw_formats.h
index 5d7ee0139f4..c43b24b050d 100644
--- a/src/rgw/rgw_formats.h
+++ b/src/rgw/rgw_formats.h
@@ -13,7 +13,7 @@ struct plain_stack_entry {
 };
 
 /* FIXME: this class is mis-named.
- * FIXME: This was a hack to send certain openstack messages.
+ * FIXME: This was a hack to send certain swift messages.
  * There is a much better way to do this.
  */
 class RGWFormatter_Plain : public Formatter {
diff --git a/src/rgw/rgw_main.cc b/src/rgw/rgw_main.cc
index a67d8dd9151..0a2e108fabc 100644
--- a/src/rgw/rgw_main.cc
+++ b/src/rgw/rgw_main.cc
@@ -24,7 +24,7 @@
 #include "rgw_user.h"
 #include "rgw_op.h"
 #include "rgw_rest.h"
-#include "rgw_os.h"
+#include "rgw_swift.h"
 #include "rgw_log.h"
 #include "rgw_bucket.h"
 
diff --git a/src/rgw/rgw_os_auth.h b/src/rgw/rgw_os_auth.h
deleted file mode 100644
index 4a31b3dca5c..00000000000
--- a/src/rgw/rgw_os_auth.h
+++ /dev/null
@@ -1,30 +0,0 @@
-#ifndef CEPH_RGW_OS_AUTH_H
-#define CEPH_RGW_OS_AUTH_H
-
-#include "rgw_op.h"
-
-#define RGW_OS_TOKEN_EXPIRATION (15 * 60)
-
-extern int rgw_os_verify_signed_token(const char *token, RGWUserInfo& info);
-
-class RGW_OS_Auth_Get : public RGWOp {
-public:
-  RGW_OS_Auth_Get() {}
-  ~RGW_OS_Auth_Get() {}
-
-  int verify_permission() { return 0; }
-  void execute();
-};
-
-class RGWHandler_OS_Auth : public RGWHandler {
-public:
-  RGWHandler_OS_Auth() {}
-  ~RGWHandler_OS_Auth() {}
-  RGWOp *get_op();
-  void put_op(RGWOp *op);
-
-  int authorize();
-  int read_permissions() { return 0; }
-};
-
-#endif
diff --git a/src/rgw/rgw_rest.cc b/src/rgw/rgw_rest.cc
index b694f15356d..ded3346a8d4 100644
--- a/src/rgw/rgw_rest.cc
+++ b/src/rgw/rgw_rest.cc
@@ -9,7 +9,7 @@
 #include "rgw_rest.h"
 #include "rgw_rest_os.h"
 #include "rgw_rest_s3.h"
-#include "rgw_os_auth.h"
+#include "rgw_swift_auth.h"
 
 #include "rgw_formats.h"
 
@@ -429,12 +429,12 @@ void init_entities_from_header(struct req_state *s)
 
   pos = req.find('/');
   if (pos >= 0) {
-    const char *openstack_url_prefix = s->env->get("RGW_SWIFT_URL_PREFIX");
-    bool cut_url = (openstack_url_prefix != NULL);
-    if (!openstack_url_prefix)
-      openstack_url_prefix = "v1";
+    const char *swift_url_prefix = s->env->get("RGW_SWIFT_URL_PREFIX");
+    bool cut_url = (swift_url_prefix != NULL);
+    if (!swift_url_prefix)
+      swift_url_prefix = "v1";
     first = req.substr(0, pos);
-    if (first.compare(openstack_url_prefix) == 0) {
+    if (first.compare(swift_url_prefix) == 0) {
       s->prot_flags |= RGW_REST_SWIFT;
       if (cut_url) {
         next_tok(req, first, '/');
@@ -809,8 +809,8 @@ RGWOp *RGWHandler_REST::get_op()
 
 RGWRESTMgr::RGWRESTMgr()
 {
-  m_os_handler = new RGWHandler_REST_OS;
-  m_os_auth_handler = new RGWHandler_OS_Auth;
+  m_os_handler = new RGWHandler_REST_SWIFT;
+  m_os_auth_handler = new RGWHandler_SWIFT_Auth;
   m_s3_handler = new RGWHandler_REST_S3;
 }
 
diff --git a/src/rgw/rgw_rest.h b/src/rgw/rgw_rest.h
index 5bac7e74470..d94d29952d8 100644
--- a/src/rgw/rgw_rest.h
+++ b/src/rgw/rgw_rest.h
@@ -147,13 +147,13 @@ public:
   virtual int authorize() = 0;
 };
 
-class RGWHandler_REST_OS;
-class RGWHandler_OS_Auth;
+class RGWHandler_REST_SWIFT;
+class RGWHandler_SWIFT_Auth;
 class RGWHandler_REST_S3;
 
 class RGWRESTMgr {
-  RGWHandler_REST_OS *m_os_handler;
-  RGWHandler_OS_Auth *m_os_auth_handler;
+  RGWHandler_REST_SWIFT *m_os_handler;
+  RGWHandler_SWIFT_Auth *m_os_auth_handler;
   RGWHandler_REST_S3 *m_s3_handler;
 
 public:
diff --git a/src/rgw/rgw_rest_os.cc b/src/rgw/rgw_rest_os.cc
index 3c346bb3ff9..a4d23c27966 100644
--- a/src/rgw/rgw_rest_os.cc
+++ b/src/rgw/rgw_rest_os.cc
@@ -1,11 +1,11 @@
 
 #include "common/Formatter.h"
-#include "rgw_os.h"
+#include "rgw_swift.h"
 #include "rgw_rest_os.h"
 
 #include <sstream>
 
-void RGWListBuckets_REST_OS::send_response()
+void RGWListBuckets_REST_SWIFT::send_response()
 {
   set_req_state_err(s, ret);
   dump_errno(s);
@@ -57,7 +57,7 @@ void RGWListBuckets_REST_OS::send_response()
   s->formatter->reset();
 }
 
-void RGWListBucket_REST_OS::send_response()
+void RGWListBucket_REST_SWIFT::send_response()
 {
   set_req_state_err(s, (ret < 0 ? ret : 0));
   dump_errno(s);
@@ -125,7 +125,7 @@ static void dump_container_metadata(struct req_state *s, RGWBucketEnt& bucket)
   CGI_PRINTF(s,"X-Container-Bytes-Used: %s\n", buf);
 }
 
-void RGWStatBucket_REST_OS::send_response()
+void RGWStatBucket_REST_SWIFT::send_response()
 {
   if (ret >= 0)
     dump_container_metadata(s, bucket);
@@ -139,7 +139,7 @@ void RGWStatBucket_REST_OS::send_response()
   flush_formatter_to_req_state(s, s->formatter);
 }
 
-void RGWCreateBucket_REST_OS::send_response()
+void RGWCreateBucket_REST_SWIFT::send_response()
 {
   if (ret)
     set_req_state_err(s, ret);
@@ -148,7 +148,7 @@ void RGWCreateBucket_REST_OS::send_response()
   flush_formatter_to_req_state(s, s->formatter);
 }
 
-void RGWDeleteBucket_REST_OS::send_response()
+void RGWDeleteBucket_REST_SWIFT::send_response()
 {
   int r = ret;
   if (!r)
@@ -160,7 +160,7 @@ void RGWDeleteBucket_REST_OS::send_response()
   flush_formatter_to_req_state(s, s->formatter);
 }
 
-void RGWPutObj_REST_OS::send_response()
+void RGWPutObj_REST_SWIFT::send_response()
 {
   if (!ret)
     ret = 201; // "created"
@@ -171,7 +171,7 @@ void RGWPutObj_REST_OS::send_response()
   flush_formatter_to_req_state(s, s->formatter);
 }
 
-void RGWDeleteObj_REST_OS::send_response()
+void RGWDeleteObj_REST_SWIFT::send_response()
 {
   int r = ret;
   if (!r)
@@ -183,7 +183,7 @@ void RGWDeleteObj_REST_OS::send_response()
   flush_formatter_to_req_state(s, s->formatter);
 }
 
-int RGWGetObj_REST_OS::send_response(void *handle)
+int RGWGetObj_REST_SWIFT::send_response(void *handle)
 {
   const char *content_type = NULL;
   int orig_ret = ret;
@@ -239,14 +239,14 @@ send_data:
   return 0;
 }
 
-RGWOp *RGWHandler_REST_OS::get_retrieve_obj_op(bool get_data)
+RGWOp *RGWHandler_REST_SWIFT::get_retrieve_obj_op(bool get_data)
 {
   if (is_acl_op()) {
-    return new RGWGetACLs_REST_OS;
+    return new RGWGetACLs_REST_SWIFT;
   }
 
   if (s->object) {
-    RGWGetObj_REST_OS *get_obj_op = new RGWGetObj_REST_OS;
+    RGWGetObj_REST_SWIFT *get_obj_op = new RGWGetObj_REST_SWIFT;
     get_obj_op->set_get_data(get_data);
     return get_obj_op;
   } else if (!s->bucket_name) {
@@ -254,50 +254,50 @@ RGWOp *RGWHandler_REST_OS::get_retrieve_obj_op(bool get_data)
   }
 
   if (get_data)
-    return new RGWListBucket_REST_OS;
+    return new RGWListBucket_REST_SWIFT;
   else
-    return new RGWStatBucket_REST_OS;
+    return new RGWStatBucket_REST_SWIFT;
 }
 
-RGWOp *RGWHandler_REST_OS::get_retrieve_op(bool get_data)
+RGWOp *RGWHandler_REST_SWIFT::get_retrieve_op(bool get_data)
 {
   if (s->bucket_name) {
     if (is_acl_op()) {
-      return new RGWGetACLs_REST_OS;
+      return new RGWGetACLs_REST_SWIFT;
     }
     return get_retrieve_obj_op(get_data);
   }
 
-  return new RGWListBuckets_REST_OS;
+  return new RGWListBuckets_REST_SWIFT;
 }
 
-RGWOp *RGWHandler_REST_OS::get_create_op()
+RGWOp *RGWHandler_REST_SWIFT::get_create_op()
 {
   if (is_acl_op()) {
-    return new RGWPutACLs_REST_OS;
+    return new RGWPutACLs_REST_SWIFT;
   } else if (s->object) {
     if (!s->copy_source)
-      return new RGWPutObj_REST_OS;
+      return new RGWPutObj_REST_SWIFT;
     else
-      return new RGWCopyObj_REST_OS;
+      return new RGWCopyObj_REST_SWIFT;
   } else if (s->bucket_name) {
-    return new RGWCreateBucket_REST_OS;
+    return new RGWCreateBucket_REST_SWIFT;
   }
 
   return NULL;
 }
 
-RGWOp *RGWHandler_REST_OS::get_delete_op()
+RGWOp *RGWHandler_REST_SWIFT::get_delete_op()
 {
   if (s->object)
-    return new RGWDeleteObj_REST_OS;
+    return new RGWDeleteObj_REST_SWIFT;
   else if (s->bucket_name)
-    return new RGWDeleteBucket_REST_OS;
+    return new RGWDeleteBucket_REST_SWIFT;
 
   return NULL;
 }
 
-int RGWHandler_REST_OS::authorize()
+int RGWHandler_REST_SWIFT::authorize()
 {
   bool authorized = rgw_verify_os_token(s);
   if (!authorized)
diff --git a/src/rgw/rgw_rest_os.h b/src/rgw/rgw_rest_os.h
index 3c5c346c345..c9bb6ff51aa 100644
--- a/src/rgw/rgw_rest_os.h
+++ b/src/rgw/rgw_rest_os.h
@@ -1,103 +1,103 @@
-#ifndef CEPH_RGW_REST_OS_H
-#define CEPH_RGW_REST_OS_H
+#ifndef CEPH_RGW_REST_SWIFT_H
+#define CEPH_RGW_REST_SWIFT_H
 #define TIME_BUF_SIZE 128
 
 #include "rgw_op.h"
 #include "rgw_rest.h"
 
-class RGWGetObj_REST_OS : public RGWGetObj_REST {
+class RGWGetObj_REST_SWIFT : public RGWGetObj_REST {
 public:
-  RGWGetObj_REST_OS() {}
-  ~RGWGetObj_REST_OS() {}
+  RGWGetObj_REST_SWIFT() {}
+  ~RGWGetObj_REST_SWIFT() {}
 
   int send_response(void *handle);
 };
 
-class RGWListBuckets_REST_OS : public RGWListBuckets_REST {
+class RGWListBuckets_REST_SWIFT : public RGWListBuckets_REST {
 public:
-  RGWListBuckets_REST_OS() {}
-  ~RGWListBuckets_REST_OS() {}
+  RGWListBuckets_REST_SWIFT() {}
+  ~RGWListBuckets_REST_SWIFT() {}
 
   void send_response();
 };
 
-class RGWListBucket_REST_OS : public RGWListBucket_REST {
+class RGWListBucket_REST_SWIFT : public RGWListBucket_REST {
 public:
-  RGWListBucket_REST_OS() {
+  RGWListBucket_REST_SWIFT() {
     limit_opt_name = "limit";
     default_max = 10000;
   }
-  ~RGWListBucket_REST_OS() {}
+  ~RGWListBucket_REST_SWIFT() {}
 
   void send_response();
 };
 
-class RGWStatBucket_REST_OS : public RGWStatBucket_REST {
+class RGWStatBucket_REST_SWIFT : public RGWStatBucket_REST {
 public:
-  RGWStatBucket_REST_OS() {}
-  ~RGWStatBucket_REST_OS() {}
+  RGWStatBucket_REST_SWIFT() {}
+  ~RGWStatBucket_REST_SWIFT() {}
 
   void send_response();
 };
 
-class RGWCreateBucket_REST_OS : public RGWCreateBucket_REST {
+class RGWCreateBucket_REST_SWIFT : public RGWCreateBucket_REST {
 public:
-  RGWCreateBucket_REST_OS() {}
-  ~RGWCreateBucket_REST_OS() {}
+  RGWCreateBucket_REST_SWIFT() {}
+  ~RGWCreateBucket_REST_SWIFT() {}
 
   void send_response();
 };
 
-class RGWDeleteBucket_REST_OS : public RGWDeleteBucket_REST {
+class RGWDeleteBucket_REST_SWIFT : public RGWDeleteBucket_REST {
 public:
-  RGWDeleteBucket_REST_OS() {}
-  ~RGWDeleteBucket_REST_OS() {}
+  RGWDeleteBucket_REST_SWIFT() {}
+  ~RGWDeleteBucket_REST_SWIFT() {}
 
   void send_response();
 };
 
-class RGWPutObj_REST_OS : public RGWPutObj_REST {
+class RGWPutObj_REST_SWIFT : public RGWPutObj_REST {
 public:
-  RGWPutObj_REST_OS() {}
-  ~RGWPutObj_REST_OS() {}
+  RGWPutObj_REST_SWIFT() {}
+  ~RGWPutObj_REST_SWIFT() {}
 
   void send_response();
 };
 
-class RGWDeleteObj_REST_OS : public RGWDeleteObj_REST {
+class RGWDeleteObj_REST_SWIFT : public RGWDeleteObj_REST {
 public:
-  RGWDeleteObj_REST_OS() {}
-  ~RGWDeleteObj_REST_OS() {}
+  RGWDeleteObj_REST_SWIFT() {}
+  ~RGWDeleteObj_REST_SWIFT() {}
 
   void send_response();
 };
 
-class RGWCopyObj_REST_OS : public RGWCopyObj_REST {
+class RGWCopyObj_REST_SWIFT : public RGWCopyObj_REST {
 public:
-  RGWCopyObj_REST_OS() {}
-  ~RGWCopyObj_REST_OS() {}
+  RGWCopyObj_REST_SWIFT() {}
+  ~RGWCopyObj_REST_SWIFT() {}
 
   void send_response() {}
 };
 
-class RGWGetACLs_REST_OS : public RGWGetACLs_REST {
+class RGWGetACLs_REST_SWIFT : public RGWGetACLs_REST {
 public:
-  RGWGetACLs_REST_OS() {}
-  ~RGWGetACLs_REST_OS() {}
+  RGWGetACLs_REST_SWIFT() {}
+  ~RGWGetACLs_REST_SWIFT() {}
 
   void send_response() {}
 };
 
-class RGWPutACLs_REST_OS : public RGWPutACLs_REST {
+class RGWPutACLs_REST_SWIFT : public RGWPutACLs_REST {
 public:
-  RGWPutACLs_REST_OS() : RGWPutACLs_REST() {}
-  virtual ~RGWPutACLs_REST_OS() {}
+  RGWPutACLs_REST_SWIFT() : RGWPutACLs_REST() {}
+  virtual ~RGWPutACLs_REST_SWIFT() {}
 
   void send_response() {}
 };
 
 
-class RGWHandler_REST_OS : public RGWHandler_REST {
+class RGWHandler_REST_SWIFT : public RGWHandler_REST {
 protected:
 
   RGWOp *get_retrieve_obj_op(bool get_data);
@@ -107,8 +107,8 @@ protected:
   RGWOp *get_post_op() { return NULL; }
 
 public:
-  RGWHandler_REST_OS() : RGWHandler_REST() {}
-  virtual ~RGWHandler_REST_OS() {}
+  RGWHandler_REST_SWIFT() : RGWHandler_REST() {}
+  virtual ~RGWHandler_REST_SWIFT() {}
 
   int authorize();
 };
diff --git a/src/rgw/rgw_os.cc b/src/rgw/rgw_swift.cc
index edecf55f70b..29894c00c4a 100644
--- a/src/rgw/rgw_os.cc
+++ b/src/rgw/rgw_swift.cc
@@ -6,8 +6,8 @@
 #include <curl/easy.h>
 
 #include "rgw_common.h"
-#include "rgw_os.h"
-#include "rgw_os_auth.h"
+#include "rgw_swift.h"
+#include "rgw_swift_auth.h"
 #include "rgw_user.h"
 
 
@@ -15,7 +15,7 @@ static size_t read_http_header(void *ptr, size_t size, size_t nmemb, void *_info
 {
   size_t len = size * nmemb;
   char line[len + 1];
-  struct rgw_os_auth_info *info = (struct rgw_os_auth_info *)_info;
+  struct rgw_swift_auth_info *info = (struct rgw_swift_auth_info *)_info;
 
   char *s = (char *)ptr, *end = (char *)ptr + len;
   char *p = line;
@@ -56,14 +56,14 @@ static size_t read_http_header(void *ptr, size_t size, size_t nmemb, void *_info
   return len;
 }
 
-static int rgw_os_validate_token(const char *token, struct rgw_os_auth_info *info)
+static int rgw_swift_validate_token(const char *token, struct rgw_swift_auth_info *info)
 {
   CURL *curl_handle;
   string auth_url = "http://127.0.0.1:11000/token";
   char url_buf[auth_url.size() + 1 + strlen(token) + 1];
   sprintf(url_buf, "%s/%s", auth_url.c_str(), token);
 
-  RGW_LOG(10) << "rgw_os_validate_token url=" << url_buf << dendl;
+  RGW_LOG(10) << "rgw_swift_validate_token url=" << url_buf << dendl;
 
   curl_handle = curl_easy_init();
 
@@ -83,37 +83,37 @@ static int rgw_os_validate_token(const char *token, struct rgw_os_auth_info *inf
 bool rgw_verify_os_token(req_state *s)
 {
   if (strncmp(s->os_auth_token, "AUTH_rgwtk", 10) == 0) {
-    int ret = rgw_os_verify_signed_token(s->os_auth_token, s->user);
+    int ret = rgw_swift_verify_signed_token(s->os_auth_token, s->user);
     if (ret < 0)
       return false;
 
     return  true;
   }
 
-  struct rgw_os_auth_info info;
+  struct rgw_swift_auth_info info;
 
   memset(&info, 0, sizeof(info));
 
   info.status = 401; // start with access denied, validate_token might change that
 
-  int ret = rgw_os_validate_token(s->os_auth_token, &info);
+  int ret = rgw_swift_validate_token(s->os_auth_token, &info);
   if (ret < 0)
     return ret;
 
   if (!info.user) {
-    RGW_LOG(0) << "openstack auth didn't authorize a user" << dendl;
+    RGW_LOG(0) << "swift auth didn't authorize a user" << dendl;
     return false;
   }
 
   s->os_user = info.user;
   s->os_groups = info.auth_groups;
 
-  string openstack_user = s->os_user;
+  string swift_user = s->os_user;
 
-  RGW_LOG(10) << "openstack user=" << s->os_user << dendl;
+  RGW_LOG(10) << "swift user=" << s->os_user << dendl;
 
-  if (rgw_get_user_info_by_openstack(openstack_user, s->user) < 0) {
-    RGW_LOG(0) << "couldn't map openstack user" << dendl;
+  if (rgw_get_user_info_by_swift(swift_user, s->user) < 0) {
+    RGW_LOG(0) << "couldn't map swift user" << dendl;
     return false;
   }
 
diff --git a/src/rgw/rgw_os.h b/src/rgw/rgw_swift.h
index 2114ecaa294..16204bcb2d9 100644
--- a/src/rgw/rgw_os.h
+++ b/src/rgw/rgw_swift.h
@@ -1,11 +1,11 @@
 
-#ifndef CEPH_RGW_OS_H
-#define CEPH_RGW_OS_H
+#ifndef CEPH_RGW_SWIFT_H
+#define CEPH_RGW_SWIFT_H
 
 #include "rgw_common.h"
 
 
-struct rgw_os_auth_info {
+struct rgw_swift_auth_info {
   int status;
   char *auth_groups;
   char *user;
diff --git a/src/rgw/rgw_os_auth.cc b/src/rgw/rgw_swift_auth.cc
index 29c1e48b0e2..afcd03d68bc 100644
--- a/src/rgw/rgw_os_auth.cc
+++ b/src/rgw/rgw_swift_auth.cc
@@ -1,4 +1,4 @@
-#include "rgw_os_auth.h"
+#include "rgw_swift_auth.h"
 #include "rgw_rest.h"
 
 #include "common/ceph_crypto.h"
@@ -8,7 +8,7 @@
 
 using namespace ceph::crypto;
 
-static RGW_OS_Auth_Get rgw_os_auth_get;
+static RGW_SWIFT_Auth_Get rgw_swift_auth_get;
 
 static int build_token(string& os_user, string& key, uint64_t nonce, utime_t& expiration, bufferlist& bl)
 {
@@ -45,14 +45,14 @@ static int encode_token(string& os_user, string& key, bufferlist& bl)
     return ret;
 
   utime_t expiration = ceph_clock_now(g_ceph_context);
-  expiration += RGW_OS_TOKEN_EXPIRATION; // 15 minutes
+  expiration += RGW_SWIFT_TOKEN_EXPIRATION; // 15 minutes
 
   ret = build_token(os_user, key, nonce, expiration, bl);
 
   return ret;
 }
 
-int rgw_os_verify_signed_token(const char *token, RGWUserInfo& info)
+int rgw_swift_verify_signed_token(const char *token, RGWUserInfo& info)
 {
   if (strncmp(token, "AUTH_rgwtk", 10) != 0)
     return -EINVAL;
@@ -92,13 +92,13 @@ int rgw_os_verify_signed_token(const char *token, RGWUserInfo& info)
     return -EPERM;
   }
 
-  if ((ret = rgw_get_user_info_by_openstack(os_user, info)) < 0)
+  if ((ret = rgw_get_user_info_by_swift(os_user, info)) < 0)
     return ret;
 
   RGW_LOG(10) << "os_user=" << os_user << dendl;
 
   bufferlist tok;
-  ret = build_token(os_user, info.openstack_key, nonce, expiration, tok);
+  ret = build_token(os_user, info.swift_key, nonce, expiration, tok);
   if (ret < 0)
     return ret;
 
@@ -117,11 +117,11 @@ int rgw_os_verify_signed_token(const char *token, RGWUserInfo& info)
   return 0;
 }
 
-void RGW_OS_Auth_Get::execute()
+void RGW_SWIFT_Auth_Get::execute()
 {
   int ret = -EPERM;
 
-  RGW_LOG(20) << "RGW_OS_Auth_Get::execute()" << dendl;
+  RGW_LOG(20) << "RGW_SWIFT_Auth_Get::execute()" << dendl;
 
   const char *key = s->env->get("HTTP_X_AUTH_KEY");
   const char *user = s->env->get("HTTP_X_AUTH_USER");
@@ -141,18 +141,18 @@ void RGW_OS_Auth_Get::execute()
   if (!key || !user)
     goto done;
 
-  if ((ret = rgw_get_user_info_by_openstack(user_str, info)) < 0)
+  if ((ret = rgw_get_user_info_by_swift(user_str, info)) < 0)
     goto done;
 
-  if (info.openstack_key.compare(key) != 0) {
-    RGW_LOG(0) << "RGW_OS_Auth_Get::execute(): bad openstack key" << dendl;
+  if (info.swift_key.compare(key) != 0) {
+    RGW_LOG(0) << "RGW_SWIFT_Auth_Get::execute(): bad swift key" << dendl;
     ret = -EPERM;
     goto done;
   }
 
   CGI_PRINTF(s, "X-Storage-Url: %s/%s/v1/AUTH_rgw\n", os_url, url_prefix);
 
-  if ((ret = encode_token(info.openstack_name, info.openstack_key, bl)) < 0)
+  if ((ret = encode_token(info.swift_name, info.swift_key, bl)) < 0)
     goto done;
 
   {
@@ -170,17 +170,17 @@ done:
   end_header(s);
 }
 
-int RGWHandler_OS_Auth::authorize()
+int RGWHandler_SWIFT_Auth::authorize()
 {
   return 0;
 }
 
-RGWOp *RGWHandler_OS_Auth::get_op()
+RGWOp *RGWHandler_SWIFT_Auth::get_op()
 {
   RGWOp *op;
   switch (s->op) {
    case OP_GET:
-     op = &rgw_os_auth_get;
+     op = &rgw_swift_auth_get;
      break;
    default:
      return NULL;
@@ -192,7 +192,7 @@ RGWOp *RGWHandler_OS_Auth::get_op()
   return op;
 }
 
-void RGWHandler_OS_Auth::put_op(RGWOp *op)
+void RGWHandler_SWIFT_Auth::put_op(RGWOp *op)
 {
 }
 
diff --git a/src/rgw/rgw_swift_auth.h b/src/rgw/rgw_swift_auth.h
new file mode 100644
index 00000000000..95909a96015
--- /dev/null
+++ b/src/rgw/rgw_swift_auth.h
@@ -0,0 +1,30 @@
+#ifndef CEPH_RGW_SWIFT_AUTH_H
+#define CEPH_RGW_SWIFT_AUTH_H
+
+#include "rgw_op.h"
+
+#define RGW_SWIFT_TOKEN_EXPIRATION (15 * 60)
+
+extern int rgw_swift_verify_signed_token(const char *token, RGWUserInfo& info);
+
+class RGW_SWIFT_Auth_Get : public RGWOp {
+public:
+  RGW_SWIFT_Auth_Get() {}
+  ~RGW_SWIFT_Auth_Get() {}
+
+  int verify_permission() { return 0; }
+  void execute();
+};
+
+class RGWHandler_SWIFT_Auth : public RGWHandler {
+public:
+  RGWHandler_SWIFT_Auth() {}
+  ~RGWHandler_SWIFT_Auth() {}
+  RGWOp *get_op();
+  void put_op(RGWOp *op);
+
+  int authorize();
+  int read_permissions() { return 0; }
+};
+
+#endif
diff --git a/src/rgw/rgw_user.cc b/src/rgw/rgw_user.cc
index 2d96fb3bba5..f47123144fe 100644
--- a/src/rgw/rgw_user.cc
+++ b/src/rgw/rgw_user.cc
@@ -15,7 +15,7 @@ using namespace std;
 
 static rgw_bucket ui_key_bucket(USER_INFO_POOL_NAME);
 static rgw_bucket ui_email_bucket(USER_INFO_EMAIL_POOL_NAME);
-static rgw_bucket ui_openstack_bucket(USER_INFO_SWIFT_POOL_NAME);
+static rgw_bucket ui_swift_bucket(USER_INFO_SWIFT_POOL_NAME);
 static rgw_bucket ui_uid_bucket(USER_INFO_UID_POOL_NAME);
 
 static rgw_bucket pi_pool_bucket(POOL_INFO_POOL_NAME);
@@ -49,12 +49,12 @@ int rgw_store_user_info(RGWUserInfo& info)
   int ret;
   map<string,bufferlist> attrs;
 
-  if (info.openstack_name.size()) {
-    /* check if openstack mapping exists */
+  if (info.swift_name.size()) {
+    /* check if swift mapping exists */
     RGWUserInfo inf;
-    int r = rgw_get_user_info_by_openstack(info.openstack_name, inf);
+    int r = rgw_get_user_info_by_swift(info.swift_name, inf);
     if (r >= 0 && inf.user_id.compare(info.user_id) != 0) {
-      RGW_LOG(0) << "can't store user info, openstack id already mapped to another user" << dendl;
+      RGW_LOG(0) << "can't store user info, swift id already mapped to another user" << dendl;
       return -EEXIST;
     }
   }
@@ -99,8 +99,8 @@ int rgw_store_user_info(RGWUserInfo& info)
     }
   }
 
-  if (info.openstack_name.size())
-    ret = rgw_put_obj(info.user_id, ui_openstack_bucket, info.openstack_name, uid_bl.c_str(), uid_bl.length());
+  if (info.swift_name.size())
+    ret = rgw_put_obj(info.user_id, ui_swift_bucket, info.swift_name, uid_bl.c_str(), uid_bl.length());
 
   return ret;
 }
@@ -146,12 +146,12 @@ int rgw_get_user_info_by_email(string& email, RGWUserInfo& info)
 }
 
 /**
- * Given an openstack username, finds the user_info associated with it.
+ * Given an swift username, finds the user_info associated with it.
  * returns: 0 on success, -ERR# on failure (including nonexistence)
  */
-extern int rgw_get_user_info_by_openstack(string& openstack_name, RGWUserInfo& info)
+extern int rgw_get_user_info_by_swift(string& swift_name, RGWUserInfo& info)
 {
-  return rgw_get_user_info_from_index(openstack_name, ui_openstack_bucket, info);
+  return rgw_get_user_info_from_index(swift_name, ui_swift_bucket, info);
 }
 
 /**
@@ -407,9 +407,9 @@ int rgw_remove_email_index(string& uid, string& email)
   return ret;
 }
 
-int rgw_remove_openstack_name_index(string& uid, string& openstack_name)
+int rgw_remove_swift_name_index(string& uid, string& swift_name)
 {
-  rgw_obj obj(ui_openstack_bucket, openstack_name);
+  rgw_obj obj(ui_swift_bucket, swift_name);
   int ret = rgwstore->delete_obj(NULL, uid, obj);
   return ret;
 }
diff --git a/src/rgw/rgw_user.h b/src/rgw/rgw_user.h
index b9885196a50..92b964f6941 100644
--- a/src/rgw/rgw_user.h
+++ b/src/rgw/rgw_user.h
@@ -11,7 +11,7 @@ using namespace std;
 
 #define USER_INFO_POOL_NAME ".users"
 #define USER_INFO_EMAIL_POOL_NAME ".users.email"
-#define USER_INFO_SWIFT_POOL_NAME ".users.openstack"
+#define USER_INFO_SWIFT_POOL_NAME ".users.swift"
 #define USER_INFO_UID_POOL_NAME ".users.uid"
 #define RGW_USER_ANON_ID "anonymous"
 
@@ -53,15 +53,15 @@ extern int rgw_store_user_info(RGWUserInfo& info);
  */
 extern int rgw_get_user_info_by_uid(string& user_id, RGWUserInfo& info);
 /**
- * Given an openstack username, finds the user info associated with it.
+ * Given an swift username, finds the user info associated with it.
  * returns: 0 on success, -ERR# on failure (including nonexistence)
  */
 extern int rgw_get_user_info_by_email(string& email, RGWUserInfo& info);
 /**
- * Given an openstack username, finds the user info associated with it.
+ * Given an swift username, finds the user info associated with it.
  * returns: 0 on success, -ERR# on failure (including nonexistence)
  */
-extern int rgw_get_user_info_by_openstack(string& openstack_name, RGWUserInfo& info);
+extern int rgw_get_user_info_by_swift(string& swift_name, RGWUserInfo& info);
 /**
  * Given an access key, finds the user info associated with it.
  * returns: 0 on success, -ERR# on failure (including nonexistence)
@@ -147,7 +147,7 @@ extern int rgw_remove_bucket(string user_id, rgw_bucket& bucket, bool purge_data
 extern int rgw_remove_key_index(RGWAccessKey& access_key);
 extern int rgw_remove_uid_index(string& uid);
 extern int rgw_remove_email_index(string& uid, string& email);
-extern int rgw_remove_openstack_name_index(string& uid, string& openstack_name);
+extern int rgw_remove_swift_name_index(string& uid, string& swift_name);
 
 extern int rgw_store_pool_info(int64_t pool_id, RGWPoolInfo& pool_info);
 extern int rgw_retrieve_pool_info(int64_t pool_id, RGWPoolInfo& pool_info);