CallLocator schema and deserializer change based on latest swagger.

Author: zihzhan-msft

sdk/communication/azure-communication-callingserver/azure/communication/callingserver/_communication_call_locator_serializer.py

@@ -44,8 +44,8 @@ def deserialize_call_locator(call_locator_model):
     :return: CallLocator
     """
 
-    if call_locator_model.group_call_locator:
-        return GroupCallLocator(call_locator_model.group_call_locator.group_id)
-    if call_locator_model.server_call_locator:
-        return ServerCallLocator(call_locator_model.server_call_locator.server_call_id)
+    if call_locator_model.group_call_id and call_locator_model.kind == "groupCallLocator":
+        return GroupCallLocator(call_locator_model.group_call_id)
+    if call_locator_model.server_call_id and call_locator_model.kind == "serverCallLocator":
+        return ServerCallLocator(call_locator_model.server_call_id)
     return None

sdk/communication/azure-communication-callingserver/azure/communication/callingserver/_models.py

@@ -24,8 +24,8 @@
 class CallLocatorKind(with_metaclass(CaseInsensitiveEnumMeta, str, Enum)):
     """Call Locator Kind."""
 
-    GROUP_CALL_LOCATOR = "group_call_locator"
-    SERVER_CALL_LOCATOR = "server_call_locator"
+    GROUP_CALL_LOCATOR = "groupCallLocator"
+    SERVER_CALL_LOCATOR = "serverCallLocator"
 
 class CallLocator(object):
     """Call Locator.
@@ -34,14 +34,10 @@ class CallLocator(object):
     :vartype kind: str or CallLocatorKind
     :ivar Mapping[str, Any] properties: The properties of the locator.
     """
+    id = None  # type: Optional[str]
     kind = None  # type: Optional[Union[CallLocatorKind, str]]
     properties = {}  # type: Mapping[str, Any]
 
-GroupCallProperties = TypedDict(
-    'GroupCallProperties',
-    id=str
-)
-
 class GroupCallLocator(CallLocator):
     """The group call locator.
 
@@ -62,13 +58,8 @@ def __init__(self, id):
         # type: (str) -> None
         if not id:
             raise ValueError("id can not be None or empty")
-
-        self.properties = GroupCallProperties(id=id)
-
-ServerCallProperties = TypedDict(
-    'ServerCallProperties',
-    id=str
-)
+        self.id = id
+        self.properties = {}
 
 class ServerCallLocator(CallLocator):
     """The server call locator.
@@ -90,8 +81,8 @@ def __init__(self, id):
         # type: (str) -> None
         if not id:
             raise ValueError("id can not be None or empty")
-
-        self.properties = ServerCallProperties(id=id)
+        self.id = id
+        self.properties = {}
 
 class CreateCallOptions(object):
     """The options for creating a call.