register name identifier request and response updates in C and python binding

10 files changed, 455 insertions, 59 deletions

diff --git a/lasso/Attic/protocols/register_name_identifier_request.c b/lasso/Attic/protocols/register_name_identifier_request.c
index 043475b6..5b38bedf 100644
--- a/lasso/Attic/protocols/register_name_identifier_request.c
+++ b/lasso/Attic/protocols/register_name_identifier_request.c
@@ -30,7 +30,7 @@
 /*****************************************************************************/
 
 void
-lasso_register_name_identifier_change_attribute_names_identifiers(LassoRegisterNameIdentifierRequest *request)
+lasso_register_name_identifier_rename_attributes_for_query(LassoRegisterNameIdentifierRequest *request)
 {
   LassoNode *idpidentifier, *spidentifier, *oldidentifier;
 
@@ -139,3 +139,98 @@ lasso_register_name_identifier_request_new(const xmlChar *providerID,
 
   return (request);
 }
+
+LassoNode *
+lasso_register_name_identifier_request_new_from_query(const xmlChar *query)
+{
+     LassoNode *request, *idpidentifier, *spidentifier, *oldidentifier;
+     xmlChar *str;
+     GData *gd;
+
+     request = LASSO_NODE(g_object_new(LASSO_TYPE_REGISTER_NAME_IDENTIFIER_REQUEST, NULL));
+
+     gd = lasso_query_to_dict(query);
+     
+     /* RequestID */
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "RequestID"), 0);
+     lasso_samlp_request_abstract_set_requestID(LASSO_SAMLP_REQUEST_ABSTRACT(request), str);
+  
+     /* MajorVersion */
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "MajorVersion"), 0);
+     lasso_samlp_request_abstract_set_majorVersion(LASSO_SAMLP_REQUEST_ABSTRACT(request), str);
+  
+     /* MinorVersion */
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "MinorVersion"), 0);
+     lasso_samlp_request_abstract_set_minorVersion(LASSO_SAMLP_REQUEST_ABSTRACT(request), str);
+  
+     /* IssueInstant */
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "IssueInstance"), 0);
+     lasso_samlp_request_abstract_set_issueInstance(LASSO_SAMLP_REQUEST_ABSTRACT(request), str);
+  
+     /* ProviderID */
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "ProviderID"), 0);
+     lasso_lib_register_name_identifier_request_set_providerID(LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(request), str);
+     
+     /* RelayState */
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "RelayState"), 0);
+     if (str != NULL)
+	  lasso_lib_register_name_identifier_request_set_relayState(LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(request), str);
+
+     /* IDPProvidedNameIdentifier */
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "IDPProvidedNameIdentifier"), 0);
+     idpidentifier = lasso_lib_idp_provided_name_identifier_new(str);
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "IDPNameQualifier"), 0);
+     lasso_saml_name_identifier_set_nameQualifier(LASSO_SAML_NAME_IDENTIFIER(idpidentifier), str);
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "IDPFormat"), 0);
+     lasso_saml_name_identifier_set_format(LASSO_SAML_NAME_IDENTIFIER(idpidentifier), str);
+     
+     lasso_lib_register_name_identifier_request_set_idpProvidedNameIdentifier(LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(request), idpidentifier);
+     
+     /* SPPProvidedNameIdentifier */
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "SPProvidedNameIdentifier"), 0);
+     spidentifier = lasso_lib_sp_provided_name_identifier_new(str);
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "SPNameQualifier"), 0);
+     lasso_saml_name_identifier_set_nameQualifier(LASSO_SAML_NAME_IDENTIFIER(spidentifier), str);
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "SPFormat"), 0);
+     lasso_saml_name_identifier_set_format(LASSO_SAML_NAME_IDENTIFIER(spidentifier), str);
+     
+     lasso_lib_register_name_identifier_request_set_spProvidedNameIdentifier(LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(request), spidentifier);
+ 
+     /* OldPProvidedNameIdentifier */
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "OldProvidedNameIdentifier"), 0);
+     oldidentifier = lasso_lib_old_provided_name_identifier_new(str);
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "OldNameQualifier"), 0);
+     lasso_saml_name_identifier_set_nameQualifier(LASSO_SAML_NAME_IDENTIFIER(oldidentifier), str);
+     str = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "OldFormat"), 0);
+     lasso_saml_name_identifier_set_format(LASSO_SAML_NAME_IDENTIFIER(oldidentifier), str);
+     
+     lasso_lib_register_name_identifier_request_set_oldProvidedNameIdentifier(LASSO_LIB_REGISTER_NAME_IDENTIFIER_REQUEST(request), oldidentifier);
+
+     g_datalist_clear(&gd);
+
+     return(request);
+}
+
+
+LassoNode *
+lasso_register_name_identifier_request_new_from_soap(const xmlChar *buffer)
+{
+     LassoNode *request;
+     LassoNode *envelope, *lassoNode_request;
+     xmlNodePtr xmlNode_request;
+     LassoNodeClass *class;
+
+     request = LASSO_NODE(g_object_new(LASSO_TYPE_REGISTER_NAME_IDENTIFIER_REQUEST, NULL));
+
+     envelope = lasso_node_new_from_dump(buffer);
+     lassoNode_request = lasso_node_get_child(envelope, "RegisterNameIdentifierRequest");
+  
+     class = LASSO_NODE_GET_CLASS(lassoNode_request);
+     xmlNode_request = xmlCopyNode(class->get_xmlNode(LASSO_NODE(lassoNode_request)), 1);
+  
+     class = LASSO_NODE_GET_CLASS(request);
+     class->set_xmlNode(LASSO_NODE(request), xmlNode_request);
+     g_object_unref(envelope);
+     
+     return(request);
+}
diff --git a/lasso/Attic/protocols/register_name_identifier_request.h b/lasso/Attic/protocols/register_name_identifier_request.h
index 35a3954e..b9eaa9b5 100644
--- a/lasso/Attic/protocols/register_name_identifier_request.h
+++ b/lasso/Attic/protocols/register_name_identifier_request.h
@@ -54,18 +54,22 @@ struct _LassoRegisterNameIdentifierRequestClass {
 
 LASSO_EXPORT GType      lasso_register_name_identifier_request_get_type (void);
 
-LASSO_EXPORT LassoNode* lasso_register_name_identifier_request_new      (const xmlChar     *providerID,
-									 const xmlChar     *idpProvidedNameIdentifier,
-									 const xmlChar     *idpNameQualifier,
-									 const xmlChar     *idpFormat,
-									 const xmlChar     *spProvidedNameIdentifier,
-									 const xmlChar     *spNameQualifier,
-									 const xmlChar     *spFormat,
-									 const xmlChar     *oldProvidedNameIdentifier,
-									 const xmlChar     *oldNameQualifier,
-									 const xmlChar     *oldFormat);
+LASSO_EXPORT LassoNode* lasso_register_name_identifier_request_new            (const xmlChar     *providerID,
+									       const xmlChar     *idpProvidedNameIdentifier,
+									       const xmlChar     *idpNameQualifier,
+									       const xmlChar     *idpFormat,
+									       const xmlChar     *spProvidedNameIdentifier,
+									       const xmlChar     *spNameQualifier,
+									       const xmlChar     *spFormat,
+									       const xmlChar     *oldProvidedNameIdentifier,
+									       const xmlChar     *oldNameQualifier,
+									       const xmlChar     *oldFormat);
 
-LASSO_EXPORT void lasso_register_name_identifier_change_attribute_names_identifiers(LassoRegisterNameIdentifierRequest *request);
+LASSO_EXPORT LassoNode* lasso_register_name_identifier_request_new_from_query (const xmlChar *query);
+LASSO_EXPORT LassoNode* lasso_register_name_identifier_request_new_from_soap  (const xmlChar *buffer);
+
+
+LASSO_EXPORT void lasso_register_name_identifier_rename_attributes_for_query(LassoRegisterNameIdentifierRequest *request);
 
 #ifdef __cplusplus
 }
