Yaniv Bronhaim has posted comments on this change.
Change subject: schema: rpm for jsonrpc schema files ......................................................................
Patch Set 3: Code-Review-1
(9 comments)
https://gerrit.ovirt.org/#/c/45750/3//COMMIT_MSG Commit Message:
Line 8: Line 9: We need to use schema files outside of vdsm for external clients and in Line 10: the future for the engine. In order to do it we need to have separate Line 11: rpm which provides required files. Line 12: explain what you do in the patch - where you install the api files, what's the name of the new package and so on Line 13: Change-Id: I13d6291ddbf5bf7d8e6a0956db3300cd0c45e563
https://gerrit.ovirt.org/#/c/45750/3/lib/api/Makefile.am File lib/api/Makefile.am:
Line 1: # Line 2: # Copyright 2008-2015 Red Hat, Inc. only 2015 Line 3: # Line 4: # This program is free software; you can redistribute it and/or modify Line 5: # it under the terms of the GNU General Public License as published by Line 6: # the Free Software Foundation; either version 2 of the License, or
Line 17: # Line 18: # Refer to the README and COPYING files for full details of the license Line 19: # Line 20: Line 21: vdsmpyrpcdir = $(pythondir)/api you don't install it in pythondir... Line 22: vdsmrpcdir = $(vdsmdir)/rpc Line 23: Line 24: CLEANFILES = \ Line 25: vdsm-api.html \
https://gerrit.ovirt.org/#/c/45750/3/lib/api/__init__.py File lib/api/__init__.py:
Line 1: # Line 2: # Copyright 2012 Red Hat, Inc. 2015 Line 3: # Line 4: # This program is free software; you can redistribute it and/or modify Line 5: # it under the terms of the GNU General Public License as published by Line 6: # the Free Software Foundation; either version 2 of the License, or
https://gerrit.ovirt.org/#/c/45750/3/vdsm.spec.in File vdsm.spec.in:
Line 260: An XMLRPC interface for interacting with vdsmd. Primary control interface for Line 261: ovirt-engine and vdsClient. Line 262: Line 263: %package api Line 264: Summary: VDSM api in the summary and description use capital letters - I'd write VDSM API schema Line 265: Line 266: %description api Line 267: Contains api schema files Line 268:
Line 303: Manager. Line 304: Line 305: %package python Line 306: Summary: VDSM python libraries Line 307: Requires: %{name}-infra = %{version}-%{release} put it here Line 308: Requires: python-cpopen >= 1.2.3-5 Line 309: Requires: m2crypto Line 310: Requires: python-ioprocess >= 0.14 Line 311: Requires: %{name}-api = %{version}-%{release}
Line 1353: %files api Line 1354: %doc lib/api/vdsm-api.html Line 1355: %{_datadir}/%{vdsm_name}/rpc/vdsmapi-schema.json Line 1356: %{python_sitelib}/api/vdsmapi.py* Line 1357: %{python_sitelib}/api/__init__.py* didn't you mean %{python_sitelib}/%{vdsm_name} ? and where do you create the api folder? Line 1358: %if ! 0%{?with_gluster} Line 1359: %exclude %{_datadir}/%{vdsm_name}/rpc/vdsmapi-gluster-schema.json Line 1360: %endif Line 1361:
Line 1362: %files yajsonrpc Line 1363: %dir %{python_sitelib}/yajsonrpc Line 1364: %{python_sitelib}/yajsonrpc/betterAsyncore.py* Line 1365: %{python_sitelib}/yajsonrpc/stomp.py* Line 1366: %{python_sitelib}/yajsonrpc/stompreactor.py* how did I miss this ^ ? :/ Line 1367: Line 1368: %files infra Line 1369: %{python_sitelib}/%{vdsm_name}/infra/eventfd/__init__.py* Line 1370: %{python_sitelib}/%{vdsm_name}/infra/filecontrol/__init__.py*
https://gerrit.ovirt.org/#/c/45750/3/vdsm/rpc/Bridge.py File vdsm/rpc/Bridge.py:
Line 20: import types Line 21: Line 22: import API Line 23: import yajsonrpc Line 24: from api import vdsmapi much reasoable to have "from vdsm import schema-api" Line 25: Line 26: from vdsm.netinfo import getDeviceByIP Line 27: Line 28: try: