Update code

Author: william051200

src/cloudservice/azext_cloudservice/commands.py

@@ -7,10 +7,13 @@
 
 def load_command_table(self, _):
     from azext_cloudservice.operations.cloud_service import CloudServiceList, CloudServiceListAll
+    from azext_cloudservice.operations.role_instance import RoleInstanceShowRemoteDesktopFile
     from azext_cloudservice.operations.update_domain import UpdateDomainWalkUpdateDomain
 
     self.command_table['cloud-service list'] = CloudServiceList(loader=self)
     self.command_table['cloud-service list-all'] = CloudServiceListAll(loader=self)
+    self.command_table['cloud-service role-instance show-remote-desktop-file'] = \
+        RoleInstanceShowRemoteDesktopFile(loader=self)
     self.command_table['cloud-service update-domain walk-update-domain'] = UpdateDomainWalkUpdateDomain(loader=self)
 
     with self.command_group('cloud-service', is_experimental=True) as g:

src/cloudservice/azext_cloudservice/operations/role_instance.py

@@ -0,0 +1,38 @@
+# --------------------------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for license information.
+# --------------------------------------------------------------------------------------------
+
+# pylint: disable=protected-access
+
+from azext_cloudservice.aaz.latest.cloud_service.role_instance._show_remote_desktop_file import \
+    ShowRemoteDesktopFile as _ShowRemoteDesktopFile
+
+
+class RoleInstanceShowRemoteDesktopFile(_ShowRemoteDesktopFile):
+    """The service returns the RDP file as application/x-rdp, not JSON."""
+
+    class CloudServiceRoleInstancesGetRemoteDesktopFile(
+            _ShowRemoteDesktopFile.CloudServiceRoleInstancesGetRemoteDesktopFile):
+
+        def __call__(self, *args, **kwargs):
+            request = self.make_request()
+            # stream=True keeps the content-decode policy from rejecting application/x-rdp
+            session = self.client.send_request(request=request, stream=True, **kwargs)
+            if session.http_response.status_code in [200]:
+                return self.on_200(session)
+            return self.on_error(session.http_response)
+
+        @property
+        def header_parameters(self):
+            return {
+                **self.serialize_header_param("Accept", "application/x-rdp"),
+            }
+
+        def on_200(self, session):
+            data = session.http_response.body().decode('utf-8')
+            self.ctx.set_var(
+                "instance",
+                data,
+                schema_builder=self._build_schema_on_200
+            )

src/cloudservice/azext_cloudservice/tests/latest/test_cloud_service_commands.py

@@ -231,13 +231,9 @@ def test_no_wait_sends_the_same_request(self):
                 reqs = self._run(command + ' --no-wait')
                 self.assertEqual([(method, path, body)], [(r['method'], r['path'], r['body']) for r in reqs])
 
-    @unittest.expectedFailure
     def test_remote_desktop_file_request(self):
         with stub_http() as rec:
-            try:
-                self.cmd('cloud-service role-instance show-remote-desktop-file ' + RI)
-            except Exception:  # pylint: disable=broad-except
-                pass  # output handling is covered separately
+            self.cmd('cloud-service role-instance show-remote-desktop-file ' + RI)
         self.assertEqual(1, len(rec.requests))
         self.assertEqual('GET', rec.requests[0]['method'])
         self.assertEqual(BASE + '/cs1/roleInstances/ri1/remoteDesktopFile', rec.requests[0]['path'])
@@ -339,8 +335,6 @@ def test_lro_commands_return_resource_or_nothing(self):
             self.assertEqual('', self.cmd('cloud-service delete ' + SVC + ' -y').output.strip())
             self.assertEqual('', self.cmd('cloud-service restart ' + SVC).output.strip())
 
-    # Known gap: the generated command cannot decode application/x-rdp
-    @unittest.expectedFailure
     def test_remote_desktop_file_returns_rdp_text(self):
         with stub_http():
             result = self.cmd('cloud-service role-instance show-remote-desktop-file ' + RI).output