diff --git a/lasso/Attic/protocols/register_name_identifier_response.c b/lasso/Attic/protocols/register_name_identifier_response.c
index 46364830..252e1276 100644
--- a/lasso/Attic/protocols/register_name_identifier_response.c
+++ b/lasso/Attic/protocols/register_name_identifier_response.c
@@ -120,3 +120,121 @@ lasso_register_name_identifier_response_new(const xmlChar *providerID,
 
   return (response);
 }
+
+LassoNode *
+lasso_register_name_identifier_response_new_from_dump(const xmlChar *buffer)
+{
+  LassoNode *response;
+  
+  response = LASSO_NODE(g_object_new(LASSO_TYPE_REGISTER_NAME_IDENTIFIER_RESPONSE, NULL));
+  lasso_node_load_from_buffer(response, buffer);
+  
+  return (response);
+}
+
+// build a RegisterNameIdentifierResponse from a query form RegisterNameIdentifierResponse
+LassoNode *
+lasso_register_name_identifier_response_new_from_query(const xmlChar *query)
+{
+  LassoNode *response;
+  xmlChar *relayState, *consent;
+  GData *gd;
+  
+  response = LASSO_NODE(g_object_new(LASSO_TYPE_REGISTER_NAME_IDENTIFIER_RESPONSE, NULL));
+
+  gd = lasso_query_to_dict(query);
+  
+  /* ResponseID */
+  lasso_samlp_response_abstract_set_responseID(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
+					       lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "ResponseID"), 0));
+  
+  /* MajorVersion */
+  lasso_samlp_response_abstract_set_majorVersion(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
+						 lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "MajorVersion"), 0));
+  
+  /* MinorVersion */
+  lasso_samlp_response_abstract_set_minorVersion(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
+						 lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "MinorVersion"), 0));
+  
+  /* IssueInstant */
+  lasso_samlp_response_abstract_set_issueInstance(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
+						  lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "IssueInstance"), 0));
+  
+  /* InResponseTo */
+  lasso_samlp_response_abstract_set_inResponseTo(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
+						 lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "InResponseTo"), 0));
+  
+  /* Recipient */
+  lasso_samlp_response_abstract_set_recipient(LASSO_SAMLP_RESPONSE_ABSTRACT(response),
+					      lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "Recipient"), 0));
+  
+  /* ProviderID */
+  lasso_lib_status_response_set_providerID(LASSO_LIB_STATUS_RESPONSE(response),
+					   lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "ProviderID"), 0));
+  
+  /* RelayState */
+  relayState = lasso_g_ptr_array_index((GPtrArray *)g_datalist_get_data(&gd, "RelayState"), 0);
+  if (relayState != NULL)
+    lasso_lib_status_response_set_relayState(LASSO_LIB_STATUS_RESPONSE(response), relayState);
+  
+  g_datalist_clear(&gd);
+
+  return(response);
+}
+
+// build a RegisterNameIdentifierResponse from a query form RegisterNameIdentifierRequest
+LassoNode *
+lasso_register_name_identifier_response_new_from_request_query(const xmlChar *query,
+							       const xmlChar *providerID,
+							       const xmlChar *statusCodeValue)
+{
+  LassoNode *request, *response;
+
+  request = lasso_register_name_identifier_request_new_from_query(query);
+  
+  response = lasso_register_name_identifier_response_new(providerID,
+				       statusCodeValue,
+				       request);
+
+  return(response);
+}
+
+// build a RegisterNameIdentifierRespose from a soap form RegisterNameIdentifierRequest
+LassoNode *
+lasso_register_name_identifier_response_new_from_request_soap(const xmlChar *buffer,
+							      const xmlChar *providerID,
+							      const xmlChar *statusCodeValue)
+{
+  LassoNode *request, *response;
+
+  request = lasso_register_name_identifier_request_new_from_soap(buffer);
+
+  response = lasso_register_name_identifier_response_new(providerID,
+				       statusCodeValue,
+				       request);
+
+  return(response);
+}
+
+LassoNode *
+lasso_register_name_identifier_response_new_from_soap(const xmlChar *buffer)
+{
+  LassoNode *response;
+  LassoNode *envelope, *lassoNode_response;
+  xmlNodePtr xmlNode_response;
+  LassoNodeClass *class;
+
+  response = LASSO_NODE(g_object_new(LASSO_TYPE_REGISTER_NAME_IDENTIFIER_RESPONSE, NULL));
+
+  envelope = lasso_node_new_from_dump(buffer);
+  lassoNode_response = lasso_node_get_child(envelope, "RegisterNameIdentifierResponse");
+     
+  class = LASSO_NODE_GET_CLASS(lassoNode_response);
+  xmlNode_response = xmlCopyNode(class->get_xmlNode(LASSO_NODE(lassoNode_response)), 1);
+  
+  class = LASSO_NODE_GET_CLASS(response);
+  class->set_xmlNode(LASSO_NODE(response), xmlNode_response);
+  g_object_unref(envelope);
+  
+  return(response);
+}
diff --git a/lasso/Attic/protocols/register_name_identifier_response.h b/lasso/Attic/protocols/register_name_identifier_response.h
index d580eb2e..2a7d7fde 100644
--- a/lasso/Attic/protocols/register_name_identifier_response.h
+++ b/lasso/Attic/protocols/register_name_identifier_response.h
@@ -52,10 +52,22 @@ struct _LassoRegisterNameIdentifierResponseClass {
   LassoLibRegisterNameIdentifierResponseClass parent;
 };
 
