Change in vdsm[master]: Revert "tests: functional - convert to run over jsonrpc" - vdsm-patches - Fedora Mailing-Lists

Monday, 24 August 2015

Piotr Kliczewski has uploaded a new change for review.

Change subject: Revert "tests: functional - convert to run over jsonrpc"
......................................................................

Revert "tests: functional - convert to run over jsonrpc"

Due to regression we need to revert this patch.

This reverts commit 9d5a4671e6ee5b7d70e849dc54591d9e21fb1ef3.

Change-Id: Ib45fbaa84e25e3c72aa09bfa78c16dd700e6e957
Signed-off-by: pkliczewski <piotr.kliczewski(a)gmail.com&gt;
---
M lib/vdsm/jsonrpcvdscli.py
M lib/vdsm/response.py
M tests/functional/utils.py
3 files changed, 17 insertions(+), 58 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/66/45266/1

diff --git a/lib/vdsm/jsonrpcvdscli.py b/lib/vdsm/jsonrpcvdscli.py
index 6e65e0d..eeab1df 100644
--- a/lib/vdsm/jsonrpcvdscli.py
+++ b/lib/vdsm/jsonrpcvdscli.py
@@ -33,33 +33,17 @@
 
 
 _COMMAND_CONVERTER = {
-    'addNetwork': 'Host.addNetwork',
-    'create': 'VM.create',
-    'delNetwork': 'Host.delNetwork',
-    'destroy': 'VM.destroy',
-    'editNetwork': 'Host.editNetwork',
-    'getAllVmStats': 'Host.getAllVmStats',
-    'getVdsCapabilities': 'Host.getCapabilities',
-    'getVdsStats': 'Host.getStats',
-    'getVmStats': 'VM.getStats',
-    'list': 'Host.getVMList',
-    'migrationCreate': 'VM.migrationCreate',
     'ping': 'Host.ping',
-    'setBalloonTarget': 'VM.setBalloonTarget',
-    'setCpuTunePeriod': 'VM.setCpuTunePeriod',
-    'setCpuTuneQuota': 'VM.setCpuTuneQuota',
-    'setMOMPolicy': 'Host.setMOMPolicy',
-    'setSafeNetworkConfig': 'Host.setSafeNetworkConfig',
-    'setupNetworks': 'Host.setupNetworks',
-    'updateVmPolicy': 'VM.updateVmPolicy',
+    'destroy': 'VM.destroy',
+    'getVmStats': 'VM.getStats',
+    'migrationCreate': 'VM.migrationCreate',
 }
 
 
 class _Server(object):
 
-    def __init__(self, client, compat):
+    def __init__(self, client):
         self._client = client
-        self._compat = compat
 
     def _callMethod(self, methodName, *args):
         try:
@@ -80,9 +64,6 @@
             return response.error_raw(resp.error["code"],
                                       resp.error["message"])
 
-        if not self._compat:
-            return response.success_raw(resp.result)
-
         if resp.result and resp.result is not True:
             # None is translated to True inside our JSONRPC implementation
             return response.success(**resp.result)
@@ -91,11 +72,6 @@
 
     def migrationCreate(self, params):
         return self._callMethod('migrationCreate',
-                                params['vmId'],
-                                params)
-
-    def create(self, params):
-        return self._callMethod('create',
                                 params['vmId'],
                                 params)
 
@@ -131,7 +107,7 @@
 def connect(requestQueue, stompClient=None,
             host=None, port=None,
             useSSL=None,
-            responseQueue=None, compat=True):
+            responseQueue=None):
     if not stompClient:
         client = _create(requestQueue,
                          host, port, useSSL,
@@ -143,4 +119,4 @@
             str(uuid4())
         )
 
-    return _Server(client, compat)
+    return _Server(client)
diff --git a/lib/vdsm/response.py b/lib/vdsm/response.py
index 160898f..62ed49e 100644
--- a/lib/vdsm/response.py
+++ b/lib/vdsm/response.py
@@ -41,21 +41,6 @@
     return kwargs
 
 
-def success_raw(result=None, message=None):
-    ret = {
-        'status':
-            {
-                "code": doneCode["code"],
-                "message": message or doneCode["message"],
-            }
-    }
-
-    if result:
-        ret['result'] = result
-
-    return ret
-
-
 def error(name, message=None):
     status = errCode[name]["status"]
     return {
diff --git a/tests/functional/utils.py b/tests/functional/utils.py
index 26562aa..6bd8dd9 100644
--- a/tests/functional/utils.py
+++ b/tests/functional/utils.py
@@ -26,9 +26,9 @@
 from vdsm.config import config
 from vdsm.utils import retry
 from vdsm import ipwrapper
-from vdsm import jsonrpcvdscli
 from vdsm import netinfo
 from vdsm import supervdsm
+from vdsm import vdscli
 from vdsm.netconfpersistence import RunningConfig
 
 
@@ -71,9 +71,7 @@
         retry(self.start, (socket.error, KeyError), tries=30)
 
     def start(self):
-        requestQueues = config.get('addresses', 'request_queues')
-        requestQueue = requestQueues.split(",")[0]
-        self.vdscli = jsonrpcvdscli.connect(requestQueue, compat=False)
+        self.vdscli = vdscli.connect()
         self.netinfo = self._get_netinfo()
         if config.get('vars', 'net_persistence') == 'unified':
             self.config = RunningConfig()
@@ -206,40 +204,40 @@
 
     def getVdsStats(self):
         result = self.vdscli.getVdsStats()
-        return _parse_result(result, True)
+        return _parse_result(result, 'info')
 
     def getAllVmStats(self):
         result = self.vdscli.getAllVmStats()
-        return _parse_result(result, True)
+        return _parse_result(result, 'statsList')
 
     def getVmStats(self, vmId):
         result = self.vdscli.getVmStats(vmId)
-        if 'result' in result:
-            code, msg, stats = _parse_result(result, True)
+        if 'statsList' in result:
+            code, msg, stats = _parse_result(result, 'statsList')
             return code, msg, stats[0]
         else:
             return _parse_result(result)
 
     def getVmList(self, vmId):
         result = self.vdscli.list('true', [vmId])
-        code, msg, vm_list = _parse_result(result, True)
+        code, msg, vm_list = _parse_result(result, 'vmList')
         return code, msg, vm_list[0]
 
     def getVdsCapabilities(self):
         result = self.vdscli.getVdsCapabilities()
-        return _parse_result(result, True)
+        return _parse_result(result, 'info')
 
     def updateVmPolicy(self, vmId, vcpuLimit):
         result = self.vdscli.updateVmPolicy([vmId, vcpuLimit])
         return _parse_result(result)
 
 
-def _parse_result(result, return_value=False):
+def _parse_result(result, return_value=None):
     status = result['status']
     code = status['code']
     msg = status['message']
 
-    if code == SUCCESS and return_value:
-        return code, msg, result['result']
+    if code == SUCCESS and return_value is not None:
+        return code, msg, result[return_value]
     else:
         return code, msg


-- 
To view, visit https://gerrit.ovirt.org/45266
To unsubscribe, visit https://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib45fbaa84e25e3c72aa09bfa78c16dd700e6e957
Gerrit-PatchSet: 1
Gerrit-Project: vdsm
Gerrit-Branch: master
Gerrit-Owner: Piotr Kliczewski <piotr.kliczewski(a)gmail.com&gt;

    

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

Change in vdsm[master]: Revert "tests: functional - convert to run over jsonrpc"