openstack
/
syntribos
Code Issues Proposed changes

removed domain and rsa to prepare for porting to openstack auth

This commit is contained in:
Nathan Buckner 2015-08-03 11:33:16 -05:00
parent f618b06f59
commit 6e8eae128e
2 changed files with 3 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
syntribos/extensions/rax_auth/models/auth_models.py
View File

@ -343,8 +343,8 @@ class Auth(BaseIdentityModel):
xmlns = V2_0Constants.XML_NS
def __init__(
self, password_creds=None, rsa_creds=None, token_creds=None,
api_key_creds=None, domain=None, tenant_name=None, tenant_id=None):
self, password_creds=None, token_creds=None,
api_key_creds=None, tenant_name=None, tenant_id=None):
password_creds = password_creds or EmptyModel()
token_creds = token_creds or EmptyModel()
api_key_creds = api_key_creds or EmptyModel()
@ -365,10 +365,8 @@ class Auth(BaseIdentityModel):
element, {"tenantName": self.tenant_name, "xmlns": self.xmlns,
"tenantId": self.tenant_id})
element.append(self.password_creds._obj_to_xml_ele())
element.append(self.rsa_creds._obj_to_xml_ele())
element.append(self.token_creds._obj_to_xml_ele())
element.append(self.api_key_creds._obj_to_xml_ele())
element.append(self.domain._obj_to_xml_ele())
return element
@ -416,37 +414,3 @@ class APIKeyCredentials(BaseIdentityModel):
"username": self.username, "apiKey": self.api_key,
"xmlns": self.xmlns}
return self._set_xml_etree_element(element, attrs)
class RSACredentials(BaseIdentityModel):
xmlns = V2_0Constants.XML_NS_RAX_AUTH
def __init__(self, username=None, rsa_key=None):
super(RSACredentials, self).__init__(locals())
def _obj_to_dict(self):
attrs = {"username": self.username, "tokenKey": self.rsa_key}
return self._remove_empty_values(attrs)
def _obj_to_xml_ele(self):
element = ET.Element('RAX-AUTH:rsaCredentials')
attrs = {
"username": self.username, "tokenKey": self.rsa_key,
"xmlns:RAX-AUTH": self.xmlns}
return self._set_xml_etree_element(element, attrs)
class Domain(BaseIdentityModel):
xmlns = V2_0Constants.XML_NS_RAX_AUTH
def __init__(self, name=None):
super(Domain, self).__init__(locals())
def _obj_to_dict(self):
attrs = {"name": self.name}
return self._remove_empty_values(attrs)
def _obj_to_xml_ele(self):
element = ET.Element("RAX-AUTH:domain")
attrs = {"name": self.name, "xmlns:RAX-AUTH": self.xmlns}
return self._set_xml_etree_element(element, attrs)

1
syntribos/tests/request_creator.py
View File

@ -95,6 +95,7 @@ class RequestObject(RequestHelperMixin):
self.headers = self._run_iters(self.headers, self.action_field)
self.params = self._run_iters(self.params, self.action_field)
self.data = self._string_data(self.data)
self.url = self._replace_iter(self.url)
def get_prepared_copy(self):
copy = deepcopy(self)