-LASSO_EXPORT GType      lasso_register_name_identifier_response_get_type (void);
-LASSO_EXPORT LassoNode* lasso_register_name_identifier_response_new      (const xmlChar *providerID,
-									  const xmlChar *statusCodeValue,
-									  LassoNode     *request);
+LASSO_EXPORT GType       lasso_register_name_identifier_response_get_type              (void);
+LASSO_EXPORT LassoNode*  lasso_register_name_identifier_response_new                   (const xmlChar *providerID,
+											const xmlChar *statusCodeValue,
+											LassoNode     *request);
+
+LASSO_EXPORT LassoNode * lasso_register_name_identifier_response_new_from_dump          (const xmlChar *buffer);
+LASSO_EXPORT LassoNode * lasso_register_name_identifier_response_new_from_query         (const xmlChar *query);
+LASSO_EXPORT LassoNode * lasso_register_name_identifier_response_new_from_request_query (const xmlChar *query,
+											 const xmlChar *providerID,
+											 const xmlChar *statusCodeValue);
+LASSO_EXPORT LassoNode * lasso_register_name_identifier_response_new_from_request_soap  (const xmlChar *buffer,
+											 const xmlChar *providerID,
+											 const xmlChar *statusCodeValue);
+
+LASSO_EXPORT LassoNode * lasso_register_name_identifier_response_new_from_soap          (const xmlChar *buffer);
+
 
 #ifdef __cplusplus
 }
