Change in vdsm[master]: schema: rpm for jsonrpc schema files

[Piotr Kliczewski]

Piotr Kliczewski has uploaded a new change for review.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

schema: rpm for jsonrpc schema files

We need to use schema files outside of vdsm for external clients and in
the future for the engine. In order to do it we need to have separate
rpm which provides required files.

Change-Id: I13d6291ddbf5bf7d8e6a0956db3300cd0c45e563
Signed-off-by: pkliczewski 
---
M configure.ac
M lib/Makefile.am
R lib/api/process-schema.py
A lib/api/vdsm-api.html
R lib/api/vdsmapi-gluster-schema.json
R lib/api/vdsmapi-schema.json
R lib/api/vdsmapi.py
M tests/schemaTests.py
M tests/schemaValidationTest.py
M tests/vmApiTests.py
M vdsm.spec.in
M vdsm/rpc/Bridge.py
M vdsm/rpc/Makefile.am
13 files changed, 6,201 insertions(+), 39 deletions(-)

git pull ssh://gerrit.ovirt.org:29418/vdsm refs/changes/50/45750/1

[e-mail] has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 1:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 1: Verified+1

Verified by updating existing vdsm with new rpm and seeing that communication still works.

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 1:

CI failure not related to this patch.

[e-mail] has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 2:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 2: Verified+1

Actually failure was related to this patch. I forgot to git add 2 files. Verification flag copied from previous patch set.

Yeela Kaplan has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 2:

Is vsdm-api.html on purpose?

Yeela Kaplan has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 2: Code-Review-1

I think you forgot to remove vdsm/rpc/vdsm-api.html

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 2:

vdsm-api.html is generated during the build from schema file. From where do you want me to remove it?

Yeela Kaplan has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 2:

If it is generated during the build, why is it added as a file to this patch?

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 2:

Good catch will remove it.

[e-mail] has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3: Verified+1

Removed generated file, no other changes. Copying verification flag from previous patch set.

Yeela Kaplan has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3: Code-Review+1

Yeela Kaplan has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3: Verified+1

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:

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3:

(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

Done
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

Done
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...

I install what it needs to be used by both side. Everything else is in the directories as it was before.
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

Done
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 sch

Done
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

Done
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 th

Where do you see %{python_sitelib}/%{vdsm_name}?
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 ^ ? :/

What do you mean?
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"

Can you please explain what you mean?
Line 25: 
Line 26: from vdsm.netinfo import getDeviceByIP
Line 27: 
Line 28: try:

Yaniv Bronhaim has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3:

(2 comments)

https://gerrit.ovirt.org/#/c/45750/3/vdsm.spec.in
File vdsm.spec.in:

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*
> Where do you see %{python_sitelib}/%{vdsm_name}?

it should be there .. site-packages/api sounds odd? what api? api package?
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*
> What do you mean?

do you intentionally want it out of vdsm packages? why? I'd expect it be also under vdsm as vdsm subpackage..
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*

Ondřej Svoboda has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3:

Piotr, please note that I updated your https://gerrit.ovirt.org/#/c/45429/7 so please cherry-pick it on top of this patch when you push a new version of this one.

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3:

(2 comments)

https://gerrit.ovirt.org/#/c/45750/3/vdsm.spec.in
File vdsm.spec.in:

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*
> it should be there .. site-packages/api sounds odd? what api? api package?

There is new api package. Why it is odd?
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*
> do you intentionally want it out of vdsm packages? why? I'd expect it be al

This one like this since day one so I think we should not change it now.
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*

[e-mail] has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 4:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

Yaniv Bronhaim has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3:

(2 comments)

https://gerrit.ovirt.org/#/c/45750/3/vdsm.spec.in
File vdsm.spec.in:

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*
> There is new api package. Why it is odd?

generic api package? what other projects will use this site-package and install its api scheme to it?
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*
> This one like this since day one so I think we should not change it now.

this can maybe be used by other projects as well.. so having yajsonrpc package can be reasonable.

but "from api import vdsm" sounds wrong to me
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*

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3:

(2 comments)

https://gerrit.ovirt.org/#/c/45750/3/vdsm.spec.in
File vdsm.spec.in:

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*
> generic api package? what other projects will use this site-package and ins

I have two usage cases in mind now:
1. Using standalone client on a machine where there is no vdsm
2. Use schema for engine side communication layer validation.
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*
> this can maybe be used by other projects as well.. so having yajsonrpc pack

My goal was to minimize code changes so I have decided to have it in vdsm/api. Whichever use case we choose it is always api that vdsm exposes. What is you suggestion for naming?
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*

Ondřej Svoboda has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 4: Code-Review+1

I like it this way.

Francesco Romani has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 4:

I agree with the direction of this patch. I wonder if this belongs under lib/ or if we should just have a new top level subdirectory api/
(just rename lib/api/ -> api/).

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 4:

I am ok with both approaches. I would like to get more opinions and leave or change this patch.

[e-mail] has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 5:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 5: Verified+1

Patch rebased. Verified by host deploying vdsm and seeing that communication works between the engine and vdsm.

Yeela Kaplan has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 5: Code-Review+1

[e-mail] has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 6:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

Yaniv Bronhaim has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 3:

(1 comment)

https://gerrit.ovirt.org/#/c/45750/3/vdsm.spec.in
File vdsm.spec.in:

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*
> My goal was to minimize code changes so I have decided to have it in vdsm/a

so why isn't it from "vdsm import api" ? which means under python_sitelib/vdsm/api .. what's wrong with that?
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*

Ondřej Svoboda has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 6: Code-Review+1

Yaniv Bronhaim has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 6: Code-Review-1

don't you need it for debian as well? I still think that it should be installed under site-packager/vdsm/api and not the other way around

Yaniv Bronhaim has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 6: Code-Review+1

Yaniv Bronhaim has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 6: Code-Review-1

oh, forgot about the debian part - don't you want it there as well?

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 6:

Good point. Will add debian support.

[e-mail] has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 7:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 7: Verified+1

Added new deb for debian build. Not built on debian due to issue with pcopen.

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 7:

(1 comment)

https://gerrit.ovirt.org/#/c/45750/7/debian/control
File debian/control:

Line 327: Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.3), vdsm (>= ${source:Version})
Line 328: Description: External disk support for VDSM
Line 329:  Hook adds additional disk image for a VM (raw or qcow2)
Line 330: 
Line 331: Package: vdsm-jsonrpc
Package definition copied from https://gerrit.ovirt.org/#/c/37737. We needed to add a dependency here.
Line 332: Architecture: all
Line 333: Depends: ${shlibs:Depends},
Line 334:  ${misc:Depends}, python (>=2.7.3),
Line 335:  vdsm-python (>= ${source:Version}),

