Merge remote-tracking branch 'origin/feature/openapi-generator-sdk' into DX-2897

Author: brianluisgomez

bandwidth/model/bxml/terminal_verb.py

@@ -1,29 +1,26 @@
 """
-verb.py
+terminal_verb.py
 
-Defines the base verb class for all BXML verbs
+Defines the terminal_verb class BXML verbs that cant have nested_verbs
 
 @copyright Bandwidth INC
 """
-from typing import List
-
 from .verb import Verb
 
 
 class TerminalVerb(Verb):
     """Base class for BXML verbs
     """
 
-    def __init__(self, tag: str, content: str = None, attributes: dict = None, nested_verbs: List[Verb] = None):
+    def __init__(self, tag: str, content: str = None, attributes: dict = None):
         """Initialize the verb model
 
         Args:
             tag (str): Name of the XML element
             content (str, optional): XML element content. Defaults to None.
             attributes (dict, optional): XML element attributes. Defaults to None.
-            nested_verbs (list[BxmlVerb], optional): XML element children. Defaults to None.
         """
-        super().__init__(tag=tag, content=content, attributes=attributes, nested_verbs=nested_verbs)
+        super().__init__(tag=tag, content=content, attributes=attributes, nested_verbs=None)
 
     def add_verb(self, verb: Verb):
         """Adding verbs is not allowed for this class

bandwidth/model/bxml/verbs/bridge.py

@@ -41,24 +41,37 @@ def __init__(
             fallback_password (str, optional): _description_. Defaults to None.
             tag (str, optional): _description_. Defaults to None.
         """
+        self.target_call = target_call
+        self.bridge_complete_url = bridge_complete_url
+        self.bridge_complete_method = bridge_complete_method
+        self.bridge_complete_fallback_url = bridge_complete_fallback_url
+        self.bridge_complete_fallback_method = bridge_complete_fallback_method
+        self.bridge_target_complete_url = bridge_target_complete_url
+        self.bridge_target_complete_method = bridge_target_complete_method
+        self.bridge_target_complete_fallback_url = bridge_target_complete_fallback_url
+        self.bridge_target_complete_fallback_method = bridge_target_complete_fallback_method
+        self.username = username
+        self.password = password
+        self.fallback_username = fallback_username
+        self.fallback_password = fallback_password
+        self.tag = tag
         self.attributes = {
-            "bridgeCompleteUrl": bridge_complete_url,
-            "bridgeCompleteMethod": bridge_complete_method,
-            "bridgeCompleteFallbackUrl": bridge_complete_fallback_url,
-            "bridgeCompleteFallbackMethod": bridge_complete_fallback_method,
-            "bridgeTargetCompleteUrl": bridge_target_complete_url,
-            "bridgeTargetCompleteMethod": bridge_target_complete_method,
-            "bridgeTargetCompleteFallback_url": bridge_target_complete_fallback_url,
-            "bridgeTargetCompleteFallbackMethod": bridge_target_complete_fallback_method,
-            "username": username,
-            "password": password,
-            "fallbackUsername": fallback_username,
-            "fallbackUassword": fallback_password,
-            "tag": tag
+            "bridgeCompleteUrl": self.bridge_complete_url,
+            "bridgeCompleteMethod": self.bridge_complete_method,
+            "bridgeCompleteFallbackUrl": self.bridge_complete_fallback_url,
+            "bridgeCompleteFallbackMethod": self.bridge_complete_fallback_method,
+            "bridgeTargetCompleteUrl": self.bridge_target_complete_url,
+            "bridgeTargetCompleteMethod": self.bridge_target_complete_method,
+            "bridgeTargetCompleteFallback_url": self.bridge_target_complete_fallback_url,
+            "bridgeTargetCompleteFallbackMethod": self.bridge_target_complete_fallback_method,
+            "username": self.username,
+            "password": self.password,
+            "fallbackUsername": self.fallback_username,
+            "fallbackPassword": self.fallback_password,
+            "tag": self.tag
         }
         super().__init__(
             tag="Bridge",
-            content=target_call,
-            attributes=self.attributes,
-            nested_verbs=None
+            content=self.target_call,
+            attributes=self.attributes
         )

bandwidth/model/bxml/verbs/phone_number.py

