Hello Dan Kenigsberg,
I'd like you to do a code review. Please visit
to review the following change.
Change subject: gluster: Fix for json-rpc issue wrt gluster commands. ......................................................................
gluster: Fix for json-rpc issue wrt gluster commands.
This patch adds spec file entry for missing apiwrapper module and moved vdsmapi-gluster-schema.json from vdsm/gluster/ to vdsm/rpc/.
Change-Id: Ia8cf744813f7bbfbf6e2bf073b28b88e0d3f304f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1124481 Signed-off-by: ndarshan dnarayan@redhat.com Reviewed-on: http://gerrit.ovirt.org/33007 Reviewed-by: Dan Kenigsberg danken@redhat.com --- M vdsm.spec.in M vdsm/gluster/Makefile.am M vdsm/rpc/Makefile.am R vdsm/rpc/vdsmapi-gluster-schema.json M vdsm/rpc/vdsmapi.py 5 files changed, 5 insertions(+), 6 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/36/33036/1
diff --git a/vdsm.spec.in b/vdsm.spec.in index c864ef0..350811e 100644 --- a/vdsm.spec.in +++ b/vdsm.spec.in @@ -1480,7 +1480,8 @@ %dir %{_datadir}/%{vdsm_name}/gluster %doc COPYING %{_datadir}/%{vdsm_name}/gluster/api.py* -%{_datadir}/%{vdsm_name}/gluster/vdsmapi-gluster-schema.json +%{_datadir}/%{vdsm_name}/gluster/apiwrapper.py* +%{_datadir}/%{vdsm_name}/rpc/vdsmapi-gluster-schema.json %{_datadir}/%{vdsm_name}/gluster/gfapi.py* %{_datadir}/%{vdsm_name}/gluster/hooks.py* %{_datadir}/%{vdsm_name}/gluster/services.py* diff --git a/vdsm/gluster/Makefile.am b/vdsm/gluster/Makefile.am index 3c307aa..d1d3ebf 100644 --- a/vdsm/gluster/Makefile.am +++ b/vdsm/gluster/Makefile.am @@ -29,16 +29,13 @@ dist_vdsmgluster_PYTHON = \ __init__.py \ api.py \ + apiwrapper.py \ cli.py \ exception.py \ gfapi.py \ hooks.py \ services.py \ tasks.py \ - $(NULL) - -dist_vdsmgluster_DATA = \ - vdsmapi-gluster-schema.json \ $(NULL)
EXTRA_DIST = \ diff --git a/vdsm/rpc/Makefile.am b/vdsm/rpc/Makefile.am index 082ea81..6b10dc1 100644 --- a/vdsm/rpc/Makefile.am +++ b/vdsm/rpc/Makefile.am @@ -16,6 +16,7 @@ $(NULL)
dist_vdsmrpc_DATA = \ + vdsmapi-gluster-schema.json \ vdsmapi-schema.json \ $(NULL)
diff --git a/vdsm/gluster/vdsmapi-gluster-schema.json b/vdsm/rpc/vdsmapi-gluster-schema.json similarity index 100% rename from vdsm/gluster/vdsmapi-gluster-schema.json rename to vdsm/rpc/vdsmapi-gluster-schema.json diff --git a/vdsm/rpc/vdsmapi.py b/vdsm/rpc/vdsmapi.py index 9e4de3e..2f13ef2 100644 --- a/vdsm/rpc/vdsmapi.py +++ b/vdsm/rpc/vdsmapi.py @@ -190,7 +190,7 @@ info_key = schema if schema is None: schema = find_schema() - gluster_schema = find_schema(schema_name='gluster/vdsmapi-gluster', + gluster_schema = find_schema(schema_name='vdsmapi-gluster', raiseOnError=False)
with open(schema) as f:
Darshan N has posted comments on this change.
Change subject: gluster: Fix for json-rpc issue wrt gluster commands. ......................................................................
Patch Set 1: Verified+1
Dan Kenigsberg has posted comments on this change.
Change subject: gluster: Fix for json-rpc issue wrt gluster commands. ......................................................................
Patch Set 1: Code-Review+2
Yaniv Bronhaim has posted comments on this change.
Change subject: gluster: Fix for json-rpc issue wrt gluster commands. ......................................................................
Patch Set 1: Code-Review+2
Yaniv Bronhaim has submitted this change and it was merged.
Change subject: gluster: Fix for json-rpc issue wrt gluster commands. ......................................................................
gluster: Fix for json-rpc issue wrt gluster commands.
This patch adds spec file entry for missing apiwrapper module and moved vdsmapi-gluster-schema.json from vdsm/gluster/ to vdsm/rpc/.
Change-Id: Ia8cf744813f7bbfbf6e2bf073b28b88e0d3f304f Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1124481 Signed-off-by: ndarshan dnarayan@redhat.com Reviewed-on: http://gerrit.ovirt.org/33007 Reviewed-by: Dan Kenigsberg danken@redhat.com Reviewed-on: http://gerrit.ovirt.org/33036 Reviewed-by: Yaniv Bronhaim ybronhei@redhat.com --- M vdsm.spec.in M vdsm/gluster/Makefile.am M vdsm/rpc/Makefile.am R vdsm/rpc/vdsmapi-gluster-schema.json M vdsm/rpc/vdsmapi.py 5 files changed, 5 insertions(+), 6 deletions(-)
Approvals: Yaniv Bronhaim: Looks good to me, approved Darshan N: Verified Dan Kenigsberg: Looks good to me, approved
oVirt Jenkins CI Server has posted comments on this change.
Change subject: gluster: Fix for json-rpc issue wrt gluster commands. ......................................................................
Patch Set 2:
Build Successful
http://jenkins.ovirt.org/job/vdsm_3.5_create-rpms_merged/166/ : SUCCESS
vdsm-patches@lists.fedorahosted.org