Yaniv Bronhaim has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 7: Code-Review-1

(1 comment)

https://gerrit.ovirt.org/#/c/45750/7/debian/control
File debian/control:

Line 327: Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.3), vdsm (>= ${source:Version})
Line 328: Description: External disk support for VDSM
Line 329:  Hook adds additional disk image for a VM (raw or qcow2)
Line 330: 
Line 331: Package: vdsm-jsonrpc
> Package definition copied from https://gerrit.ovirt.org/#/c/37737. We neede

please add it in separate patch
Line 332: Architecture: all
Line 333: Depends: ${shlibs:Depends},
Line 334:  ${misc:Depends}, python (>=2.7.3),
Line 335:  vdsm-python (>= ${source:Version}),

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 7:

(1 comment)

https://gerrit.ovirt.org/#/c/45750/7/debian/control
File debian/control:

Line 327: Depends: ${shlibs:Depends}, ${misc:Depends}, python (>=2.7.3), vdsm (>= ${source:Version})
Line 328: Description: External disk support for VDSM
Line 329:  Hook adds additional disk image for a VM (raw or qcow2)
Line 330: 
Line 331: Package: vdsm-jsonrpc
> please add it in separate patch

This is required to provide this dependency update. It the package was not there and the update is part of this patch.
Line 332: Architecture: all
Line 333: Depends: ${shlibs:Depends},
Line 334:  ${misc:Depends}, python (>=2.7.3),
Line 335:  vdsm-python (>= ${source:Version}),

[e-mail] has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 8:

* Update tracker::IGNORE, no Bug-Url found
* Check Bug-Url::WARN, no bug url found, make sure header matches 'Bug-Url: ' and is a valid url.
* Check merged to previous::IGNORE, Not in stable branch (['ovirt-3.5', 'ovirt-3.4', 'ovirt-3.3'])

[Piotr Kliczewski]

Piotr Kliczewski has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 8: Verified+1

No code changes. Rebased and split for have vdsm-jsonrpc package definition in different patch. Copying verification flag.

Yaniv Bronhaim has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 8: Code-Review+1

looks OK to me - please ask Simone to verify over debian, unless you have environment for that

[Dan Kenigsberg]

Dan Kenigsberg has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 8: Code-Review+2

raising score

[Dan Kenigsberg]

Dan Kenigsberg has submitted this change and it was merged.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

schema: rpm for jsonrpc schema files

We need to use schema files outside of vdsm for external clients and in
the future for the engine. In order to do it we need to have separate
rpm which provides required files.

We introduced new package which is used for storing vdsmapi module. Spec
files are stored in the same places as before.

Change-Id: I13d6291ddbf5bf7d8e6a0956db3300cd0c45e563
Signed-off-by: pkliczewski 
Reviewed-on: https://gerrit.ovirt.org/45750
Continuous-Integration: Jenkins CI
Reviewed-by: Yaniv Bronhaim 
Reviewed-by: Dan Kenigsberg 
---
M configure.ac
M debian/control
A debian/vdsm-api.docs
A debian/vdsm-api.install
M debian/vdsm.docs
M debian/vdsm.install
M lib/Makefile.am
A lib/api/Makefile.am
A lib/api/__init__.py
R lib/api/process-schema.py
R lib/api/vdsmapi-gluster-schema.json
R lib/api/vdsmapi-schema.json
R lib/api/vdsmapi.py
M tests/schemaTests.py
M tests/schemaValidationTest.py
M tests/vmApiTests.py
M vdsm.spec.in
M vdsm/rpc/Bridge.py
M vdsm/rpc/Makefile.am
19 files changed, 110 insertions(+), 45 deletions(-)

Approvals:
  Piotr Kliczewski: Verified
  Yaniv Bronhaim: Looks good to me, but someone else must approve
  Jenkins CI: Passed CI tests
  Dan Kenigsberg: Looks good to me, approved

[e-mail] has posted comments on this change.

Change subject: schema: rpm for jsonrpc schema files
......................................................................

Patch Set 9:

* Update tracker::IGNORE, no Bug-Url found
* Set MODIFIED::IGNORE, no Bug-Url found.