@@ -32,22 +32,33 @@ def __init__(
             fallback_password (str, optional): The password to send in the HTTP request to transferAnswerFallbackUrl. Defaults to None.
             tag (str, optional):  A custom string that will be sent with these and all future callbacks unless overwritten by a future tag attribute or cleared. May be cleared by setting tag="" Max length 256 characters. Defaults to None.
         """
+        self.number = number
+        self.transfer_answer_url = transfer_answer_url
+        self.transfer_answer_method = transfer_answer_method
+        self.transfer_answer_fallback_url = transfer_answer_fallback_url
+        self.transfer_answer_fallback_method = transfer_answer_fallback_method
+        self.transfer_disconnect_url = transfer_disconnect_url
+        self.transfer_disconnect_method = transfer_disconnect_method
+        self.username = username
+        self.password = password
+        self.fallback_username = fallback_username
+        self.fallback_password = fallback_password
+        self.tag = tag
         self.attributes = {
-            "transferAnswerUrl": transfer_answer_url,
-            "transferAnswerMethod": transfer_answer_method,
-            "transferAnswerFallbackUrl": transfer_answer_fallback_url,
-            "transferAnswerFallbackMethod": transfer_answer_fallback_method,
-            "transferDisconnectUrl": transfer_disconnect_url,
-            "transferDisconnectMethod": transfer_disconnect_method,
-            "username": username,
-            "password": password,
-            "fallbackUsername": fallback_username,
-            "fallbackPassword": fallback_password,
-            "tag": tag
+            "transferAnswerUrl": self.transfer_answer_url,
+            "transferAnswerMethod": self.transfer_answer_method,
+            "transferAnswerFallbackUrl": self.transfer_answer_fallback_url,
+            "transferAnswerFallbackMethod": self.transfer_answer_fallback_method,
+            "transferDisconnectUrl": self.transfer_disconnect_url,
+            "transferDisconnectMethod": self.transfer_disconnect_method,
+            "username": self.username,
+            "password": self.password,
+            "fallbackUsername": self.fallback_username,
+            "fallbackPassword": self.fallback_password,
+            "tag": self.tag
         }
         super().__init__(
             tag="PhoneNumber",
-            content=number,
-            attributes=self.attributes,
-            nested_verbs=None
+            content=self.number,
+            attributes=self.attributes
         )

bandwidth/model/bxml/verbs/sip_uri.py

@@ -33,23 +33,35 @@ def __init__(
             fallback_password (str, optional): The password to send in the HTTP request to transferAnswerFallbackUrl. Defaults to None.
             tag (str, optional):  A custom string that will be sent with these and all future callbacks unless overwritten by a future tag attribute or cleared. May be cleared by setting tag="" Max length 256 characters. Defaults to None.
         """
+        self.uri = uri
+        self.uui = uui
+        self.transfer_answer_url = transfer_answer_url
+        self.transfer_answer_method = transfer_answer_method
+        self.transfer_answer_fallback_url = transfer_answer_fallback_url
+        self.transfer_answer_fallback_method = transfer_answer_fallback_method
+        self.transfer_disconnect_url = transfer_disconnect_url
+        self.transfer_disconnect_method = transfer_disconnect_method
+        self.username = username
+        self.password = password
+        self.fallback_username = fallback_username
+        self.fallback_password = fallback_password
+        self.tag = tag
         self.attributes = {
             "uui": uui,
-            "transferAnswerUrl": transfer_answer_url,
-            "transferAnswerMethod": transfer_answer_method,
-            "transferAnswerFallbackUrl": transfer_answer_fallback_url,
-            "transferAnswerFallbackMethod": transfer_answer_fallback_method,
-            "transferDisconnectUrl": transfer_disconnect_url,
-            "transferDisconnectMethod": transfer_disconnect_method,
-            "username": username,
-            "password": password,
-            "fallbackUsername": fallback_username,
-            "fallbackPassword": fallback_password,
-            "tag": tag
+            "transferAnswerUrl": self.transfer_answer_url,
+            "transferAnswerMethod": self.transfer_answer_method,
+            "transferAnswerFallbackUrl": self.transfer_answer_fallback_url,
+            "transferAnswerFallbackMethod": self.transfer_answer_fallback_method,
+            "transferDisconnectUrl": self.transfer_disconnect_url,
+            "transferDisconnectMethod": self.transfer_disconnect_method,
+            "username": self.username,
+            "password": self.password,
+            "fallbackUsername": self.fallback_username,
+            "fallbackPassword": self.fallback_password,
+            "tag": self.tag
         }
         super().__init__(
             tag="SipUri",
-            content=uri,
-            attributes=self.attributes,
-            nested_verbs=None
+            content=self.uri,
+            attributes=self.attributes
         )

bandwidth/model/bxml/verbs/tag.py

@@ -16,4 +16,5 @@ def __init__(self, content=""):
         Args:
             content (str, optional): Custom tag value. Defaults to "".
         """
-        super().__init__(tag="Tag", content=content, attributes=None, nested_verbs=None)
+        self.content = content
+        super().__init__(tag="Tag", content=self.content, attributes=None)

bandwidth/model/bxml/verbs/transfer.py

@@ -15,13 +15,13 @@
 class Transfer(Verb):
 
     def __init__(
-        self, transfer_to: List[Union[PhoneNumber, SipUri]] = [], 
-        transfer_caller_id: str=None, call_timeout: str=None, 
+        self, transfer_to: List[Union[PhoneNumber, SipUri]] = [],
+        transfer_caller_id: str=None, call_timeout: str=None,
         transfer_complete_url: str=None, transfer_complete_method: str=None,
-        transfer_complete_fallback_url: str=None, 
-        transfer_complete_fallback_method: str=None, username: str=None, 
-        password: str=None, fallback_username: str=None, 
-        fallback_password: str=None, tag: str=None, 
+        transfer_complete_fallback_url: str=None,
+        transfer_complete_fallback_method: str=None, username: str=None,
+        password: str=None, fallback_username: str=None,
+        fallback_password: str=None, tag: str=None,
         diversion_treatment: str=None, diversion_reason: str=None
     ):
         """Initialize a <Transfer> verb
@@ -58,30 +58,44 @@ def __init__(
                 out-of-service
                 away
 
-                This parameter is considered only when diversionTreatment is set to stack. Defaults is unknown. 
+                This parameter is considered only when diversionTreatment is set to stack. Defaults is unknown.
                 Defaults to None.
         """
+        self.transfer_to = transfer_to
+        self.transfer_caller_id = transfer_caller_id
+        self.call_timeout = call_timeout
+        self.transfer_complete_url = transfer_complete_url
+        self.transfer_complete_method = transfer_complete_method
+        self.transfer_complete_fallback_url = transfer_complete_fallback_url
+        self.transfer_complete_fallback_method = transfer_complete_fallback_method
+        self.username = username
+        self.password = password
+        self.fallback_username = fallback_username
+        self.fallback_password = fallback_password
+        self.tag = tag
+        self.diversion_treatment = diversion_treatment
+        self.diversion_reason = diversion_reason
         self.attributes = {
-            "transferCallerId": transfer_caller_id,
-            "callTimeout": call_timeout,
-            "transferCompleteUrl": transfer_complete_url,
-            "transferCompleteMethod": transfer_complete_method,
-            "transferCompleteFallbackUrl": transfer_complete_fallback_url,
-            "transferCompleteFallbackMethod": transfer_complete_fallback_method,
-            "username": username,
-            "password": password,
-            "fallbackUsername": fallback_username,
-            "fallbackPassword": fallback_password,
-            "tag": tag,
-            "diversionTreatment": diversion_treatment,
-            "diversionReason": diversion_reason
+            "transferCallerId": self.transfer_caller_id,
+            "callTimeout": self.call_timeout,
+            "transferCompleteUrl": self.transfer_complete_url,
+            "transferCompleteMethod": self.transfer_complete_method,
+            "transferCompleteFallbackUrl": self.transfer_complete_fallback_url,
+            "transferCompleteFallbackMethod": self.transfer_complete_fallback_method,
+            "username": self.username,
+            "password": self.password,
+            "fallbackUsername": self.fallback_username,
+            "fallbackPassword": self.fallback_password,
+            "tag": self.tag,
+            "diversionTreatment": self.diversion_treatment,
+            "diversionReason": self.diversion_reason
         }
         super().__init__(
             tag="Transfer",
             content=None,
-            attributes=self.attributes, 
-            nested_verbs=transfer_to
+            attributes=self.attributes,
+            nested_verbs=self.transfer_to
         )
-    
+
     def add_transfer_recipient(self, recipient: Union[PhoneNumber, SipUri]):
         super().add_verb(recipient)