diff --git a/python/lasso.py b/python/lasso.py
index 3bcfa3f4..255ad77e 100644
--- a/python/lasso.py
+++ b/python/lasso.py
@@ -239,6 +239,32 @@ class LibNameIdentifierMappingResponse(Node):
         Node.__init__(self, _obj=_obj)
 
 
+class LibRegisterNameIdentifierRequest(Node):
+    def __init__(self, _obj=None):
+        """
+        """
+        if _obj != None:
+            self._o = _obj
+            return
+        _obj = lassomod.lib_register_name_identifier_request_new()
+        if _obj is None:
+            raise Error('lasso_lib_register_name_identifier_request_new() failed')
+        Node.__init__(self, _obj=_obj)
+
+
+class LibRegisterNameIdentifierResponse(Node):
+    def __init__(self, _obj = None):
+        """
+        """
+        if _obj != None:
+            self._o = _obj
+            return
+        _obj = lassomod.lib_register_name_identifier_response_new()
+        if _obj is None:
+            raise Error('lasso_lib_register_name_identifier_response_new() failed')
+        Node.__init__(self, _obj=_obj)
+
+        
 class SamlNameIdentifier(Node):
     def __init__(self, _obj=None):
         """
@@ -469,48 +495,69 @@ class NameIdentifierMappingResponse(LibNameIdentifierMappingResponse):
     new_from_query = classmethod(new_from_query)
 
 
-class RegisterNameIdentifierRequest(Node):
-    def __init__(_obj):
+class RegisterNameIdentifierRequest(LibRegisterNameIdentifierRequest):
+    def __init__(self, _obj):
         """
         """
-        self._o = obj
+        self._o = _obj
         LibRegisterNameIdentifierRequest.__init__(self, _obj = self._o)
 
-    def new(cls, providerID, nameIdentifier, nameQualifier, format):
-        obj = lassomod.register_name_identifier_new(providerID, nameIdentifier, nameQualifier, format)
+    def new(cls, providerID,
+            idpNameIdentifier, idpNameQualifier, idpFormat,
+            spNameIdentifier, spNameQualifier, spFormat,
+            oldNameIdentifier, oldNameQualifier, oldFormat):
+        obj = lassomod.register_name_identifier_request_new(providerID,
+                                                            idpNameIdentifier, idpNameQualifier, idpFormat,
+                                                            spNameIdentifier, spNameQualifier, spFormat,
+                                                            oldNameIdentifier, oldNameQualifier, oldFormat)
         return RegisterNameIdentifierRequest(obj)
     new = classmethod(new)
 
     def new_from_soap(cls, envelope):
-        obj = lassomod.register_name_identifier_new_from_soap(envelope)
+        obj = lassomod.register_name_identifier_request_new_from_soap(envelope)
         return RegisterNameIdentifierRequest(obj)
     new_from_soap = classmethod(new_from_soap)
 
     def new_from_query(cls, query):
-        obj = lassomod.register_name_identifier_new_from_query(query)
+        obj = lassomod.register_name_identifier_request_new_from_query(query)
         return RegisterNameIdentifierRequest(obj)
     new_from_query = classmethod(new_from_query)
 
-    def url_encode(self):
-        pass
+    def rename_attributes_for_encoded_query(self):
+        lassomod.register_name_identifier_request_rename_attributes_for_query(self)
 
-class RegisterNameIdentifierResponse(Node):
-    def __init__(self,
-                 providerID,
-                 statusCodeValue,
-                 request,
-                 _obj=None):
+
+class RegisterNameIdentifierResponse(LibRegisterNameIdentifierResponse):
+    def __init__(self, _obj):
         """
         """
-        if _obj != None:
-            self._o = _obj
-            return
-        _obj = lassomod.register_name_identifier_response_new(providerID,
-                                                              statusCodeValue,
-                                                              request)
-        if _obj is None:
-            raise Error('lasso_register_name_identifier_response_new() failed')
-        Node.__init__(self, _obj=_obj)
+        self._o = _obj
+        LibRegisterNameIdentifierResponse.__init__(self, _obj = self._o)
+
+    def new_from_request_soap(cls, envelope, providerID, status_code_value):
+        obj = lassomod.register_name_identifier_response_new_from_request_soap(envelope, providerID, status_code_value)
+        return RegisterNameIdentifierResponse(obj)
+    new_from_request_soap = classmethod(new_from_request_soap)
+
+    def new_from_soap(cls, envelope):
+        obj = lassomod.register_name_identifier_response_new_from_soap(envelope)
+        return RegisterNameIdentifierResponse(obj)
+    new_from_soap = classmethod(new_from_soap)
+
+    def new_from_dump(cls, dump):
+        obj = lassomod.register_name_identifier_response_new_from_dump(dump)
+        return RegisterNameIdentifierResponse(obj)
+    new_from_dump = classmethod(new_from_dump)
+
+    def new_from_request_query(cls, query, providerID, status_code_value):
+        obj = lassomod.register_name_identifier_response_new_from_request_query(query, providerID, status_code_value)
+        return RegisterNameIdentifierResponse(obj);
+    new_from_request_query = classmethod(new_from_request_query)
+
+    def new_from_query(cls, query):
+        obj = lassomod.register_name_identifier_response_new_from_query(query)
+        return RegisterNameIdentifierResponse(obj);
+    new_from_query = classmethod(new_from_query)
 
 ################################################################################
 # elements
diff --git a/python/lassomod.c b/python/lassomod.c
index fa9fae8e..303bb062 100644
--- a/python/lassomod.c
+++ b/python/lassomod.c
@@ -167,11 +167,15 @@ static PyMethodDef lasso_methods[] = {
 
   /* py_register_name_identifier_request.h */
   {"register_name_identifier_request_new", register_name_identifier_request_new, METH_VARARGS},
-  {"register_name_identifier_request_change_attribute_names_identifiers",
-       register_name_identifier_request_change_attribute_names_identifiers, METH_VARARGS},
+  {"register_name_identifier_request_rename_attributes_for_query", register_name_identifier_request_rename_attributes_for_query, METH_VARARGS},
 
   /* py_register_name_identifier_response.h */
-  {"register_name_identifier_response_new", register_name_identifier_response_new, METH_VARARGS},
+  {"register_name_identifier_response_new_from_request_soap",  register_name_identifier_response_new_from_request_soap,  METH_VARARGS},
+  {"register_name_identifier_response_new_from_soap",          register_name_identifier_response_new_from_soap,          METH_VARARGS},
+  {"register_name_identifier_response_new_from_dump",          register_name_identifier_response_new_from_dump,          METH_VARARGS},
+  {"register_name_identifier_response_new_from_request_query", register_name_identifier_response_new_from_request_query, METH_VARARGS},
+  {"register_name_identifier_response_new_from_query",         register_name_identifier_response_new_from_query,         METH_VARARGS},
+
 
   /* py_request.h */
 /*   {"request_create", request_create, METH_VARARGS}, */
diff --git a/python/protocols/py_register_name_identifier_request.c b/python/protocols/py_register_name_identifier_request.c
index 4d6081be..537bbddd 100644
--- a/python/protocols/py_register_name_identifier_request.c
+++ b/python/protocols/py_register_name_identifier_request.c
@@ -82,18 +82,52 @@ PyObject *register_name_identifier_request_new(PyObject *self, PyObject *args) {
   return (LassoRegisterNameIdentifierRequest_wrap(LASSO_REGISTER_NAME_IDENTIFIER_REQUEST(request)));
 }
 
-PyObject *register_name_identifier_request_change_attribute_names_identifiers(PyObject *self, PyObject *args){
+PyObject *register_name_identifier_request_rename_attributes_for_query(PyObject *self, PyObject *args){
   PyObject *request_obj;
 
-  if (CheckArgs(args, "O:register_name_identifier_request_change_attribute_names_identifiers")) {
-    if(!PyArg_ParseTuple(args, (char *) "O:register_name_identifier_request_change_attribute_names_identifiers",
+  if (CheckArgs(args, "O:register_name_identifier_request_rename_attributes_for_query")) {
+    if(!PyArg_ParseTuple(args, (char *) "O:register_name_identifier_request_rename_attributes_for_query",
 			 &request_obj))
       return NULL;
   }
   else return NULL;
      
-  lasso_register_name_identifier_change_attribute_names_identifiers(LassoRegisterNameIdentifierRequest_get(request_obj));
+  lasso_register_name_identifier_rename_attributes_for_query(LassoRegisterNameIdentifierRequest_get(request_obj));
   
   Py_INCREF(Py_None);
   return (Py_None);
 }
+
+PyObject *register_name_identifier_request_new_from_soap(PyObject *self, PyObject *args) {
+  const xmlChar *soap_buffer;
+
+  LassoNode     *request;
+
+  if (CheckArgs(args, "S:register_name_identifier_request_new_from_soap")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_request_new_from_soap",
+			 &soap_buffer))
+      return NULL;
+  }
+  else return NULL;
+
+  request = lasso_register_name_identifier_request_new_from_soap(soap_buffer);
+
+  return (LassoRegisterNameIdentifierRequest_wrap(LASSO_REGISTER_NAME_IDENTIFIER_REQUEST(request)));
+}
+
+PyObject *register_name_identifier_request_new_from_query(PyObject *self, PyObject *args) {
+  const xmlChar *query;
+
+  LassoNode     *request;
+
+  if (CheckArgs(args, "S:register_name_identifier_request_new_from_query")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_request_new_from_query",
+			 &query))
+      return NULL;
+  }
+  else return NULL;
+
+  request = lasso_register_name_identifier_request_new_from_query(query);
+
+  return (LassoRegisterNameIdentifierRequest_wrap(LASSO_REGISTER_NAME_IDENTIFIER_REQUEST(request)));
+}
diff --git a/python/protocols/py_register_name_identifier_request.h b/python/protocols/py_register_name_identifier_request.h
index 98d708bb..2dc1cf37 100644
--- a/python/protocols/py_register_name_identifier_request.h
+++ b/python/protocols/py_register_name_identifier_request.h
@@ -37,6 +37,9 @@ typedef struct {
 PyObject *LassoRegisterNameIdentifierRequest_wrap(LassoRegisterNameIdentifierRequest *request);
 
 PyObject *register_name_identifier_request_new(PyObject *self, PyObject *args);
-PyObject *register_name_identifier_request_change_attribute_names_identifiers(PyObject *self, PyObject *args);
+PyObject *register_name_identifier_request_rename_attributes_for_query(PyObject *self, PyObject *args);
+
+PyObject *register_name_identifier_request_new_from_soap(PyObject *self, PyObject *args);
+PyObject *register_name_identifier_request_new_from_query(PyObject *self, PyObject *args);
 
 #endif /* __PYLASSO_PY_REGISTER_NAME_IDENTIFIER_REQUEST_H__ */
diff --git a/python/protocols/py_register_name_identifier_response.c b/python/protocols/py_register_name_identifier_response.c
index 4f8d50fd..854ac87f 100644
--- a/python/protocols/py_register_name_identifier_response.c
+++ b/python/protocols/py_register_name_identifier_response.c
@@ -42,23 +42,97 @@ PyObject *LassoRegisterNameIdentifierResponse_wrap(LassoRegisterNameIdentifierRe
 
 /******************************************************************************/
 
-PyObject *register_name_identifier_response_new(PyObject *self, PyObject *args) {
+PyObject *register_name_identifier_response_new_from_request_soap(PyObject *self, PyObject *args) {
+  const xmlChar *request_soap_dump;
   const xmlChar *providerID;
-  const xmlChar *statusCodeValue;
-  PyObject      *request_obj;
-  LassoNode     *response;
+  const xmlChar *status_code_value;
 
-  if (CheckArgs(args, "SSO:register_name_identifier_response_new")) {
-    if(!PyArg_ParseTuple(args, (char *) "ssO:register_name_identifier_response_new",
+  LassoNode *response = NULL;
+
+  if (CheckArgs(args, "SSS:register_name_identifier_response_new_from_request_soap")) {
+    if(!PyArg_ParseTuple(args, (char *) "sss:register_name_identifier_response_new_from_request_soap",
+			 &request_soap_dump,
 			 &providerID,
-			 &statusCodeValue, &request_obj))
+			 &status_code_value))
+      return NULL;
+  }
+  else return NULL;
+
+  response = lasso_register_name_identifier_response_new_from_request_soap(request_soap_dump,
+									   providerID,
+									   status_code_value);
+
+  return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
+}
+
+PyObject *register_name_identifier_response_new_from_soap(PyObject *self, PyObject *args) {
+  const xmlChar *request_soap_dump;
+
+  LassoNode *response = NULL;
+
+  if (CheckArgs(args, "S:register_name_identifier_response_new_from_soap")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_response_new_from_soap",
+			 &request_soap_dump))
+      return NULL;
+  }
+  else return NULL;
+
+  response = lasso_register_name_identifier_response_new_from_soap(request_soap_dump);
+
+  return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
+}
+
+PyObject *register_name_identifier_response_new_from_dump(PyObject *self, PyObject *args) {
+  const xmlChar *dump;
+
+  LassoNode *response = NULL;
+
+  if (CheckArgs(args, "S:register_name_identifier_response_new_from_dump")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_response_new_from_dump",
+			 &dump))
+      return NULL;
+  }
+  else return NULL;
+
+  response = lasso_register_name_identifier_response_new_from_soap(dump);
+
+  return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
+}
+
+PyObject *register_name_identifier_response_new_from_request_query(PyObject *self, PyObject *args) {
+  const xmlChar *query;
+  const xmlChar *providerID;
+  const xmlChar *status_code_value;
+
+  LassoNode *response = NULL;
+
+  if (CheckArgs(args, "SSS:register_name_identifier_response_new_from_request_query")) {
+    if(!PyArg_ParseTuple(args, (char *) "sss:register_name_identifier_response_new_from_request_query",
+			 &query,
+			 &providerID,
+			 &status_code_value))
+      return NULL;
+  }
+  else return NULL;
+
+  response = lasso_register_name_identifier_response_new_from_request_query(query, providerID, status_code_value);
+
+  return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
+}
+
+PyObject *register_name_identifier_response_new_from_query(PyObject *self, PyObject *args) {
+  const xmlChar *query;
+
+  LassoNode *response = NULL;
+
+  if (CheckArgs(args, "S:register_name_identifier_response_new_from_request_query")) {
+    if(!PyArg_ParseTuple(args, (char *) "s:register_name_identifier_response_new_from_request_query",
+			 &query))
       return NULL;
   }
   else return NULL;
 
-  response = lasso_register_name_identifier_response_new(providerID,
-							 statusCodeValue,
-							 LassoRegisterNameIdentifierRequest_get(request_obj));
+  response = lasso_register_name_identifier_response_new_from_query(query);
 
   return (LassoRegisterNameIdentifierResponse_wrap(LASSO_REGISTER_NAME_IDENTIFIER_RESPONSE(response)));
 }
diff --git a/python/protocols/py_register_name_identifier_response.h b/python/protocols/py_register_name_identifier_response.h
index 05e137cf..d2ae6c81 100644
--- a/python/protocols/py_register_name_identifier_response.h
+++ b/python/protocols/py_register_name_identifier_response.h
@@ -36,6 +36,11 @@ typedef struct {
 #define LassoRegisterNameIdentifierResponse_get(v) (((v) == Py_None) ? NULL : (((LassoRegisterNameIdentifierResponse_object *)(PyObject_GetAttr(v, PyString_FromString("_o"))))->obj))
 PyObject *LassoRegisterNameIdentifierResponse_wrap(LassoRegisterNameIdentifierResponse *response);
 
-PyObject *register_name_identifier_response_new(PyObject *self, PyObject *args);
+PyObject *register_name_identifier_response_new_from_request_soap(PyObject *self, PyObject *args);
+PyObject *register_name_identifier_response_new_from_soap(PyObject *self, PyObject *args);
+PyObject *register_name_identifier_response_new_from_dump(PyObject *self, PyObject *args);
+PyObject *register_name_identifier_response_new_from_request_query(PyObject *self, PyObject *args);
+PyObject *register_name_identifier_response_new_from_query(PyObject *self, PyObject *args);
+
 
 #endif /* __PYLASSO_PY_REGISTER_NAME_IDENTIFIER_RESPONSE_H__ */