Merge branch 'morpheus' into 'master'

* morpheus:
  MB-65344 Don't require password on xdcr-setup with full encryption

Change-Id: I2f652fa98978af8e471d66c718be31b6a3d79b4d

Author: matthallcb

cbmgr.py

@@ -5328,9 +5328,9 @@ def _set(self, opts):
             _exit_if_errors([f'--xdcr-cluster-name is required to {cmd} a cluster connection'])
         if opts.hostname is None:
             _exit_if_errors([f'--xdcr-hostname is required to {cmd} a cluster connections'])
-        if opts.username is None:
+        if opts.username is None and opts.secure_connection != "full":
             _exit_if_errors([f'--xdcr-username is required to {cmd} a cluster connections'])
-        if opts.password is None:
+        if opts.password is None and opts.secure_connection != "full":
             _exit_if_errors([f'--xdcr-password is required to {cmd} a cluster connections'])
         if (opts.encrypt is not None or opts.encryption_type is not None) and opts.secure_connection is not None:
             _exit_if_errors(["Cannot use deprecated flags --xdcr-demand-encryption or --xdcr-encryption-type with"

test/test_cli.py

@@ -3084,6 +3084,21 @@ def test_edit_xdcr(self):
         expected_params = ['name=name', 'hostname=hostname', 'username=username', 'password=pwd', 'demandEncryption=0']
         self.rest_parameter_match(expected_params)
 
+    def test_edit_xdcr_cert(self):
+        contents = 'this-is-the-cert-and-key-file'
+        cert_file = tempfile.NamedTemporaryFile(delete=False)
+        cert_file.write(contents.encode('utf-8'))
+        cert_file.close()
+
+        args = ['--xdcr-hostname', 'hostname', '--xdcr-cluster-name', 'name', '--xdcr-secure-connection', 'full',
+                '--xdcr-user-certificate', cert_file.name, '--xdcr-user-key', cert_file.name,
+                '--xdcr-certificate', cert_file.name]
+        self.no_error_run(self.command + ['--edit'] + args, self.server_args)
+        self.assertIn('POST:/pools/default/remoteClusters/name', self.server.trace)
+        expected_params = ['name=name', 'hostname=hostname', 'demandEncryption=1', 'encryptionType=full',
+                           f'clientCertificate={contents}', f'clientKey={contents}', f'certificate={contents}']
+        self.rest_parameter_match(expected_params)
+
     def test_list_xdcr(self):
         self.server_args['remote-clusters'] = [{'name': 'name', 'uuid': '1', 'hostname': 'host', 'username': 'user',
                                                 'uri': 'uri', 'deleted': False}]