Michael Pasternak has uploaded a new change for review.
Change subject: cli: support fetching new sdk proxy
......................................................................
cli: support fetching new sdk proxy
Change-Id: I9dd0e827fd1347be5a2299abae8eeadb930c1a48
Signed-off-by: Michael Pasternak <mpast...@redhat.com>
---
M src/ovirtcli/command/connect.py
M src/ovirtcli/command/console.py
M src/ovirtcli/command/info.py
M src/ovirtcli/context.py
4 files changed, 9 insertions(+), 4 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine-cli refs/changes/27/10027/1
diff --git a/src/ovirtcli/command/connect.py b/src/ovirtcli/command/connect.py
index 52c5e08..4f24fa6 100644
--- a/src/ovirtcli/command/connect.py
+++ b/src/ovirtcli/command/connect.py
@@ -21,6 +21,7 @@
from ovirtsdk.infrastructure.errors import RequestError, NoCertificatesError, \
ConnectionError
from cli.messages import Messages
+from ovirtsdk.infrastructure.context import context as sdk_context
class ConnectCommand(OvirtCommand):
@@ -102,6 +103,9 @@
timeout=timeout if timeout != -1
else None,
debug=debug)
+ self.context.connection_proxy = \
+ sdk_context.manager[self.context.connection.id].get('proxy')
+
if context.sdk_version < MIN_FORCE_CREDENTIALS_CHECK_VERSION:
self.testConnectivity()
diff --git a/src/ovirtcli/command/console.py b/src/ovirtcli/command/console.py
index a4b7a82..590db37 100644
--- a/src/ovirtcli/command/console.py
+++ b/src/ovirtcli/command/console.py
@@ -17,8 +17,9 @@
from ovirtcli.platform import vnc, spice
from ovirtcli.command.command import OvirtCommand
-from ovirtsdk.infrastructure import contextmanager
from cli.messages import Messages
+
+from ovirtsdk.infrastructure.context import context
class ConsoleCommand(OvirtCommand):
@@ -65,7 +66,7 @@
if proto == 'vnc':
vnc.launch_vnc_viewer(host_addr, port, ticket, debug)
elif proto == 'spice':
- certurl = '%s/ca.crt' %
(contextmanager.get('proxy').get_url().replace('/api', ''))
+ certurl = '%s/ca.crt' %
(self.context.connection_proxy.get_url().replace('/api', ''))
if vm.host and vm.host.id:
host = self.get_object('host', vm.host.id)
diff --git a/src/ovirtcli/command/info.py b/src/ovirtcli/command/info.py
index d30ca26..0d8b0ae 100644
--- a/src/ovirtcli/command/info.py
+++ b/src/ovirtcli/command/info.py
@@ -20,7 +20,6 @@
import sys
from ovirtcli.utils.versionhelper import VersionHelper
-from ovirtsdk.infrastructure import contextmanager
class InfoCommand(OvirtCommand):
@@ -47,5 +46,5 @@
self.write(Messages.Info.PYTHON_VERSION %
VersionHelper.to_string((sys.version_info)))
self.write('')
- self.write(Messages.Info.BACKEND_ENTRY_POINT %
contextmanager.get('proxy').get_url())
+ self.write(Messages.Info.BACKEND_ENTRY_POINT %
self.context.connection_proxy.get_url())
self.write('')
diff --git a/src/ovirtcli/context.py b/src/ovirtcli/context.py
index c72084b..ff18ca0 100644
--- a/src/ovirtcli/context.py
+++ b/src/ovirtcli/context.py
@@ -44,6 +44,7 @@
def __init__(self, args=None, option_parser=None):
super(OvirtCliExecutionContext, self).__init__(args=args,
option_parser=option_parser)
self.connection = None
+ self.connection_proxy = None
self.formatter = create(Formatter,
self.settings['ovirt-shell:output_format'])
self.settings.add_callback('cli:verbosity', self._set_verbosity)
self.settings.add_callback('ovirt-shell:output_format',
self._set_formatter)
--
To view, visit http://gerrit.ovirt.org/10027
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9dd0e827fd1347be5a2299abae8eeadb930c1a48
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine-cli
Gerrit-Branch: master
Gerrit-Owner: Michael Pasternak <mpast...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
