Compare commits
69 Commits
d1cf1df4b1
...
pkg/dev/ri
Author | SHA1 | Date | |
---|---|---|---|
b9da2ce686 | |||
46f8a4323b | |||
941261c830 | |||
6c4bbb3dca | |||
98c77bf719 | |||
279e3a7c4c | |||
1b9d87fa53 | |||
13c7d5816c | |||
0e988d7040 | |||
a89e512266 | |||
be97d757d9 | |||
7afccab9b1 | |||
19d90fd9bc | |||
5653de1e99 | |||
c84b9435b0 | |||
e664dd6174 | |||
399bfb9ab6 | |||
3823eedd02 | |||
a12e679b3c | |||
32b83f496b | |||
dc7d081608 | |||
ca101cf094 | |||
c309ebbd56 | |||
a64131fb03 | |||
e787eb2ef5 | |||
10637656fa | |||
234b82b459 | |||
d3a5c99e51 | |||
c9e0bcbbfe | |||
47e4976f54 | |||
dd33ea5b8f | |||
689df4ec23 | |||
223fb9aaf3 | |||
c3d25b4aff | |||
bed27a1e58 | |||
40eff91684 | |||
46ea792c5e | |||
5708cb1ea9 | |||
664a2404fa | |||
9741669487 | |||
2b12c9bd0d | |||
4ad337b965 | |||
b182010bad | |||
191797d239 | |||
99168f5715 | |||
1e88a5eab0 | |||
8eadc93c95 | |||
57e3b955e5 | |||
75f1a0a230 | |||
e472282a33 | |||
93b61176d8 | |||
e475dffc95 | |||
b2151c41bc | |||
197a9e82a2 | |||
e58c61b76a | |||
867de5f56e | |||
d424c9cd0b | |||
c442abe674 | |||
f9a344e7a6 | |||
9d1e72cdd8 | |||
eef7f02512 | |||
963fe2a9b6 | |||
efb8f22872 | |||
db8bdf4a6d | |||
d6bbcaa65c | |||
8bec9c7ce1 | |||
cc6dd3efe3 | |||
892e052969 | |||
5103b7bd28 |
25
README.md
25
README.md
@ -29,23 +29,26 @@ psql -U postgres -h localhost -c "GRANT ALL ON DATABASE risotto TO risotto;"
|
|||||||
#psql -U postgres -h localhost -c "CREATE EXTENSION hstore;" risotto
|
#psql -U postgres -h localhost -c "CREATE EXTENSION hstore;" risotto
|
||||||
```
|
```
|
||||||
|
|
||||||
Gestion de la base de données avec Sqitch
|
Gestion de la base de données
|
||||||
|
|
||||||
```
|
La plupart des services se greffant à risotto nécessite une table dans la base de données risotto.
|
||||||
cpanm --quiet --notest App::Sqitch
|
Chacun de ces services documente la structure de la table mais ne se charge pas de sa création.
|
||||||
sqitch init risotto --uri https://forge.cadoles.com/Infra/risotto --engine pg
|
La création de la table, selon le schéma fournit dans la documentation, est à la charge de l’administrateur du système.
|
||||||
```
|
|
||||||
|
|
||||||
|
|
||||||
Commande :
|
|
||||||
|
|
||||||
# Empty database:
|
# Empty database:
|
||||||
su - postgres
|
|
||||||
psql -U postgres risotto
|
|
||||||
drop table log; drop table userrole; drop table release; drop table source; drop table server; drop table servermodel; drop table applicationservice; drop table roleuri; drop table risottouser; drop table uri;
|
|
||||||
|
|
||||||
|
````
|
||||||
|
psql -U postgres
|
||||||
|
drop database risotto;
|
||||||
|
drop user risotto;
|
||||||
|
\q
|
||||||
|
reconfigure
|
||||||
|
```
|
||||||
|
|
||||||
|
```
|
||||||
psql -U postgres tiramisu
|
psql -U postgres tiramisu
|
||||||
drop table value; drop table property; drop table permissive; drop table information; drop table session;
|
drop table value; drop table property; drop table permissive; drop table information; drop table session;
|
||||||
|
```
|
||||||
|
|
||||||
# Import EOLE
|
# Import EOLE
|
||||||
./script/cucchiaiata source.create -n eole -u http://localhost
|
./script/cucchiaiata source.create -n eole -u http://localhost
|
||||||
|
@ -1,6 +1,10 @@
|
|||||||
Message
|
Message
|
||||||
=======
|
=======
|
||||||
|
|
||||||
message: config.session.server.start
|
|
||||||
version: v1
|
|
||||||
uri: v1.config.session.server.start
|
uri: v1.config.session.server.start
|
||||||
|
version: v1
|
||||||
|
module: config
|
||||||
|
submodule: session
|
||||||
|
message: config.session.server.start
|
||||||
|
submessage: session.server.start
|
||||||
|
subsubmessage: server.start
|
||||||
|
662
debian/agpl-3
vendored
Normal file
662
debian/agpl-3
vendored
Normal file
@ -0,0 +1,662 @@
|
|||||||
|
GNU AFFERO GENERAL PUBLIC LICENSE
|
||||||
|
Version 3, 19 November 2007
|
||||||
|
|
||||||
|
Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
|
||||||
|
Everyone is permitted to copy and distribute verbatim copies
|
||||||
|
of this license document, but changing it is not allowed.
|
||||||
|
|
||||||
|
Preamble
|
||||||
|
|
||||||
|
The GNU Affero General Public License is a free, copyleft license for
|
||||||
|
software and other kinds of works, specifically designed to ensure
|
||||||
|
cooperation with the community in the case of network server software.
|
||||||
|
|
||||||
|
The licenses for most software and other practical works are designed
|
||||||
|
to take away your freedom to share and change the works. By contrast,
|
||||||
|
our General Public Licenses are intended to guarantee your freedom to
|
||||||
|
share and change all versions of a program--to make sure it remains free
|
||||||
|
software for all its users.
|
||||||
|
|
||||||
|
When we speak of free software, we are referring to freedom, not
|
||||||
|
price. Our General Public Licenses are designed to make sure that you
|
||||||
|
have the freedom to distribute copies of free software (and charge for
|
||||||
|
them if you wish), that you receive source code or can get it if you
|
||||||
|
want it, that you can change the software or use pieces of it in new
|
||||||
|
free programs, and that you know you can do these things.
|
||||||
|
|
||||||
|
Developers that use our General Public Licenses protect your rights
|
||||||
|
with two steps: (1) assert copyright on the software, and (2) offer
|
||||||
|
you this License which gives you legal permission to copy, distribute
|
||||||
|
and/or modify the software.
|
||||||
|
|
||||||
|
A secondary benefit of defending all users' freedom is that
|
||||||
|
improvements made in alternate versions of the program, if they
|
||||||
|
receive widespread use, become available for other developers to
|
||||||
|
incorporate. Many developers of free software are heartened and
|
||||||
|
encouraged by the resulting cooperation. However, in the case of
|
||||||
|
software used on network servers, this result may fail to come about.
|
||||||
|
The GNU General Public License permits making a modified version and
|
||||||
|
letting the public access it on a server without ever releasing its
|
||||||
|
source code to the public.
|
||||||
|
|
||||||
|
The GNU Affero General Public License is designed specifically to
|
||||||
|
ensure that, in such cases, the modified source code becomes available
|
||||||
|
to the community. It requires the operator of a network server to
|
||||||
|
provide the source code of the modified version running there to the
|
||||||
|
users of that server. Therefore, public use of a modified version, on
|
||||||
|
a publicly accessible server, gives the public access to the source
|
||||||
|
code of the modified version.
|
||||||
|
|
||||||
|
An older license, called the Affero General Public License and
|
||||||
|
published by Affero, was designed to accomplish similar goals. This is
|
||||||
|
a different license, not a version of the Affero GPL, but Affero has
|
||||||
|
released a new version of the Affero GPL which permits relicensing under
|
||||||
|
this license.
|
||||||
|
|
||||||
|
The precise terms and conditions for copying, distribution and
|
||||||
|
modification follow.
|
||||||
|
|
||||||
|
TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
0. Definitions.
|
||||||
|
|
||||||
|
"This License" refers to version 3 of the GNU Affero General Public License.
|
||||||
|
|
||||||
|
"Copyright" also means copyright-like laws that apply to other kinds of
|
||||||
|
works, such as semiconductor masks.
|
||||||
|
|
||||||
|
"The Program" refers to any copyrightable work licensed under this
|
||||||
|
License. Each licensee is addressed as "you". "Licensees" and
|
||||||
|
"recipients" may be individuals or organizations.
|
||||||
|
|
||||||
|
To "modify" a work means to copy from or adapt all or part of the work
|
||||||
|
in a fashion requiring copyright permission, other than the making of an
|
||||||
|
exact copy. The resulting work is called a "modified version" of the
|
||||||
|
earlier work or a work "based on" the earlier work.
|
||||||
|
|
||||||
|
A "covered work" means either the unmodified Program or a work based
|
||||||
|
on the Program.
|
||||||
|
|
||||||
|
To "propagate" a work means to do anything with it that, without
|
||||||
|
permission, would make you directly or secondarily liable for
|
||||||
|
infringement under applicable copyright law, except executing it on a
|
||||||
|
computer or modifying a private copy. Propagation includes copying,
|
||||||
|
distribution (with or without modification), making available to the
|
||||||
|
public, and in some countries other activities as well.
|
||||||
|
|
||||||
|
To "convey" a work means any kind of propagation that enables other
|
||||||
|
parties to make or receive copies. Mere interaction with a user through
|
||||||
|
a computer network, with no transfer of a copy, is not conveying.
|
||||||
|
|
||||||
|
An interactive user interface displays "Appropriate Legal Notices"
|
||||||
|
to the extent that it includes a convenient and prominently visible
|
||||||
|
feature that (1) displays an appropriate copyright notice, and (2)
|
||||||
|
tells the user that there is no warranty for the work (except to the
|
||||||
|
extent that warranties are provided), that licensees may convey the
|
||||||
|
work under this License, and how to view a copy of this License. If
|
||||||
|
the interface presents a list of user commands or options, such as a
|
||||||
|
menu, a prominent item in the list meets this criterion.
|
||||||
|
|
||||||
|
1. Source Code.
|
||||||
|
|
||||||
|
The "source code" for a work means the preferred form of the work
|
||||||
|
for making modifications to it. "Object code" means any non-source
|
||||||
|
form of a work.
|
||||||
|
|
||||||
|
A "Standard Interface" means an interface that either is an official
|
||||||
|
standard defined by a recognized standards body, or, in the case of
|
||||||
|
interfaces specified for a particular programming language, one that
|
||||||
|
is widely used among developers working in that language.
|
||||||
|
|
||||||
|
The "System Libraries" of an executable work include anything, other
|
||||||
|
than the work as a whole, that (a) is included in the normal form of
|
||||||
|
packaging a Major Component, but which is not part of that Major
|
||||||
|
Component, and (b) serves only to enable use of the work with that
|
||||||
|
Major Component, or to implement a Standard Interface for which an
|
||||||
|
implementation is available to the public in source code form. A
|
||||||
|
"Major Component", in this context, means a major essential component
|
||||||
|
(kernel, window system, and so on) of the specific operating system
|
||||||
|
(if any) on which the executable work runs, or a compiler used to
|
||||||
|
produce the work, or an object code interpreter used to run it.
|
||||||
|
|
||||||
|
The "Corresponding Source" for a work in object code form means all
|
||||||
|
the source code needed to generate, install, and (for an executable
|
||||||
|
work) run the object code and to modify the work, including scripts to
|
||||||
|
control those activities. However, it does not include the work's
|
||||||
|
System Libraries, or general-purpose tools or generally available free
|
||||||
|
programs which are used unmodified in performing those activities but
|
||||||
|
which are not part of the work. For example, Corresponding Source
|
||||||
|
includes interface definition files associated with source files for
|
||||||
|
the work, and the source code for shared libraries and dynamically
|
||||||
|
linked subprograms that the work is specifically designed to require,
|
||||||
|
such as by intimate data communication or control flow between those
|
||||||
|
subprograms and other parts of the work.
|
||||||
|
|
||||||
|
The Corresponding Source need not include anything that users
|
||||||
|
can regenerate automatically from other parts of the Corresponding
|
||||||
|
Source.
|
||||||
|
|
||||||
|
The Corresponding Source for a work in source code form is that
|
||||||
|
same work.
|
||||||
|
|
||||||
|
2. Basic Permissions.
|
||||||
|
|
||||||
|
All rights granted under this License are granted for the term of
|
||||||
|
copyright on the Program, and are irrevocable provided the stated
|
||||||
|
conditions are met. This License explicitly affirms your unlimited
|
||||||
|
permission to run the unmodified Program. The output from running a
|
||||||
|
covered work is covered by this License only if the output, given its
|
||||||
|
content, constitutes a covered work. This License acknowledges your
|
||||||
|
rights of fair use or other equivalent, as provided by copyright law.
|
||||||
|
|
||||||
|
You may make, run and propagate covered works that you do not
|
||||||
|
convey, without conditions so long as your license otherwise remains
|
||||||
|
in force. You may convey covered works to others for the sole purpose
|
||||||
|
of having them make modifications exclusively for you, or provide you
|
||||||
|
with facilities for running those works, provided that you comply with
|
||||||
|
the terms of this License in conveying all material for which you do
|
||||||
|
not control copyright. Those thus making or running the covered works
|
||||||
|
for you must do so exclusively on your behalf, under your direction
|
||||||
|
and control, on terms that prohibit them from making any copies of
|
||||||
|
your copyrighted material outside their relationship with you.
|
||||||
|
|
||||||
|
Conveying under any other circumstances is permitted solely under
|
||||||
|
the conditions stated below. Sublicensing is not allowed; section 10
|
||||||
|
makes it unnecessary.
|
||||||
|
|
||||||
|
3. Protecting Users' Legal Rights From Anti-Circumvention Law.
|
||||||
|
|
||||||
|
No covered work shall be deemed part of an effective technological
|
||||||
|
measure under any applicable law fulfilling obligations under article
|
||||||
|
11 of the WIPO copyright treaty adopted on 20 December 1996, or
|
||||||
|
similar laws prohibiting or restricting circumvention of such
|
||||||
|
measures.
|
||||||
|
|
||||||
|
When you convey a covered work, you waive any legal power to forbid
|
||||||
|
circumvention of technological measures to the extent such circumvention
|
||||||
|
is effected by exercising rights under this License with respect to
|
||||||
|
the covered work, and you disclaim any intention to limit operation or
|
||||||
|
modification of the work as a means of enforcing, against the work's
|
||||||
|
users, your or third parties' legal rights to forbid circumvention of
|
||||||
|
technological measures.
|
||||||
|
|
||||||
|
4. Conveying Verbatim Copies.
|
||||||
|
|
||||||
|
You may convey verbatim copies of the Program's source code as you
|
||||||
|
receive it, in any medium, provided that you conspicuously and
|
||||||
|
appropriately publish on each copy an appropriate copyright notice;
|
||||||
|
keep intact all notices stating that this License and any
|
||||||
|
non-permissive terms added in accord with section 7 apply to the code;
|
||||||
|
keep intact all notices of the absence of any warranty; and give all
|
||||||
|
recipients a copy of this License along with the Program.
|
||||||
|
|
||||||
|
You may charge any price or no price for each copy that you convey,
|
||||||
|
and you may offer support or warranty protection for a fee.
|
||||||
|
|
||||||
|
5. Conveying Modified Source Versions.
|
||||||
|
|
||||||
|
You may convey a work based on the Program, or the modifications to
|
||||||
|
produce it from the Program, in the form of source code under the
|
||||||
|
terms of section 4, provided that you also meet all of these conditions:
|
||||||
|
|
||||||
|
a) The work must carry prominent notices stating that you modified
|
||||||
|
it, and giving a relevant date.
|
||||||
|
|
||||||
|
b) The work must carry prominent notices stating that it is
|
||||||
|
released under this License and any conditions added under section
|
||||||
|
7. This requirement modifies the requirement in section 4 to
|
||||||
|
"keep intact all notices".
|
||||||
|
|
||||||
|
c) You must license the entire work, as a whole, under this
|
||||||
|
License to anyone who comes into possession of a copy. This
|
||||||
|
License will therefore apply, along with any applicable section 7
|
||||||
|
additional terms, to the whole of the work, and all its parts,
|
||||||
|
regardless of how they are packaged. This License gives no
|
||||||
|
permission to license the work in any other way, but it does not
|
||||||
|
invalidate such permission if you have separately received it.
|
||||||
|
|
||||||
|
d) If the work has interactive user interfaces, each must display
|
||||||
|
Appropriate Legal Notices; however, if the Program has interactive
|
||||||
|
interfaces that do not display Appropriate Legal Notices, your
|
||||||
|
work need not make them do so.
|
||||||
|
|
||||||
|
A compilation of a covered work with other separate and independent
|
||||||
|
works, which are not by their nature extensions of the covered work,
|
||||||
|
and which are not combined with it such as to form a larger program,
|
||||||
|
in or on a volume of a storage or distribution medium, is called an
|
||||||
|
"aggregate" if the compilation and its resulting copyright are not
|
||||||
|
used to limit the access or legal rights of the compilation's users
|
||||||
|
beyond what the individual works permit. Inclusion of a covered work
|
||||||
|
in an aggregate does not cause this License to apply to the other
|
||||||
|
parts of the aggregate.
|
||||||
|
|
||||||
|
6. Conveying Non-Source Forms.
|
||||||
|
|
||||||
|
You may convey a covered work in object code form under the terms
|
||||||
|
of sections 4 and 5, provided that you also convey the
|
||||||
|
machine-readable Corresponding Source under the terms of this License,
|
||||||
|
in one of these ways:
|
||||||
|
|
||||||
|
a) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by the
|
||||||
|
Corresponding Source fixed on a durable physical medium
|
||||||
|
customarily used for software interchange.
|
||||||
|
|
||||||
|
b) Convey the object code in, or embodied in, a physical product
|
||||||
|
(including a physical distribution medium), accompanied by a
|
||||||
|
written offer, valid for at least three years and valid for as
|
||||||
|
long as you offer spare parts or customer support for that product
|
||||||
|
model, to give anyone who possesses the object code either (1) a
|
||||||
|
copy of the Corresponding Source for all the software in the
|
||||||
|
product that is covered by this License, on a durable physical
|
||||||
|
medium customarily used for software interchange, for a price no
|
||||||
|
more than your reasonable cost of physically performing this
|
||||||
|
conveying of source, or (2) access to copy the
|
||||||
|
Corresponding Source from a network server at no charge.
|
||||||
|
|
||||||
|
c) Convey individual copies of the object code with a copy of the
|
||||||
|
written offer to provide the Corresponding Source. This
|
||||||
|
alternative is allowed only occasionally and noncommercially, and
|
||||||
|
only if you received the object code with such an offer, in accord
|
||||||
|
with subsection 6b.
|
||||||
|
|
||||||
|
d) Convey the object code by offering access from a designated
|
||||||
|
place (gratis or for a charge), and offer equivalent access to the
|
||||||
|
Corresponding Source in the same way through the same place at no
|
||||||
|
further charge. You need not require recipients to copy the
|
||||||
|
Corresponding Source along with the object code. If the place to
|
||||||
|
copy the object code is a network server, the Corresponding Source
|
||||||
|
may be on a different server (operated by you or a third party)
|
||||||
|
that supports equivalent copying facilities, provided you maintain
|
||||||
|
clear directions next to the object code saying where to find the
|
||||||
|
Corresponding Source. Regardless of what server hosts the
|
||||||
|
Corresponding Source, you remain obligated to ensure that it is
|
||||||
|
available for as long as needed to satisfy these requirements.
|
||||||
|
|
||||||
|
e) Convey the object code using peer-to-peer transmission, provided
|
||||||
|
you inform other peers where the object code and Corresponding
|
||||||
|
Source of the work are being offered to the general public at no
|
||||||
|
charge under subsection 6d.
|
||||||
|
|
||||||
|
A separable portion of the object code, whose source code is excluded
|
||||||
|
from the Corresponding Source as a System Library, need not be
|
||||||
|
included in conveying the object code work.
|
||||||
|
|
||||||
|
A "User Product" is either (1) a "consumer product", which means any
|
||||||
|
tangible personal property which is normally used for personal, family,
|
||||||
|
or household purposes, or (2) anything designed or sold for incorporation
|
||||||
|
into a dwelling. In determining whether a product is a consumer product,
|
||||||
|
doubtful cases shall be resolved in favor of coverage. For a particular
|
||||||
|
product received by a particular user, "normally used" refers to a
|
||||||
|
typical or common use of that class of product, regardless of the status
|
||||||
|
of the particular user or of the way in which the particular user
|
||||||
|
actually uses, or expects or is expected to use, the product. A product
|
||||||
|
is a consumer product regardless of whether the product has substantial
|
||||||
|
commercial, industrial or non-consumer uses, unless such uses represent
|
||||||
|
the only significant mode of use of the product.
|
||||||
|
|
||||||
|
"Installation Information" for a User Product means any methods,
|
||||||
|
procedures, authorization keys, or other information required to install
|
||||||
|
and execute modified versions of a covered work in that User Product from
|
||||||
|
a modified version of its Corresponding Source. The information must
|
||||||
|
suffice to ensure that the continued functioning of the modified object
|
||||||
|
code is in no case prevented or interfered with solely because
|
||||||
|
modification has been made.
|
||||||
|
|
||||||
|
If you convey an object code work under this section in, or with, or
|
||||||
|
specifically for use in, a User Product, and the conveying occurs as
|
||||||
|
part of a transaction in which the right of possession and use of the
|
||||||
|
User Product is transferred to the recipient in perpetuity or for a
|
||||||
|
fixed term (regardless of how the transaction is characterized), the
|
||||||
|
Corresponding Source conveyed under this section must be accompanied
|
||||||
|
by the Installation Information. But this requirement does not apply
|
||||||
|
if neither you nor any third party retains the ability to install
|
||||||
|
modified object code on the User Product (for example, the work has
|
||||||
|
been installed in ROM).
|
||||||
|
|
||||||
|
The requirement to provide Installation Information does not include a
|
||||||
|
requirement to continue to provide support service, warranty, or updates
|
||||||
|
for a work that has been modified or installed by the recipient, or for
|
||||||
|
the User Product in which it has been modified or installed. Access to a
|
||||||
|
network may be denied when the modification itself materially and
|
||||||
|
adversely affects the operation of the network or violates the rules and
|
||||||
|
protocols for communication across the network.
|
||||||
|
|
||||||
|
Corresponding Source conveyed, and Installation Information provided,
|
||||||
|
in accord with this section must be in a format that is publicly
|
||||||
|
documented (and with an implementation available to the public in
|
||||||
|
source code form), and must require no special password or key for
|
||||||
|
unpacking, reading or copying.
|
||||||
|
|
||||||
|
7. Additional Terms.
|
||||||
|
|
||||||
|
"Additional permissions" are terms that supplement the terms of this
|
||||||
|
License by making exceptions from one or more of its conditions.
|
||||||
|
Additional permissions that are applicable to the entire Program shall
|
||||||
|
be treated as though they were included in this License, to the extent
|
||||||
|
that they are valid under applicable law. If additional permissions
|
||||||
|
apply only to part of the Program, that part may be used separately
|
||||||
|
under those permissions, but the entire Program remains governed by
|
||||||
|
this License without regard to the additional permissions.
|
||||||
|
|
||||||
|
When you convey a copy of a covered work, you may at your option
|
||||||
|
remove any additional permissions from that copy, or from any part of
|
||||||
|
it. (Additional permissions may be written to require their own
|
||||||
|
removal in certain cases when you modify the work.) You may place
|
||||||
|
additional permissions on material, added by you to a covered work,
|
||||||
|
for which you have or can give appropriate copyright permission.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, for material you
|
||||||
|
add to a covered work, you may (if authorized by the copyright holders of
|
||||||
|
that material) supplement the terms of this License with terms:
|
||||||
|
|
||||||
|
a) Disclaiming warranty or limiting liability differently from the
|
||||||
|
terms of sections 15 and 16 of this License; or
|
||||||
|
|
||||||
|
b) Requiring preservation of specified reasonable legal notices or
|
||||||
|
author attributions in that material or in the Appropriate Legal
|
||||||
|
Notices displayed by works containing it; or
|
||||||
|
|
||||||
|
c) Prohibiting misrepresentation of the origin of that material, or
|
||||||
|
requiring that modified versions of such material be marked in
|
||||||
|
reasonable ways as different from the original version; or
|
||||||
|
|
||||||
|
d) Limiting the use for publicity purposes of names of licensors or
|
||||||
|
authors of the material; or
|
||||||
|
|
||||||
|
e) Declining to grant rights under trademark law for use of some
|
||||||
|
trade names, trademarks, or service marks; or
|
||||||
|
|
||||||
|
f) Requiring indemnification of licensors and authors of that
|
||||||
|
material by anyone who conveys the material (or modified versions of
|
||||||
|
it) with contractual assumptions of liability to the recipient, for
|
||||||
|
any liability that these contractual assumptions directly impose on
|
||||||
|
those licensors and authors.
|
||||||
|
|
||||||
|
All other non-permissive additional terms are considered "further
|
||||||
|
restrictions" within the meaning of section 10. If the Program as you
|
||||||
|
received it, or any part of it, contains a notice stating that it is
|
||||||
|
governed by this License along with a term that is a further
|
||||||
|
restriction, you may remove that term. If a license document contains
|
||||||
|
a further restriction but permits relicensing or conveying under this
|
||||||
|
License, you may add to a covered work material governed by the terms
|
||||||
|
of that license document, provided that the further restriction does
|
||||||
|
not survive such relicensing or conveying.
|
||||||
|
|
||||||
|
If you add terms to a covered work in accord with this section, you
|
||||||
|
must place, in the relevant source files, a statement of the
|
||||||
|
additional terms that apply to those files, or a notice indicating
|
||||||
|
where to find the applicable terms.
|
||||||
|
|
||||||
|
Additional terms, permissive or non-permissive, may be stated in the
|
||||||
|
form of a separately written license, or stated as exceptions;
|
||||||
|
the above requirements apply either way.
|
||||||
|
|
||||||
|
8. Termination.
|
||||||
|
|
||||||
|
You may not propagate or modify a covered work except as expressly
|
||||||
|
provided under this License. Any attempt otherwise to propagate or
|
||||||
|
modify it is void, and will automatically terminate your rights under
|
||||||
|
this License (including any patent licenses granted under the third
|
||||||
|
paragraph of section 11).
|
||||||
|
|
||||||
|
However, if you cease all violation of this License, then your
|
||||||
|
license from a particular copyright holder is reinstated (a)
|
||||||
|
provisionally, unless and until the copyright holder explicitly and
|
||||||
|
finally terminates your license, and (b) permanently, if the copyright
|
||||||
|
holder fails to notify you of the violation by some reasonable means
|
||||||
|
prior to 60 days after the cessation.
|
||||||
|
|
||||||
|
Moreover, your license from a particular copyright holder is
|
||||||
|
reinstated permanently if the copyright holder notifies you of the
|
||||||
|
violation by some reasonable means, this is the first time you have
|
||||||
|
received notice of violation of this License (for any work) from that
|
||||||
|
copyright holder, and you cure the violation prior to 30 days after
|
||||||
|
your receipt of the notice.
|
||||||
|
|
||||||
|
Termination of your rights under this section does not terminate the
|
||||||
|
licenses of parties who have received copies or rights from you under
|
||||||
|
this License. If your rights have been terminated and not permanently
|
||||||
|
reinstated, you do not qualify to receive new licenses for the same
|
||||||
|
material under section 10.
|
||||||
|
|
||||||
|
9. Acceptance Not Required for Having Copies.
|
||||||
|
|
||||||
|
You are not required to accept this License in order to receive or
|
||||||
|
run a copy of the Program. Ancillary propagation of a covered work
|
||||||
|
occurring solely as a consequence of using peer-to-peer transmission
|
||||||
|
to receive a copy likewise does not require acceptance. However,
|
||||||
|
nothing other than this License grants you permission to propagate or
|
||||||
|
modify any covered work. These actions infringe copyright if you do
|
||||||
|
not accept this License. Therefore, by modifying or propagating a
|
||||||
|
covered work, you indicate your acceptance of this License to do so.
|
||||||
|
|
||||||
|
10. Automatic Licensing of Downstream Recipients.
|
||||||
|
|
||||||
|
Each time you convey a covered work, the recipient automatically
|
||||||
|
receives a license from the original licensors, to run, modify and
|
||||||
|
propagate that work, subject to this License. You are not responsible
|
||||||
|
for enforcing compliance by third parties with this License.
|
||||||
|
|
||||||
|
An "entity transaction" is a transaction transferring control of an
|
||||||
|
organization, or substantially all assets of one, or subdividing an
|
||||||
|
organization, or merging organizations. If propagation of a covered
|
||||||
|
work results from an entity transaction, each party to that
|
||||||
|
transaction who receives a copy of the work also receives whatever
|
||||||
|
licenses to the work the party's predecessor in interest had or could
|
||||||
|
give under the previous paragraph, plus a right to possession of the
|
||||||
|
Corresponding Source of the work from the predecessor in interest, if
|
||||||
|
the predecessor has it or can get it with reasonable efforts.
|
||||||
|
|
||||||
|
You may not impose any further restrictions on the exercise of the
|
||||||
|
rights granted or affirmed under this License. For example, you may
|
||||||
|
not impose a license fee, royalty, or other charge for exercise of
|
||||||
|
rights granted under this License, and you may not initiate litigation
|
||||||
|
(including a cross-claim or counterclaim in a lawsuit) alleging that
|
||||||
|
any patent claim is infringed by making, using, selling, offering for
|
||||||
|
sale, or importing the Program or any portion of it.
|
||||||
|
|
||||||
|
11. Patents.
|
||||||
|
|
||||||
|
A "contributor" is a copyright holder who authorizes use under this
|
||||||
|
License of the Program or a work on which the Program is based. The
|
||||||
|
work thus licensed is called the contributor's "contributor version".
|
||||||
|
|
||||||
|
A contributor's "essential patent claims" are all patent claims
|
||||||
|
owned or controlled by the contributor, whether already acquired or
|
||||||
|
hereafter acquired, that would be infringed by some manner, permitted
|
||||||
|
by this License, of making, using, or selling its contributor version,
|
||||||
|
but do not include claims that would be infringed only as a
|
||||||
|
consequence of further modification of the contributor version. For
|
||||||
|
purposes of this definition, "control" includes the right to grant
|
||||||
|
patent sublicenses in a manner consistent with the requirements of
|
||||||
|
this License.
|
||||||
|
|
||||||
|
Each contributor grants you a non-exclusive, worldwide, royalty-free
|
||||||
|
patent license under the contributor's essential patent claims, to
|
||||||
|
make, use, sell, offer for sale, import and otherwise run, modify and
|
||||||
|
propagate the contents of its contributor version.
|
||||||
|
|
||||||
|
In the following three paragraphs, a "patent license" is any express
|
||||||
|
agreement or commitment, however denominated, not to enforce a patent
|
||||||
|
(such as an express permission to practice a patent or covenant not to
|
||||||
|
sue for patent infringement). To "grant" such a patent license to a
|
||||||
|
party means to make such an agreement or commitment not to enforce a
|
||||||
|
patent against the party.
|
||||||
|
|
||||||
|
If you convey a covered work, knowingly relying on a patent license,
|
||||||
|
and the Corresponding Source of the work is not available for anyone
|
||||||
|
to copy, free of charge and under the terms of this License, through a
|
||||||
|
publicly available network server or other readily accessible means,
|
||||||
|
then you must either (1) cause the Corresponding Source to be so
|
||||||
|
available, or (2) arrange to deprive yourself of the benefit of the
|
||||||
|
patent license for this particular work, or (3) arrange, in a manner
|
||||||
|
consistent with the requirements of this License, to extend the patent
|
||||||
|
license to downstream recipients. "Knowingly relying" means you have
|
||||||
|
actual knowledge that, but for the patent license, your conveying the
|
||||||
|
covered work in a country, or your recipient's use of the covered work
|
||||||
|
in a country, would infringe one or more identifiable patents in that
|
||||||
|
country that you have reason to believe are valid.
|
||||||
|
|
||||||
|
If, pursuant to or in connection with a single transaction or
|
||||||
|
arrangement, you convey, or propagate by procuring conveyance of, a
|
||||||
|
covered work, and grant a patent license to some of the parties
|
||||||
|
receiving the covered work authorizing them to use, propagate, modify
|
||||||
|
or convey a specific copy of the covered work, then the patent license
|
||||||
|
you grant is automatically extended to all recipients of the covered
|
||||||
|
work and works based on it.
|
||||||
|
|
||||||
|
A patent license is "discriminatory" if it does not include within
|
||||||
|
the scope of its coverage, prohibits the exercise of, or is
|
||||||
|
conditioned on the non-exercise of one or more of the rights that are
|
||||||
|
specifically granted under this License. You may not convey a covered
|
||||||
|
work if you are a party to an arrangement with a third party that is
|
||||||
|
in the business of distributing software, under which you make payment
|
||||||
|
to the third party based on the extent of your activity of conveying
|
||||||
|
the work, and under which the third party grants, to any of the
|
||||||
|
parties who would receive the covered work from you, a discriminatory
|
||||||
|
patent license (a) in connection with copies of the covered work
|
||||||
|
conveyed by you (or copies made from those copies), or (b) primarily
|
||||||
|
for and in connection with specific products or compilations that
|
||||||
|
contain the covered work, unless you entered into that arrangement,
|
||||||
|
or that patent license was granted, prior to 28 March 2007.
|
||||||
|
|
||||||
|
Nothing in this License shall be construed as excluding or limiting
|
||||||
|
any implied license or other defenses to infringement that may
|
||||||
|
otherwise be available to you under applicable patent law.
|
||||||
|
|
||||||
|
12. No Surrender of Others' Freedom.
|
||||||
|
|
||||||
|
If conditions are imposed on you (whether by court order, agreement or
|
||||||
|
otherwise) that contradict the conditions of this License, they do not
|
||||||
|
excuse you from the conditions of this License. If you cannot convey a
|
||||||
|
covered work so as to satisfy simultaneously your obligations under this
|
||||||
|
License and any other pertinent obligations, then as a consequence you may
|
||||||
|
not convey it at all. For example, if you agree to terms that obligate you
|
||||||
|
to collect a royalty for further conveying from those to whom you convey
|
||||||
|
the Program, the only way you could satisfy both those terms and this
|
||||||
|
License would be to refrain entirely from conveying the Program.
|
||||||
|
|
||||||
|
13. Remote Network Interaction; Use with the GNU General Public License.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, if you modify the
|
||||||
|
Program, your modified version must prominently offer all users
|
||||||
|
interacting with it remotely through a computer network (if your version
|
||||||
|
supports such interaction) an opportunity to receive the Corresponding
|
||||||
|
Source of your version by providing access to the Corresponding Source
|
||||||
|
from a network server at no charge, through some standard or customary
|
||||||
|
means of facilitating copying of software. This Corresponding Source
|
||||||
|
shall include the Corresponding Source for any work covered by version 3
|
||||||
|
of the GNU General Public License that is incorporated pursuant to the
|
||||||
|
following paragraph.
|
||||||
|
|
||||||
|
Notwithstanding any other provision of this License, you have
|
||||||
|
permission to link or combine any covered work with a work licensed
|
||||||
|
under version 3 of the GNU General Public License into a single
|
||||||
|
combined work, and to convey the resulting work. The terms of this
|
||||||
|
License will continue to apply to the part which is the covered work,
|
||||||
|
but the work with which it is combined will remain governed by version
|
||||||
|
3 of the GNU General Public License.
|
||||||
|
|
||||||
|
14. Revised Versions of this License.
|
||||||
|
|
||||||
|
The Free Software Foundation may publish revised and/or new versions of
|
||||||
|
the GNU Affero General Public License from time to time. Such new versions
|
||||||
|
will be similar in spirit to the present version, but may differ in detail to
|
||||||
|
address new problems or concerns.
|
||||||
|
|
||||||
|
Each version is given a distinguishing version number. If the
|
||||||
|
Program specifies that a certain numbered version of the GNU Affero General
|
||||||
|
Public License "or any later version" applies to it, you have the
|
||||||
|
option of following the terms and conditions either of that numbered
|
||||||
|
version or of any later version published by the Free Software
|
||||||
|
Foundation. If the Program does not specify a version number of the
|
||||||
|
GNU Affero General Public License, you may choose any version ever published
|
||||||
|
by the Free Software Foundation.
|
||||||
|
|
||||||
|
If the Program specifies that a proxy can decide which future
|
||||||
|
versions of the GNU Affero General Public License can be used, that proxy's
|
||||||
|
public statement of acceptance of a version permanently authorizes you
|
||||||
|
to choose that version for the Program.
|
||||||
|
|
||||||
|
Later license versions may give you additional or different
|
||||||
|
permissions. However, no additional obligations are imposed on any
|
||||||
|
author or copyright holder as a result of your choosing to follow a
|
||||||
|
later version.
|
||||||
|
|
||||||
|
15. Disclaimer of Warranty.
|
||||||
|
|
||||||
|
THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
|
||||||
|
APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
|
||||||
|
HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
|
||||||
|
OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
|
||||||
|
THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
|
||||||
|
PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
|
||||||
|
IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
|
||||||
|
ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
|
||||||
|
|
||||||
|
16. Limitation of Liability.
|
||||||
|
|
||||||
|
IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
|
||||||
|
WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
|
||||||
|
THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
|
||||||
|
GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
|
||||||
|
USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
|
||||||
|
DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
|
||||||
|
PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
|
||||||
|
EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
|
||||||
|
SUCH DAMAGES.
|
||||||
|
|
||||||
|
17. Interpretation of Sections 15 and 16.
|
||||||
|
|
||||||
|
If the disclaimer of warranty and limitation of liability provided
|
||||||
|
above cannot be given local legal effect according to their terms,
|
||||||
|
reviewing courts shall apply local law that most closely approximates
|
||||||
|
an absolute waiver of all civil liability in connection with the
|
||||||
|
Program, unless a warranty or assumption of liability accompanies a
|
||||||
|
copy of the Program in return for a fee.
|
||||||
|
|
||||||
|
END OF TERMS AND CONDITIONS
|
||||||
|
|
||||||
|
How to Apply These Terms to Your New Programs
|
||||||
|
|
||||||
|
If you develop a new program, and you want it to be of the greatest
|
||||||
|
possible use to the public, the best way to achieve this is to make it
|
||||||
|
free software which everyone can redistribute and change under these terms.
|
||||||
|
|
||||||
|
To do so, attach the following notices to the program. It is safest
|
||||||
|
to attach them to the start of each source file to most effectively
|
||||||
|
state the exclusion of warranty; and each file should have at least
|
||||||
|
the "copyright" line and a pointer to where the full notice is found.
|
||||||
|
|
||||||
|
<one line to give the program's name and a brief idea of what it does.>
|
||||||
|
Copyright (C) <year> <name of author>
|
||||||
|
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
Also add information on how to contact you by electronic and paper mail.
|
||||||
|
|
||||||
|
If your software can interact with users remotely through a computer
|
||||||
|
network, you should also make sure that it provides a way for users to
|
||||||
|
get its source. For example, if your program is a web application, its
|
||||||
|
interface could display a "Source" link that leads users to an archive
|
||||||
|
of the code. There are many ways you could offer source, and different
|
||||||
|
solutions will be better for different programs; see section 13 for the
|
||||||
|
specific requirements.
|
||||||
|
|
||||||
|
You should also get your employer (if you work as a programmer) or school,
|
||||||
|
if any, to sign a "copyright disclaimer" for the program, if necessary.
|
||||||
|
For more information on this, and how to apply and follow the GNU AGPL, see
|
||||||
|
<https://www.gnu.org/licenses/>.
|
||||||
|
|
1
debian/compat
vendored
Normal file
1
debian/compat
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
11
|
20
debian/control
vendored
Normal file
20
debian/control
vendored
Normal file
@ -0,0 +1,20 @@
|
|||||||
|
Source: risotto
|
||||||
|
Section: admin
|
||||||
|
Priority: extra
|
||||||
|
Maintainer: Cadoles <contact@cadoles.com>
|
||||||
|
Build-depends: debhelper (>=11), python3-all, python3-setuptools, dh-python
|
||||||
|
Standards-Version: 3.9.4
|
||||||
|
Homepage: https://forge.cadoles.com/Infra/risotto
|
||||||
|
|
||||||
|
Package: python3-risotto
|
||||||
|
Architecture: any
|
||||||
|
Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
|
||||||
|
Depends: ${python:Depends}, ${misc:Depends}, python3-asyncpg, python3-rougail, python3-aiohttp
|
||||||
|
Description: configuration manager libraries
|
||||||
|
|
||||||
|
Package: risotto
|
||||||
|
Architecture: any
|
||||||
|
Pre-Depends: dpkg, python3, ${misc:Pre-Depends}
|
||||||
|
Depends: ${python:Depends}, ${misc:Depends}, python3-risotto
|
||||||
|
Description: configuration manager
|
||||||
|
|
22
debian/copyright
vendored
Normal file
22
debian/copyright
vendored
Normal file
@ -0,0 +1,22 @@
|
|||||||
|
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
|
||||||
|
Upstream-Name: risotto
|
||||||
|
Upstream-Contact: Cadoles <contact@cadoles.com>
|
||||||
|
Source: https://forge.cadoles.com/Infra/risotto
|
||||||
|
|
||||||
|
Files: *
|
||||||
|
Copyright: 2019-2020 Cadoles <contact@cadoles.com>
|
||||||
|
License: AGPL-3+
|
||||||
|
|
||||||
|
License: AGPL-3+
|
||||||
|
This program is free software: you can redistribute it and/or modify
|
||||||
|
it under the terms of the GNU Affero General Public License as published by
|
||||||
|
the Free Software Foundation, either version 3 of the License, or
|
||||||
|
(at your option) any later version.
|
||||||
|
.
|
||||||
|
This program is distributed in the hope that it will be useful,
|
||||||
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
GNU Affero General Public License for more details.
|
||||||
|
.
|
||||||
|
You should have received a copy of the GNU Affero General Public License
|
||||||
|
along with this program. If not, see <https://www.gnu.org/licenses/>.
|
2
debian/risotto.install
vendored
Normal file
2
debian/risotto.install
vendored
Normal file
@ -0,0 +1,2 @@
|
|||||||
|
script/risotto-server usr/bin/
|
||||||
|
sql/risotto.sql usr/share/eole/db/eole-risotto/gen/
|
10
debian/rules
vendored
Normal file
10
debian/rules
vendored
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
#!/usr/bin/make -f
|
||||||
|
# See debhelper(7) (uncomment to enable)
|
||||||
|
# output every command that modifies files on the build system.
|
||||||
|
#DH_VERBOSE = 1
|
||||||
|
|
||||||
|
export PYBUILD_NAME = risotto
|
||||||
|
export PYBUILD_DISABLE_python3 = test
|
||||||
|
|
||||||
|
%:
|
||||||
|
dh $@ --with python3 --buildsystem=pybuild
|
1
debian/source/format
vendored
Normal file
1
debian/source/format
vendored
Normal file
@ -0,0 +1 @@
|
|||||||
|
3.0 (quilt)
|
@ -1,23 +1,33 @@
|
|||||||
import asyncpg
|
import asyncpg
|
||||||
import asyncio
|
import asyncio
|
||||||
from os.path import isfile
|
from os import listdir
|
||||||
|
from os.path import isdir, join
|
||||||
from sys import exit
|
from sys import exit
|
||||||
|
|
||||||
|
|
||||||
|
from risotto.utils import _
|
||||||
from risotto.config import get_config
|
from risotto.config import get_config
|
||||||
|
|
||||||
|
|
||||||
async def main():
|
async def main():
|
||||||
sql_filename = get_config()['global']['sql_filename']
|
sql_dir = get_config()['global']['sql_dir']
|
||||||
if not isfile(sql_filename):
|
if not isdir(sql_dir):
|
||||||
print('no sql file to import')
|
print('no sql file to import')
|
||||||
exit()
|
exit()
|
||||||
db_conf = get_config()['database']['dsn']
|
db_conf = get_config()['database']['dsn']
|
||||||
pool = await asyncpg.create_pool(db_conf)
|
pool = await asyncpg.create_pool(db_conf)
|
||||||
async with pool.acquire() as connection:
|
async with pool.acquire() as connection:
|
||||||
async with connection.transaction():
|
async with connection.transaction():
|
||||||
with open(sql_filename, 'r') as sql:
|
for filename in listdir(sql_dir):
|
||||||
await connection.execute(sql.read())
|
if filename.endswith('.sql'):
|
||||||
|
sql_filename = join(sql_dir, filename)
|
||||||
|
with open(sql_filename, 'r') as sql:
|
||||||
|
try:
|
||||||
|
await connection.execute(sql.read())
|
||||||
|
except Exception as err:
|
||||||
|
print(_(f'unable to import {filename}: {err}'))
|
||||||
|
exit(1)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == '__main__':
|
||||||
loop = asyncio.get_event_loop()
|
loop = asyncio.get_event_loop()
|
||||||
|
2
script/server.py → script/risotto-server
Normal file → Executable file
2
script/server.py → script/risotto-server
Normal file → Executable file
@ -1,3 +1,4 @@
|
|||||||
|
#!/usr/bin/env python3
|
||||||
from asyncio import get_event_loop
|
from asyncio import get_event_loop
|
||||||
from risotto import get_app
|
from risotto import get_app
|
||||||
|
|
||||||
@ -6,6 +7,7 @@ if __name__ == '__main__':
|
|||||||
loop = get_event_loop()
|
loop = get_event_loop()
|
||||||
loop.run_until_complete(get_app(loop))
|
loop.run_until_complete(get_app(loop))
|
||||||
try:
|
try:
|
||||||
|
print('HTTP server ready')
|
||||||
loop.run_forever()
|
loop.run_forever()
|
||||||
except KeyboardInterrupt:
|
except KeyboardInterrupt:
|
||||||
pass
|
pass
|
8
setup.py
Normal file
8
setup.py
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
from setuptools import setup, find_packages
|
||||||
|
|
||||||
|
setup(
|
||||||
|
name='risotto',
|
||||||
|
version='0.1',
|
||||||
|
packages=['risotto' ],
|
||||||
|
package_dir={"": "src"},
|
||||||
|
)
|
8
sql/risotto.sql
Normal file
8
sql/risotto.sql
Normal file
@ -0,0 +1,8 @@
|
|||||||
|
CREATE TABLE log(
|
||||||
|
Msg VARCHAR(255) NOT NULL,
|
||||||
|
Level VARCHAR(10) NOT NULL,
|
||||||
|
Path VARCHAR(255),
|
||||||
|
Username VARCHAR(100) NOT NULL,
|
||||||
|
Data JSON,
|
||||||
|
Date timestamp DEFAULT current_timestamp
|
||||||
|
);
|
@ -1,4 +1,3 @@
|
|||||||
from .http import get_app
|
from .http import get_app, services
|
||||||
|
|
||||||
__ALL__ = ('get_app',)
|
|
||||||
|
|
||||||
|
__ALL__ = ('get_app', 'services')
|
||||||
|
@ -1,34 +1,170 @@
|
|||||||
from os import environ
|
from os import environ
|
||||||
|
from os.path import isfile
|
||||||
|
from configobj import ConfigObj
|
||||||
|
from uuid import uuid4
|
||||||
|
|
||||||
|
|
||||||
CONFIGURATION_DIR = 'configurations'
|
CONFIG_FILE = environ.get('CONFIG_FILE', '/etc/risotto/risotto.conf')
|
||||||
TMP_DIR = 'tmp'
|
|
||||||
DEFAULT_USER = environ.get('DEFAULT_USER', 'Anonymous')
|
|
||||||
DEFAULT_DSN = environ.get('RISOTTO_DSN', 'postgres:///risotto?host=/var/run/postgresql/&user=risotto')
|
if isfile(CONFIG_FILE):
|
||||||
DEFAULT_TIRAMISU_DSN = environ.get('DEFAULT_TIRAMISU_DSN', 'postgres:///tiramisu?host=/var/run/postgresql/&user=tiramisu')
|
config = ConfigObj(CONFIG_FILE)
|
||||||
MESSAGE_PATH = environ.get('MESSAGE_PATH', '/root/risotto-message/messages')
|
else:
|
||||||
MODULE_NAME = environ.get('MODULE_NAME', 'test')
|
config = {}
|
||||||
SQL_FILENAME = f'/root/risotto-{MODULE_NAME}/sql/init.sql'
|
|
||||||
|
|
||||||
|
if 'RISOTTO_PORT' in environ:
|
||||||
|
RISOTTO_PORT = environ['RISOTTO_PORT']
|
||||||
|
else:
|
||||||
|
RISOTTO_PORT = config.get('RISOTTO_PORT', 8080)
|
||||||
|
if 'CONFIGURATION_DIR' in environ:
|
||||||
|
CONFIGURATION_DIR = environ['CONFIGURATION_DIR']
|
||||||
|
else:
|
||||||
|
CONFIGURATION_DIR = config.get('CONFIGURATION_DIR', '/srv/risotto/configurations')
|
||||||
|
if 'DEFAULT_USER' in environ:
|
||||||
|
DEFAULT_USER = environ['DEFAULT_USER']
|
||||||
|
else:
|
||||||
|
DEFAULT_USER = config.get('DEFAULT_USER', 'Anonymous')
|
||||||
|
if 'RISOTTO_DB_NAME' in environ:
|
||||||
|
RISOTTO_DB_NAME = environ['RISOTTO_DB_NAME']
|
||||||
|
else:
|
||||||
|
RISOTTO_DB_NAME = config.get('RISOTTO_DB_NAME', 'risotto')
|
||||||
|
if 'RISOTTO_DB_PASSWORD' in environ:
|
||||||
|
RISOTTO_DB_PASSWORD = environ['RISOTTO_DB_PASSWORD']
|
||||||
|
else:
|
||||||
|
RISOTTO_DB_PASSWORD = config.get('RISOTTO_DB_PASSWORD', 'risotto')
|
||||||
|
if 'RISOTTO_DB_USER' in environ:
|
||||||
|
RISOTTO_DB_USER = environ['RISOTTO_DB_USER']
|
||||||
|
else:
|
||||||
|
RISOTTO_DB_USER = config.get('RISOTTO_DB_USER', 'risotto')
|
||||||
|
if 'TIRAMISU_DB_NAME' in environ:
|
||||||
|
TIRAMISU_DB_NAME = environ['TIRAMISU_DB_NAME']
|
||||||
|
else:
|
||||||
|
TIRAMISU_DB_NAME = config.get('TIRAMISU_DB_NAME', 'tiramisu')
|
||||||
|
if 'TIRAMISU_DB_PASSWORD' in environ:
|
||||||
|
TIRAMISU_DB_PASSWORD = environ['TIRAMISU_DB_PASSWORD']
|
||||||
|
else:
|
||||||
|
TIRAMISU_DB_PASSWORD = config.get('TIRAMISU_DB_PASSWORD', 'tiramisu')
|
||||||
|
if 'TIRAMISU_DB_USER' in environ:
|
||||||
|
TIRAMISU_DB_USER = environ['TIRAMISU_DB_USER']
|
||||||
|
else:
|
||||||
|
TIRAMISU_DB_USER = config.get('TIRAMISU_DB_USER', 'tiramisu')
|
||||||
|
if 'CELERYRISOTTO_DB_NAME' in environ:
|
||||||
|
CELERYRISOTTO_DB_NAME = environ['CELERYRISOTTO_DB_NAME']
|
||||||
|
else:
|
||||||
|
CELERYRISOTTO_DB_NAME = config.get('CELERYRISOTTO_DB_NAME', None)
|
||||||
|
if 'CELERYRISOTTO_DB_PASSWORD' in environ:
|
||||||
|
CELERYRISOTTO_DB_PASSWORD = environ['CELERYRISOTTO_DB_PASSWORD']
|
||||||
|
else:
|
||||||
|
CELERYRISOTTO_DB_PASSWORD = config.get('CELERYRISOTTO_DB_PASSWORD', None)
|
||||||
|
if 'CELERYRISOTTO_DB_USER' in environ:
|
||||||
|
CELERYRISOTTO_DB_USER = environ['CELERYRISOTTO_DB_USER']
|
||||||
|
else:
|
||||||
|
CELERYRISOTTO_DB_USER = config.get('CELERYRISOTTO_DB_USER', None)
|
||||||
|
if 'DB_ADDRESS' in environ:
|
||||||
|
DB_ADDRESS = environ['DB_ADDRESS']
|
||||||
|
else:
|
||||||
|
DB_ADDRESS = config.get('DB_ADDRESS', 'localhost')
|
||||||
|
if 'MESSAGE_PATH' in environ:
|
||||||
|
MESSAGE_PATH = environ['MESSAGE_PATH']
|
||||||
|
else:
|
||||||
|
MESSAGE_PATH = config.get('MESSAGE_PATH', '/root/risotto-message/messages')
|
||||||
|
if 'SQL_DIR' in environ:
|
||||||
|
SQL_DIR = environ['SQL_DIR']
|
||||||
|
else:
|
||||||
|
SQL_DIR = config.get('SQL_DIR', './sql')
|
||||||
|
if 'CACHE_ROOT_PATH' in environ:
|
||||||
|
CACHE_ROOT_PATH = environ['CACHE_ROOT_PATH']
|
||||||
|
else:
|
||||||
|
CACHE_ROOT_PATH = config.get('CACHE_ROOT_PATH', '/var/cache/risotto')
|
||||||
|
if 'SRV_SEED_PATH' in environ:
|
||||||
|
SRV_SEED_PATH = environ['SRV_SEED_PATH']
|
||||||
|
else:
|
||||||
|
SRV_SEED_PATH = config.get('SRV_SEED_PATH', '/srv/seed')
|
||||||
|
if 'TMP_DIR' in environ:
|
||||||
|
TMP_DIR = environ['TMP_DIR']
|
||||||
|
else:
|
||||||
|
TMP_DIR = config.get('TMP_DIR', '/tmp')
|
||||||
|
if 'IMAGE_PATH' in environ:
|
||||||
|
IMAGE_PATH = environ['IMAGE_PATH']
|
||||||
|
else:
|
||||||
|
IMAGE_PATH = config.get('IMAGE_PATH', '/tmp')
|
||||||
|
if 'PASSWORD_ADMIN_USERNAME' in environ:
|
||||||
|
PASSWORD_ADMIN_USERNAME = environ['PASSWORD_ADMIN_USERNAME']
|
||||||
|
else:
|
||||||
|
PASSWORD_ADMIN_USERNAME = config.get('PASSWORD_ADMIN_USERNAME', 'risotto')
|
||||||
|
if 'PASSWORD_ADMIN_EMAIL' in environ:
|
||||||
|
PASSWORD_ADMIN_EMAIL = environ['PASSWORD_ADMIN_EMAIL']
|
||||||
|
else:
|
||||||
|
# this parameter is mandatory
|
||||||
|
PASSWORD_ADMIN_EMAIL = config['PASSWORD_ADMIN_EMAIL']
|
||||||
|
if 'PASSWORD_ADMIN_PASSWORD' in environ:
|
||||||
|
PASSWORD_ADMIN_PASSWORD = environ['PASSWORD_ADMIN_PASSWORD']
|
||||||
|
else:
|
||||||
|
# this parameter is mandatory
|
||||||
|
PASSWORD_ADMIN_PASSWORD = config['PASSWORD_ADMIN_PASSWORD']
|
||||||
|
if 'PASSWORD_DEVICE_IDENTIFIER' in environ:
|
||||||
|
PASSWORD_DEVICE_IDENTIFIER = environ['PASSWORD_DEVICE_IDENTIFIER']
|
||||||
|
else:
|
||||||
|
PASSWORD_DEVICE_IDENTIFIER = config.get('PASSWORD_DEVICE_IDENTIFIER', uuid4())
|
||||||
|
if 'PASSWORD_URL' in environ:
|
||||||
|
PASSWORD_URL = environ['PASSWORD_URL']
|
||||||
|
else:
|
||||||
|
PASSWORD_URL = config.get('PASSWORD_URL', 'https://localhost:8001/')
|
||||||
|
if 'PKI_ADMIN_PASSWORD' in environ:
|
||||||
|
PKI_ADMIN_PASSWORD = environ['PKI_ADMIN_PASSWORD']
|
||||||
|
else:
|
||||||
|
PKI_ADMIN_PASSWORD = config['PKI_ADMIN_PASSWORD']
|
||||||
|
if 'PKI_ADMIN_EMAIL' in environ:
|
||||||
|
PKI_ADMIN_EMAIL = environ['PKI_ADMIN_EMAIL']
|
||||||
|
else:
|
||||||
|
PKI_ADMIN_EMAIL = config['PKI_ADMIN_EMAIL']
|
||||||
|
if 'PKI_URL' in environ:
|
||||||
|
PKI_URL = environ['PKI_URL']
|
||||||
|
else:
|
||||||
|
PKI_URL = config.get('PKI_URL', 'http://localhost:8002')
|
||||||
|
|
||||||
|
|
||||||
|
def dsn_factory(database, user, password, address=DB_ADDRESS):
|
||||||
|
mangled_address = '/var/run/postgresql' if address == 'localhost' else address
|
||||||
|
return f'postgres:///{database}?host={mangled_address}/&user={user}&password={password}'
|
||||||
|
|
||||||
|
|
||||||
|
_config = {'database': {'dsn': dsn_factory(RISOTTO_DB_NAME, RISOTTO_DB_USER, RISOTTO_DB_PASSWORD),
|
||||||
|
'tiramisu_dsn': dsn_factory(TIRAMISU_DB_NAME, TIRAMISU_DB_USER, TIRAMISU_DB_PASSWORD),
|
||||||
|
'celery_dsn': dsn_factory(CELERYRISOTTO_DB_NAME, CELERYRISOTTO_DB_USER, CELERYRISOTTO_DB_PASSWORD)
|
||||||
|
},
|
||||||
|
'http_server': {'port': RISOTTO_PORT,
|
||||||
|
'default_user': DEFAULT_USER},
|
||||||
|
'global': {'message_root_path': MESSAGE_PATH,
|
||||||
|
'configurations_dir': CONFIGURATION_DIR,
|
||||||
|
'debug': True,
|
||||||
|
'internal_user': '_internal',
|
||||||
|
'check_role': True,
|
||||||
|
'admin_user': DEFAULT_USER,
|
||||||
|
'sql_dir': SQL_DIR,
|
||||||
|
'tmp_dir': TMP_DIR,
|
||||||
|
},
|
||||||
|
'password': {'admin_username': PASSWORD_ADMIN_USERNAME,
|
||||||
|
'admin_email': PASSWORD_ADMIN_EMAIL,
|
||||||
|
'admin_password': PASSWORD_ADMIN_PASSWORD,
|
||||||
|
'device_identifier': PASSWORD_DEVICE_IDENTIFIER,
|
||||||
|
'service_url': PASSWORD_URL,
|
||||||
|
},
|
||||||
|
'pki': {'admin_password': PKI_ADMIN_PASSWORD,
|
||||||
|
'owner': PKI_ADMIN_EMAIL,
|
||||||
|
'url': PKI_URL,
|
||||||
|
},
|
||||||
|
'cache': {'root_path': CACHE_ROOT_PATH},
|
||||||
|
'servermodel': {'internal_source_path': SRV_SEED_PATH,
|
||||||
|
'internal_source': 'internal'},
|
||||||
|
'submodule': {'allow_insecure_https': False,
|
||||||
|
'pki': '192.168.56.112'},
|
||||||
|
'provider': {'factory_configuration_filename': 'infra.json',
|
||||||
|
'packer_filename': 'recipe.json',
|
||||||
|
'risotto_images_dir': IMAGE_PATH},
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
def get_config():
|
def get_config():
|
||||||
return {'database': {'dsn': DEFAULT_DSN,
|
return _config
|
||||||
'tiramisu_dsn': DEFAULT_TIRAMISU_DSN,
|
|
||||||
},
|
|
||||||
'http_server': {'port': 8080,
|
|
||||||
'default_user': DEFAULT_USER},
|
|
||||||
'global': {'message_root_path': MESSAGE_PATH,
|
|
||||||
'debug': True,
|
|
||||||
'internal_user': 'internal',
|
|
||||||
'check_role': True,
|
|
||||||
'admin_user': DEFAULT_USER,
|
|
||||||
'module_name': MODULE_NAME,
|
|
||||||
'sql_filename': SQL_FILENAME},
|
|
||||||
'source': {'root_path': '/srv/seed'},
|
|
||||||
'cache': {'root_path': '/var/cache/risotto'},
|
|
||||||
'servermodel': {'internal_source': 'internal',
|
|
||||||
'internal_distribution': 'last',
|
|
||||||
'internal_release_name': 'none'},
|
|
||||||
'submodule': {'allow_insecure_https': False,
|
|
||||||
'pki': '192.168.56.112'},
|
|
||||||
}
|
|
||||||
|
@ -1,49 +1,54 @@
|
|||||||
from .config import get_config
|
|
||||||
from .dispatcher import dispatcher
|
from .dispatcher import dispatcher
|
||||||
from .context import Context
|
from .context import Context
|
||||||
from .remote import remote
|
from .utils import _
|
||||||
|
|
||||||
|
|
||||||
class Controller:
|
class Controller:
|
||||||
"""Common controller used to add a service in Risotto
|
"""Common controller used to add a service in Risotto
|
||||||
"""
|
"""
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
test: bool):
|
test: bool,
|
||||||
self.submodule = get_config()['global']['module_name']
|
):
|
||||||
|
pass
|
||||||
|
|
||||||
async def call(self,
|
async def call(self,
|
||||||
uri: str,
|
uri: str,
|
||||||
risotto_context: Context,
|
risotto_context: Context,
|
||||||
**kwargs):
|
*args,
|
||||||
|
**kwargs,
|
||||||
|
):
|
||||||
""" a wrapper to dispatcher's call"""
|
""" a wrapper to dispatcher's call"""
|
||||||
version, submodule, message = uri.split('.', 2)
|
if args:
|
||||||
uri = submodule + '.' + message
|
raise ValueError(_(f'the URI "{uri}" can only be called with keyword arguments'))
|
||||||
if submodule != self.submodule:
|
current_uri = risotto_context.paths[-1]
|
||||||
return await remote.call_or_publish(submodule,
|
current_module = risotto_context.module
|
||||||
version,
|
version, message = uri.split('.', 1)
|
||||||
message,
|
module = message.split('.', 1)[0]
|
||||||
kwargs)
|
if current_module != module:
|
||||||
|
raise ValueError(_(f'cannot call to external module ("{module}") to the URI "{uri}" from "{current_module}"'))
|
||||||
return await dispatcher.call(version,
|
return await dispatcher.call(version,
|
||||||
uri,
|
message,
|
||||||
risotto_context,
|
risotto_context,
|
||||||
**kwargs)
|
**kwargs,
|
||||||
|
)
|
||||||
|
|
||||||
async def publish(self,
|
async def publish(self,
|
||||||
uri: str,
|
uri: str,
|
||||||
risotto_context: Context,
|
risotto_context: Context,
|
||||||
**kwargs):
|
*args,
|
||||||
|
**kwargs,
|
||||||
|
):
|
||||||
""" a wrapper to dispatcher's publish"""
|
""" a wrapper to dispatcher's publish"""
|
||||||
version, submodule, uri = uri.split('.', 2)
|
if args:
|
||||||
if submodule != self.submodule:
|
raise ValueError(_(f'the URI "{uri}" can only be published with keyword arguments'))
|
||||||
await remote.call_or_publish(submodule,
|
version, message = uri.split('.', 1)
|
||||||
version,
|
|
||||||
message,
|
|
||||||
kwargs)
|
|
||||||
await dispatcher.publish(version,
|
await dispatcher.publish(version,
|
||||||
uri,
|
message,
|
||||||
risotto_context,
|
risotto_context,
|
||||||
**kwargs)
|
**kwargs,
|
||||||
|
)
|
||||||
|
|
||||||
async def on_join(self,
|
async def on_join(self,
|
||||||
risotto_context):
|
risotto_context,
|
||||||
|
):
|
||||||
pass
|
pass
|
||||||
|
@ -1,4 +1,10 @@
|
|||||||
from tiramisu import Config
|
try:
|
||||||
|
from tiramisu3 import Config
|
||||||
|
from tiramisu3.error import ValueOptionError
|
||||||
|
except:
|
||||||
|
from tiramisu import Config
|
||||||
|
from tiramisu.error import ValueOptionError
|
||||||
|
from asyncio import get_event_loop, ensure_future
|
||||||
from traceback import print_exc
|
from traceback import print_exc
|
||||||
from copy import copy
|
from copy import copy
|
||||||
from typing import Dict, Callable, List, Optional
|
from typing import Dict, Callable, List, Optional
|
||||||
@ -10,8 +16,6 @@ from .logger import log
|
|||||||
from .config import get_config
|
from .config import get_config
|
||||||
from .context import Context
|
from .context import Context
|
||||||
from . import register
|
from . import register
|
||||||
from .remote import Remote
|
|
||||||
import asyncpg
|
|
||||||
|
|
||||||
|
|
||||||
class CallDispatcher:
|
class CallDispatcher:
|
||||||
@ -39,28 +43,28 @@ class CallDispatcher:
|
|||||||
raise Exception('hu?')
|
raise Exception('hu?')
|
||||||
else:
|
else:
|
||||||
for ret in returns:
|
for ret in returns:
|
||||||
async with await Config(response, display_name=lambda self, dyn_name: self.impl_getname()) as config:
|
async with await Config(response, display_name=lambda self, dyn_name, suffix: self.impl_getname()) as config:
|
||||||
await config.property.read_write()
|
await config.property.read_write()
|
||||||
try:
|
try:
|
||||||
for key, value in ret.items():
|
for key, value in ret.items():
|
||||||
await config.option(key).value.set(value)
|
await config.option(key).value.set(value)
|
||||||
except AttributeError:
|
except AttributeError:
|
||||||
err = _(f'function {module_name}.{function_name} return the unknown parameter "{key}"')
|
err = _(f'function {module_name}.{function_name} return the unknown parameter "{key}" for the uri "{risotto_context.version}.{risotto_context.message}"')
|
||||||
await log.error_msg(risotto_context, kwargs, err)
|
await log.error_msg(risotto_context, kwargs, err)
|
||||||
raise CallError(str(err))
|
raise CallError(str(err))
|
||||||
except ValueError:
|
except ValueError:
|
||||||
err = _(f'function {module_name}.{function_name} return the parameter "{key}" with an unvalid value "{value}"')
|
err = _(f'function {module_name}.{function_name} return the parameter "{key}" with an unvalid value "{value}" for the uri "{risotto_context.version}.{risotto_context.message}"')
|
||||||
await log.error_msg(risotto_context, kwargs, err)
|
await log.error_msg(risotto_context, kwargs, err)
|
||||||
raise CallError(str(err))
|
raise CallError(str(err))
|
||||||
await config.property.read_only()
|
await config.property.read_only()
|
||||||
mandatories = await config.value.mandatory()
|
mandatories = await config.value.mandatory()
|
||||||
if mandatories:
|
if mandatories:
|
||||||
mand = [mand.split('.')[-1] for mand in mandatories]
|
mand = [mand.split('.')[-1] for mand in mandatories]
|
||||||
raise ValueError(_(f'missing parameters in response: {mand} in message "{risotto_context.message}"'))
|
raise ValueError(_(f'missing parameters in response of the uri "{risotto_context.version}.{risotto_context.message}": {mand} in message'))
|
||||||
try:
|
try:
|
||||||
await config.value.dict()
|
await config.value.dict()
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
err = _(f'function {module_name}.{function_name} return an invalid response {err}')
|
err = _(f'function {module_name}.{function_name} return an invalid response {err} for the uri "{risotto_context.version}.{risotto_context.message}"')
|
||||||
await log.error_msg(risotto_context, kwargs, err)
|
await log.error_msg(risotto_context, kwargs, err)
|
||||||
raise CallError(str(err))
|
raise CallError(str(err))
|
||||||
|
|
||||||
@ -69,26 +73,50 @@ class CallDispatcher:
|
|||||||
message: str,
|
message: str,
|
||||||
old_risotto_context: Context,
|
old_risotto_context: Context,
|
||||||
check_role: bool=False,
|
check_role: bool=False,
|
||||||
**kwargs):
|
internal: bool=True,
|
||||||
|
**kwargs,
|
||||||
|
):
|
||||||
""" execute the function associate with specified uri
|
""" execute the function associate with specified uri
|
||||||
arguments are validate before
|
arguments are validate before
|
||||||
"""
|
"""
|
||||||
risotto_context = self.build_new_context(old_risotto_context,
|
risotto_context = self.build_new_context(old_risotto_context.__dict__,
|
||||||
version,
|
version,
|
||||||
message,
|
message,
|
||||||
'rpc')
|
'rpc',
|
||||||
function_objs = [self.messages[version][message]]
|
)
|
||||||
|
if version not in self.messages:
|
||||||
|
raise CallError(_(f'cannot find version of message "{version}"'))
|
||||||
|
if message not in self.messages[version]:
|
||||||
|
raise CallError(_(f'cannot find message "{version}.{message}"'))
|
||||||
|
function_obj = self.messages[version][message]
|
||||||
# do not start a new database connection
|
# do not start a new database connection
|
||||||
if hasattr(old_risotto_context, 'connection'):
|
if hasattr(old_risotto_context, 'connection'):
|
||||||
risotto_context.connection = old_risotto_context.connection
|
risotto_context.connection = old_risotto_context.connection
|
||||||
return await self.launch(version,
|
await self.check_message_type(risotto_context,
|
||||||
message,
|
kwargs,
|
||||||
risotto_context,
|
)
|
||||||
check_role,
|
config_arguments = await self.load_kwargs_to_config(risotto_context,
|
||||||
|
f'{version}.{message}',
|
||||||
|
kwargs,
|
||||||
|
check_role,
|
||||||
|
internal,
|
||||||
|
)
|
||||||
|
return await self.launch(risotto_context,
|
||||||
kwargs,
|
kwargs,
|
||||||
function_objs)
|
config_arguments,
|
||||||
|
function_obj,
|
||||||
|
)
|
||||||
else:
|
else:
|
||||||
try:
|
try:
|
||||||
|
await self.check_message_type(risotto_context,
|
||||||
|
kwargs,
|
||||||
|
)
|
||||||
|
config_arguments = await self.load_kwargs_to_config(risotto_context,
|
||||||
|
f'{version}.{message}',
|
||||||
|
kwargs,
|
||||||
|
check_role,
|
||||||
|
internal,
|
||||||
|
)
|
||||||
async with self.pool.acquire() as connection:
|
async with self.pool.acquire() as connection:
|
||||||
await connection.set_type_codec(
|
await connection.set_type_codec(
|
||||||
'json',
|
'json',
|
||||||
@ -98,12 +126,11 @@ class CallDispatcher:
|
|||||||
)
|
)
|
||||||
risotto_context.connection = connection
|
risotto_context.connection = connection
|
||||||
async with connection.transaction():
|
async with connection.transaction():
|
||||||
return await self.launch(version,
|
return await self.launch(risotto_context,
|
||||||
message,
|
|
||||||
risotto_context,
|
|
||||||
check_role,
|
|
||||||
kwargs,
|
kwargs,
|
||||||
function_objs)
|
config_arguments,
|
||||||
|
function_obj,
|
||||||
|
)
|
||||||
except CallError as err:
|
except CallError as err:
|
||||||
raise err
|
raise err
|
||||||
except Exception as err:
|
except Exception as err:
|
||||||
@ -124,29 +151,80 @@ class CallDispatcher:
|
|||||||
|
|
||||||
|
|
||||||
class PublishDispatcher:
|
class PublishDispatcher:
|
||||||
|
async def register_remote(self) -> None:
|
||||||
|
print()
|
||||||
|
print(_('======== Registered remote event ========'))
|
||||||
|
self.listened_connection = await self.pool.acquire()
|
||||||
|
for version, messages in self.messages.items():
|
||||||
|
for message, message_infos in messages.items():
|
||||||
|
# event not emit locally
|
||||||
|
if message_infos['pattern'] == 'event' and 'functions' in message_infos and message_infos['functions']:
|
||||||
|
# module, submodule, submessage = message.split('.', 2)
|
||||||
|
# if f'{module}.{submodule}' not in self.injected_self:
|
||||||
|
uri = f'{version}.{message}'
|
||||||
|
print(f' - {uri}')
|
||||||
|
await self.listened_connection.add_listener(uri,
|
||||||
|
self.to_async_publish,
|
||||||
|
)
|
||||||
|
|
||||||
async def publish(self,
|
async def publish(self,
|
||||||
version: str,
|
version: str,
|
||||||
message: str,
|
message: str,
|
||||||
old_risotto_context: Context,
|
risotto_context: Context,
|
||||||
check_role: bool=False,
|
**kwargs,
|
||||||
**kwargs) -> None:
|
) -> None:
|
||||||
risotto_context = self.build_new_context(old_risotto_context,
|
if version not in self.messages or message not in self.messages[version]:
|
||||||
|
raise ValueError(_(f'cannot find URI "{version}.{message}"'))
|
||||||
|
|
||||||
|
# publish to remote
|
||||||
|
remote_kw = dumps({'kwargs': kwargs,
|
||||||
|
'context': {'username': risotto_context.username,
|
||||||
|
'paths': risotto_context.paths,
|
||||||
|
}
|
||||||
|
})
|
||||||
|
# FIXME should be better :/
|
||||||
|
remote_kw = remote_kw.replace("'", "''")
|
||||||
|
await risotto_context.connection.execute(f'NOTIFY "{version}.{message}", \'{remote_kw}\'')
|
||||||
|
|
||||||
|
def to_async_publish(self,
|
||||||
|
con: 'asyncpg.connection.Connection',
|
||||||
|
pid: int,
|
||||||
|
uri: str,
|
||||||
|
payload: str,
|
||||||
|
) -> None:
|
||||||
|
version, message = uri.split('.', 1)
|
||||||
|
loop = get_event_loop()
|
||||||
|
remote_kw = loads(payload)
|
||||||
|
risotto_context = self.build_new_context(remote_kw['context'],
|
||||||
version,
|
version,
|
||||||
message,
|
message,
|
||||||
'event')
|
'event',
|
||||||
function_objs = self.messages[version][message].get('functions', [])
|
)
|
||||||
# do not start a new database connection
|
callback = lambda: ensure_future(self._publish(version,
|
||||||
if hasattr(old_risotto_context, 'connection'):
|
message,
|
||||||
risotto_context.connection = old_risotto_context.connection
|
risotto_context,
|
||||||
return await self.launch(version,
|
**remote_kw['kwargs'],
|
||||||
message,
|
))
|
||||||
risotto_context,
|
loop.call_soon(callback)
|
||||||
check_role,
|
|
||||||
kwargs,
|
async def _publish(self,
|
||||||
function_objs)
|
version: str,
|
||||||
else:
|
message: str,
|
||||||
try:
|
risotto_context: Context,
|
||||||
async with self.pool.acquire() as connection:
|
**kwargs,
|
||||||
|
) -> None:
|
||||||
|
config_arguments = await self.load_kwargs_to_config(risotto_context,
|
||||||
|
f'{version}.{message}',
|
||||||
|
kwargs,
|
||||||
|
False,
|
||||||
|
False,
|
||||||
|
)
|
||||||
|
for function_obj in self.messages[version][message]['functions']:
|
||||||
|
async with self.pool.acquire() as connection:
|
||||||
|
try:
|
||||||
|
await self.check_message_type(risotto_context,
|
||||||
|
kwargs,
|
||||||
|
)
|
||||||
await connection.set_type_codec(
|
await connection.set_type_codec(
|
||||||
'json',
|
'json',
|
||||||
encoder=dumps,
|
encoder=dumps,
|
||||||
@ -155,49 +233,47 @@ class PublishDispatcher:
|
|||||||
)
|
)
|
||||||
risotto_context.connection = connection
|
risotto_context.connection = connection
|
||||||
async with connection.transaction():
|
async with connection.transaction():
|
||||||
return await self.launch(version,
|
await self.launch(risotto_context,
|
||||||
message,
|
kwargs,
|
||||||
risotto_context,
|
config_arguments,
|
||||||
check_role,
|
function_obj,
|
||||||
kwargs,
|
)
|
||||||
function_objs)
|
except CallError as err:
|
||||||
except CallError as err:
|
pass
|
||||||
raise err
|
except Exception as err:
|
||||||
except Exception as err:
|
# if there is a problem with arguments, log and do nothing
|
||||||
# if there is a problem with arguments, just send an error and do nothing
|
if get_config()['global']['debug']:
|
||||||
if get_config()['global']['debug']:
|
print_exc()
|
||||||
print_exc()
|
async with self.pool.acquire() as connection:
|
||||||
async with self.pool.acquire() as connection:
|
await connection.set_type_codec(
|
||||||
await connection.set_type_codec(
|
'json',
|
||||||
'json',
|
encoder=dumps,
|
||||||
encoder=dumps,
|
decoder=loads,
|
||||||
decoder=loads,
|
schema='pg_catalog'
|
||||||
schema='pg_catalog'
|
)
|
||||||
)
|
risotto_context.connection = connection
|
||||||
risotto_context.connection = connection
|
async with connection.transaction():
|
||||||
async with connection.transaction():
|
await log.error_msg(risotto_context, kwargs, err)
|
||||||
await log.error_msg(risotto_context, kwargs, err)
|
|
||||||
raise err
|
|
||||||
|
|
||||||
|
|
||||||
class Dispatcher(register.RegisterDispatcher,
|
class Dispatcher(register.RegisterDispatcher,
|
||||||
Remote,
|
|
||||||
CallDispatcher,
|
CallDispatcher,
|
||||||
PublishDispatcher):
|
PublishDispatcher):
|
||||||
""" Manage message (call or publish)
|
""" Manage message (call or publish)
|
||||||
so launch a function when a message is called
|
so launch a function when a message is called
|
||||||
"""
|
"""
|
||||||
def build_new_context(self,
|
def build_new_context(self,
|
||||||
old_risotto_context: Context,
|
context: dict,
|
||||||
version: str,
|
version: str,
|
||||||
message: str,
|
message: str,
|
||||||
type: str):
|
type: str,
|
||||||
|
) -> Context:
|
||||||
""" This is a new call or a new publish, so create a new context
|
""" This is a new call or a new publish, so create a new context
|
||||||
"""
|
"""
|
||||||
uri = version + '.' + message
|
uri = version + '.' + message
|
||||||
risotto_context = Context()
|
risotto_context = Context()
|
||||||
risotto_context.username = old_risotto_context.username
|
risotto_context.username = context['username']
|
||||||
risotto_context.paths = copy(old_risotto_context.paths)
|
risotto_context.paths = copy(context['paths'])
|
||||||
risotto_context.paths.append(uri)
|
risotto_context.paths.append(uri)
|
||||||
risotto_context.uri = uri
|
risotto_context.uri = uri
|
||||||
risotto_context.type = type
|
risotto_context.type = type
|
||||||
@ -207,7 +283,8 @@ class Dispatcher(register.RegisterDispatcher,
|
|||||||
|
|
||||||
async def check_message_type(self,
|
async def check_message_type(self,
|
||||||
risotto_context: Context,
|
risotto_context: Context,
|
||||||
kwargs: Dict):
|
kwargs: Dict,
|
||||||
|
) -> None:
|
||||||
if self.messages[risotto_context.version][risotto_context.message]['pattern'] != risotto_context.type:
|
if self.messages[risotto_context.version][risotto_context.message]['pattern'] != risotto_context.type:
|
||||||
msg = _(f'{risotto_context.uri} is not a {risotto_context.type} message')
|
msg = _(f'{risotto_context.uri} is not a {risotto_context.type} message')
|
||||||
await log.error_msg(risotto_context, kwargs, msg)
|
await log.error_msg(risotto_context, kwargs, msg)
|
||||||
@ -217,23 +294,31 @@ class Dispatcher(register.RegisterDispatcher,
|
|||||||
risotto_context: Context,
|
risotto_context: Context,
|
||||||
uri: str,
|
uri: str,
|
||||||
kwargs: Dict,
|
kwargs: Dict,
|
||||||
check_role: bool):
|
check_role: bool,
|
||||||
|
internal: bool,
|
||||||
|
):
|
||||||
""" create a new Config et set values to it
|
""" create a new Config et set values to it
|
||||||
"""
|
"""
|
||||||
# create a new config
|
# create a new config
|
||||||
async with await Config(self.option) as config:
|
async with await Config(self.option) as config:
|
||||||
await config.property.read_write()
|
await config.property.read_write()
|
||||||
# set message's option
|
# set message's option
|
||||||
await config.option('message').value.set(risotto_context.message)
|
await config.option('message').value.set(uri)
|
||||||
# store values
|
# store values
|
||||||
subconfig = config.option(risotto_context.message)
|
subconfig = config.option(uri)
|
||||||
|
extra_parameters = {}
|
||||||
for key, value in kwargs.items():
|
for key, value in kwargs.items():
|
||||||
try:
|
if not internal or not key.startswith('_'):
|
||||||
await subconfig.option(key).value.set(value)
|
try:
|
||||||
except AttributeError:
|
await subconfig.option(key).value.set(value)
|
||||||
if get_config()['global']['debug']:
|
except AttributeError:
|
||||||
print_exc()
|
if get_config()['global']['debug']:
|
||||||
raise ValueError(_(f'unknown parameter in "{uri}": "{key}"'))
|
print_exc()
|
||||||
|
raise ValueError(_(f'unknown parameter in "{uri}": "{key}"'))
|
||||||
|
except ValueOptionError as err:
|
||||||
|
raise ValueError(_(f'invalid parameter in "{uri}": {err}'))
|
||||||
|
else:
|
||||||
|
extra_parameters[key] = value
|
||||||
# check mandatories options
|
# check mandatories options
|
||||||
if check_role and get_config().get('global').get('check_role'):
|
if check_role and get_config().get('global').get('check_role'):
|
||||||
await self.check_role(subconfig,
|
await self.check_role(subconfig,
|
||||||
@ -245,7 +330,10 @@ class Dispatcher(register.RegisterDispatcher,
|
|||||||
mand = [mand.split('.')[-1] for mand in mandatories]
|
mand = [mand.split('.')[-1] for mand in mandatories]
|
||||||
raise ValueError(_(f'missing parameters in "{uri}": {mand}'))
|
raise ValueError(_(f'missing parameters in "{uri}": {mand}'))
|
||||||
# return complete an validated kwargs
|
# return complete an validated kwargs
|
||||||
return await subconfig.value.dict()
|
parameters = await subconfig.value.dict()
|
||||||
|
if extra_parameters:
|
||||||
|
parameters.update(extra_parameters)
|
||||||
|
return parameters
|
||||||
|
|
||||||
def get_service(self,
|
def get_service(self,
|
||||||
name: str):
|
name: str):
|
||||||
@ -260,8 +348,8 @@ class Dispatcher(register.RegisterDispatcher,
|
|||||||
# Verify if user exists and get ID
|
# Verify if user exists and get ID
|
||||||
sql = '''
|
sql = '''
|
||||||
SELECT UserId
|
SELECT UserId
|
||||||
FROM RisottoUser
|
FROM UserUser
|
||||||
WHERE UserLogin = $1
|
WHERE Login = $1
|
||||||
'''
|
'''
|
||||||
user_id = await connection.fetchval(sql,
|
user_id = await connection.fetchval(sql,
|
||||||
user_login)
|
user_login)
|
||||||
@ -278,8 +366,8 @@ class Dispatcher(register.RegisterDispatcher,
|
|||||||
# Check role
|
# Check role
|
||||||
select_role_uri = '''
|
select_role_uri = '''
|
||||||
SELECT RoleName
|
SELECT RoleName
|
||||||
FROM URI, RoleURI
|
FROM UserURI, UserRoleURI
|
||||||
WHERE URI.URIName = $1 AND RoleURI.URIId = URI.URIId
|
WHERE UserURI.URIName = $1 AND UserRoleURI.URIId = UserURI.URIId
|
||||||
'''
|
'''
|
||||||
select_role_user = '''
|
select_role_user = '''
|
||||||
SELECT RoleAttribute, RoleAttributeValue
|
SELECT RoleAttribute, RoleAttributeValue
|
||||||
@ -299,77 +387,55 @@ class Dispatcher(register.RegisterDispatcher,
|
|||||||
raise NotAllowedError(_(f'You ({user_login}) don\'t have any authorisation to access to "{uri}"'))
|
raise NotAllowedError(_(f'You ({user_login}) don\'t have any authorisation to access to "{uri}"'))
|
||||||
|
|
||||||
async def launch(self,
|
async def launch(self,
|
||||||
version: str,
|
|
||||||
message: str,
|
|
||||||
risotto_context: Context,
|
risotto_context: Context,
|
||||||
check_role: bool,
|
|
||||||
kwargs: Dict,
|
kwargs: Dict,
|
||||||
function_objs: List) -> Optional[Dict]:
|
config_arguments: dict,
|
||||||
await self.check_message_type(risotto_context,
|
function_obj: Callable,
|
||||||
kwargs)
|
) -> Optional[Dict]:
|
||||||
config_arguments = await self.load_kwargs_to_config(risotto_context,
|
# so send the message
|
||||||
f'{version}.{message}',
|
function = function_obj['function']
|
||||||
kwargs,
|
risotto_context.module = function_obj['module'].split('.', 1)[0]
|
||||||
check_role)
|
function_name = function.__name__
|
||||||
# config is ok, so send the message
|
info_msg = _(f"in function {function_obj['full_module_name']}.{function_name}")
|
||||||
for function_obj in function_objs:
|
# build argument for this function
|
||||||
function = function_obj['function']
|
if risotto_context.type == 'rpc':
|
||||||
module_name = function.__module__.split('.')[-2]
|
kw = config_arguments
|
||||||
function_name = function.__name__
|
else:
|
||||||
info_msg = _(f'in module {module_name}.{function_name}')
|
kw = {}
|
||||||
try:
|
for key, value in config_arguments.items():
|
||||||
# build argument for this function
|
if key in function_obj['arguments']:
|
||||||
if risotto_context.type == 'rpc':
|
kw[key] = value
|
||||||
kw = config_arguments
|
|
||||||
else:
|
|
||||||
kw = {}
|
|
||||||
for key, value in config_arguments.items():
|
|
||||||
if key in function_obj['arguments']:
|
|
||||||
kw[key] = value
|
|
||||||
|
|
||||||
|
kw['risotto_context'] = risotto_context
|
||||||
|
returns = await function(self.get_service(function_obj['module']), **kw)
|
||||||
kw['risotto_context'] = risotto_context
|
if risotto_context.type == 'rpc':
|
||||||
returns = await function(self.injected_self[function_obj['module']], **kw)
|
# valid returns
|
||||||
except CallError as err:
|
await self.valid_call_returns(risotto_context,
|
||||||
if risotto_context.type == 'rpc':
|
function,
|
||||||
raise err
|
returns,
|
||||||
continue
|
kwargs,
|
||||||
except Exception as err:
|
)
|
||||||
if risotto_context.type == 'rpc':
|
# log the success
|
||||||
raise err
|
await log.info_msg(risotto_context,
|
||||||
if get_config().get('global').get('debug'):
|
{'arguments': kwargs,
|
||||||
print_exc()
|
'returns': returns},
|
||||||
await log.error_msg(risotto_context,
|
info_msg,
|
||||||
kwargs,
|
)
|
||||||
err)
|
# notification
|
||||||
continue
|
if function_obj.get('notification'):
|
||||||
|
notif_version, notif_message = function_obj['notification'].split('.', 1)
|
||||||
|
if not isinstance(returns, list):
|
||||||
|
send_returns = [returns]
|
||||||
else:
|
else:
|
||||||
if risotto_context.type == 'rpc':
|
send_returns = returns
|
||||||
# valid returns
|
for ret in send_returns:
|
||||||
await self.valid_call_returns(risotto_context,
|
await self.publish(notif_version,
|
||||||
function,
|
notif_message,
|
||||||
returns,
|
risotto_context,
|
||||||
kwargs)
|
**ret,
|
||||||
# log the success
|
)
|
||||||
await log.info_msg(risotto_context,
|
if risotto_context.type == 'rpc':
|
||||||
{'arguments': kwargs,
|
return returns
|
||||||
'returns': returns},
|
|
||||||
info_msg)
|
|
||||||
# notification
|
|
||||||
if function_obj.get('notification'):
|
|
||||||
notif_version, notif_message = function_obj['notification'].split('.', 1)
|
|
||||||
if not isinstance(returns, list):
|
|
||||||
send_returns = [returns]
|
|
||||||
else:
|
|
||||||
send_returns = returns
|
|
||||||
for ret in send_returns:
|
|
||||||
await self.publish(notif_version,
|
|
||||||
notif_message,
|
|
||||||
risotto_context,
|
|
||||||
**ret)
|
|
||||||
if risotto_context.type == 'rpc':
|
|
||||||
return returns
|
|
||||||
|
|
||||||
|
|
||||||
dispatcher = Dispatcher()
|
dispatcher = Dispatcher()
|
||||||
|
@ -1,7 +1,10 @@
|
|||||||
from aiohttp.web import Application, Response, get, post, HTTPBadRequest, HTTPInternalServerError, HTTPNotFound
|
from aiohttp.web import Application, Response, get, post, HTTPBadRequest, HTTPInternalServerError, HTTPNotFound
|
||||||
from json import dumps
|
from json import dumps
|
||||||
from traceback import print_exc
|
from traceback import print_exc
|
||||||
from tiramisu import Config, default_storage
|
try:
|
||||||
|
from tiramisu3 import Config, default_storage
|
||||||
|
except:
|
||||||
|
from tiramisu import Config, default_storage
|
||||||
|
|
||||||
|
|
||||||
from .dispatcher import dispatcher
|
from .dispatcher import dispatcher
|
||||||
@ -11,7 +14,7 @@ from .error import CallError, NotAllowedError, RegistrationError
|
|||||||
from .message import get_messages
|
from .message import get_messages
|
||||||
from .logger import log
|
from .logger import log
|
||||||
from .config import get_config
|
from .config import get_config
|
||||||
from .services import load_services
|
from . import services
|
||||||
|
|
||||||
|
|
||||||
extra_routes = {}
|
extra_routes = {}
|
||||||
@ -20,7 +23,8 @@ extra_routes = {}
|
|||||||
def create_context(request):
|
def create_context(request):
|
||||||
risotto_context = Context()
|
risotto_context = Context()
|
||||||
risotto_context.username = request.match_info.get('username',
|
risotto_context.username = request.match_info.get('username',
|
||||||
get_config()['http_server']['default_user'])
|
get_config()['http_server']['default_user'],
|
||||||
|
)
|
||||||
return risotto_context
|
return risotto_context
|
||||||
|
|
||||||
|
|
||||||
@ -47,8 +51,9 @@ class extra_route_handler:
|
|||||||
function_name = cls.function.__module__
|
function_name = cls.function.__module__
|
||||||
# if not 'api' function
|
# if not 'api' function
|
||||||
if function_name != 'risotto.http':
|
if function_name != 'risotto.http':
|
||||||
module_name = function_name.split('.')[-2]
|
risotto_module_name, submodule_name = function_name.split('.', 2)[:-1]
|
||||||
kwargs['self'] = dispatcher.injected_self[module_name]
|
module_name = risotto_module_name.split('_')[-1]
|
||||||
|
kwargs['self'] = dispatcher.injected_self[module_name + '.' + submodule_name]
|
||||||
try:
|
try:
|
||||||
returns = await cls.function(**kwargs)
|
returns = await cls.function(**kwargs)
|
||||||
except NotAllowedError as err:
|
except NotAllowedError as err:
|
||||||
@ -79,7 +84,9 @@ async def handle(request):
|
|||||||
message,
|
message,
|
||||||
risotto_context,
|
risotto_context,
|
||||||
check_role=True,
|
check_role=True,
|
||||||
**kwargs)
|
internal=False,
|
||||||
|
**kwargs,
|
||||||
|
)
|
||||||
except NotAllowedError as err:
|
except NotAllowedError as err:
|
||||||
raise HTTPNotFound(reason=str(err))
|
raise HTTPNotFound(reason=str(err))
|
||||||
except CallError as err:
|
except CallError as err:
|
||||||
@ -88,14 +95,14 @@ async def handle(request):
|
|||||||
if get_config()['global']['debug']:
|
if get_config()['global']['debug']:
|
||||||
print_exc()
|
print_exc()
|
||||||
raise HTTPInternalServerError(reason=str(err))
|
raise HTTPInternalServerError(reason=str(err))
|
||||||
return Response(text=dumps({'response': text},
|
return Response(text=dumps({'response': text}),
|
||||||
content_type='application/json'))
|
content_type='application/json')
|
||||||
|
|
||||||
|
|
||||||
async def api(request,
|
async def api(request,
|
||||||
risotto_context):
|
risotto_context):
|
||||||
global tiramisu
|
global TIRAMISU
|
||||||
if not tiramisu:
|
if not TIRAMISU:
|
||||||
# check all URI that have an associated role
|
# check all URI that have an associated role
|
||||||
# all URI without role is concidered has a private URI
|
# all URI without role is concidered has a private URI
|
||||||
uris = []
|
uris = []
|
||||||
@ -103,24 +110,28 @@ async def api(request,
|
|||||||
async with connection.transaction():
|
async with connection.transaction():
|
||||||
# Check role with ACL
|
# Check role with ACL
|
||||||
sql = '''
|
sql = '''
|
||||||
SELECT URI.URIName
|
SELECT UserURI.URIName
|
||||||
FROM URI, RoleURI
|
FROM UserURI, UserRoleURI
|
||||||
WHERE RoleURI.URIId = URI.URIId
|
WHERE UserRoleURI.URIId = UserURI.URIId
|
||||||
'''
|
'''
|
||||||
uris = [uri['uriname'] for uri in await connection.fetch(sql)]
|
uris = [uri['uriname'] for uri in await connection.fetch(sql)]
|
||||||
async with await Config(get_messages(load_shortarg=True,
|
risotto_modules = services.get_services_list()
|
||||||
|
async with await Config(get_messages(current_module_names=risotto_modules,
|
||||||
|
load_shortarg=True,
|
||||||
current_version=risotto_context.version,
|
current_version=risotto_context.version,
|
||||||
uris=uris)[1]) as config:
|
uris=uris,
|
||||||
|
)[1],
|
||||||
|
display_name=lambda self, dyn_name, suffix: self.impl_getname()) as config:
|
||||||
await config.property.read_write()
|
await config.property.read_write()
|
||||||
tiramisu = await config.option.dict(remotable='none')
|
TIRAMISU = await config.option.dict(remotable='none')
|
||||||
return tiramisu
|
return TIRAMISU
|
||||||
|
|
||||||
|
|
||||||
async def get_app(loop):
|
async def get_app(loop):
|
||||||
""" build all routes
|
""" build all routes
|
||||||
"""
|
"""
|
||||||
global extra_routes
|
global extra_routes
|
||||||
load_services()
|
services.link_to_dispatcher(dispatcher)
|
||||||
app = Application(loop=loop)
|
app = Application(loop=loop)
|
||||||
routes = []
|
routes = []
|
||||||
default_storage.engine('dictionary')
|
default_storage.engine('dictionary')
|
||||||
@ -131,9 +142,9 @@ async def get_app(loop):
|
|||||||
versions.append(version)
|
versions.append(version)
|
||||||
print()
|
print()
|
||||||
print(_('======== Registered messages ========'))
|
print(_('======== Registered messages ========'))
|
||||||
for message in messages:
|
for message, message_infos in messages.items():
|
||||||
web_message = f'/api/{version}/{message}'
|
web_message = f'/api/{version}/{message}'
|
||||||
pattern = dispatcher.messages[version][message]['pattern']
|
pattern = message_infos['pattern']
|
||||||
print(f' - {web_message} ({pattern})')
|
print(f' - {web_message} ({pattern})')
|
||||||
routes.append(post(web_message, handle))
|
routes.append(post(web_message, handle))
|
||||||
print()
|
print()
|
||||||
@ -145,6 +156,9 @@ async def get_app(loop):
|
|||||||
extra_handler = type(api_route['path'], (extra_route_handler,), api_route)
|
extra_handler = type(api_route['path'], (extra_route_handler,), api_route)
|
||||||
routes.append(get(api_route['path'], extra_handler))
|
routes.append(get(api_route['path'], extra_handler))
|
||||||
print(f' - {api_route["path"]} (http_get)')
|
print(f' - {api_route["path"]} (http_get)')
|
||||||
|
# last version is default version
|
||||||
|
routes.append(get('/api', extra_handler))
|
||||||
|
print(f' - /api (http_get)')
|
||||||
print()
|
print()
|
||||||
if extra_routes:
|
if extra_routes:
|
||||||
print(_('======== Registered extra routes ========'))
|
print(_('======== Registered extra routes ========'))
|
||||||
@ -155,11 +169,12 @@ async def get_app(loop):
|
|||||||
extra_handler = type(path, (extra_route_handler,), extra)
|
extra_handler = type(path, (extra_route_handler,), extra)
|
||||||
routes.append(get(path, extra_handler))
|
routes.append(get(path, extra_handler))
|
||||||
print(f' - {path} (http_get)')
|
print(f' - {path} (http_get)')
|
||||||
print()
|
|
||||||
del extra_routes
|
del extra_routes
|
||||||
app.add_routes(routes)
|
app.router.add_routes(routes)
|
||||||
|
await dispatcher.register_remote()
|
||||||
|
print()
|
||||||
await dispatcher.on_join()
|
await dispatcher.on_join()
|
||||||
return await loop.create_server(app.make_handler(), '*', get_config()['http_server']['port'])
|
return await loop.create_server(app.make_handler(), '*', get_config()['http_server']['port'])
|
||||||
|
|
||||||
|
|
||||||
tiramisu = None
|
TIRAMISU = None
|
||||||
|
@ -1,5 +1,8 @@
|
|||||||
from typing import Dict, Any
|
from typing import Dict, Any
|
||||||
from json import dumps
|
from json import dumps
|
||||||
|
from asyncpg.exceptions import UndefinedTableError
|
||||||
|
|
||||||
|
|
||||||
from .context import Context
|
from .context import Context
|
||||||
from .utils import _
|
from .utils import _
|
||||||
from .config import get_config
|
from .config import get_config
|
||||||
@ -23,7 +26,10 @@ class Logger:
|
|||||||
args.append(dumps(data))
|
args.append(dumps(data))
|
||||||
|
|
||||||
sql = insert + ') ' + values + ')'
|
sql = insert + ') ' + values + ')'
|
||||||
await risotto_context.connection.fetch(sql, *args)
|
try:
|
||||||
|
await risotto_context.connection.fetch(sql, *args)
|
||||||
|
except UndefinedTableError as err:
|
||||||
|
raise Exception(_(f'cannot access to database ({err}), was the database really created?'))
|
||||||
|
|
||||||
def _get_message_paths(self,
|
def _get_message_paths(self,
|
||||||
risotto_context: Context):
|
risotto_context: Context):
|
||||||
@ -65,7 +71,7 @@ class Logger:
|
|||||||
else:
|
else:
|
||||||
paths_msg = ''
|
paths_msg = ''
|
||||||
if get_config()['global']['debug']:
|
if get_config()['global']['debug']:
|
||||||
print(_(f'{risotto_context.username}: INFO:{paths_msg}'))
|
print(_(f'{risotto_context.username}: INFO:{paths_msg}: {msg}'))
|
||||||
await self.insert(msg,
|
await self.insert(msg,
|
||||||
paths_msg,
|
paths_msg,
|
||||||
risotto_context,
|
risotto_context,
|
||||||
|
@ -1,22 +1,26 @@
|
|||||||
from collections import OrderedDict
|
|
||||||
from os.path import join, basename, dirname
|
|
||||||
from glob import glob
|
|
||||||
|
|
||||||
from tiramisu import StrOption, IntOption, BoolOption, ChoiceOption, OptionDescription, SymLinkOption, \
|
|
||||||
Calculation, Params, ParamOption, ParamValue, calc_value, calc_value_property_help, \
|
|
||||||
groups, Option
|
|
||||||
|
|
||||||
from yaml import load, SafeLoader
|
|
||||||
from os import listdir
|
from os import listdir
|
||||||
from os.path import isfile
|
from os.path import join, basename, dirname, isfile
|
||||||
from ..config import get_config
|
from glob import glob
|
||||||
from ..utils import _
|
from gettext import translation
|
||||||
|
try:
|
||||||
|
from tiramisu3 import StrOption, IntOption, BoolOption, ChoiceOption, OptionDescription, \
|
||||||
|
SymLinkOption, FloatOption, Calculation, Params, ParamOption, \
|
||||||
|
ParamValue, calc_value, calc_value_property_help, groups, Option
|
||||||
|
except:
|
||||||
|
from tiramisu import StrOption, IntOption, BoolOption, ChoiceOption, OptionDescription, \
|
||||||
|
SymLinkOption, FloatOption, Calculation, Params, ParamOption, \
|
||||||
|
ParamValue, calc_value, calc_value_property_help, groups, Option
|
||||||
|
from yaml import load, SafeLoader
|
||||||
|
|
||||||
|
|
||||||
|
from .config import get_config
|
||||||
|
from .utils import _
|
||||||
|
|
||||||
|
|
||||||
MESSAGE_ROOT_PATH = get_config()['global']['message_root_path']
|
MESSAGE_ROOT_PATH = get_config()['global']['message_root_path']
|
||||||
MODULE_NAME = get_config()['global']['module_name']
|
|
||||||
CUSTOMTYPES = {}
|
|
||||||
|
|
||||||
groups.addgroup('message')
|
groups.addgroup('message')
|
||||||
|
MESSAGE_TRANSLATION = translation('risotto-message', join(MESSAGE_ROOT_PATH, '..', 'locale')).gettext
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class DictOption(Option):
|
class DictOption(Option):
|
||||||
@ -43,14 +47,16 @@ class MessageDefinition:
|
|||||||
A MessageDefinition is a representation of a message in the Zephir application messaging context
|
A MessageDefinition is a representation of a message in the Zephir application messaging context
|
||||||
"""
|
"""
|
||||||
__slots__ = ('version',
|
__slots__ = ('version',
|
||||||
'uri',
|
'message',
|
||||||
'description',
|
'description',
|
||||||
'parameters',
|
'parameters',
|
||||||
'default_roles',
|
'default_roles',
|
||||||
'errors',
|
'errors',
|
||||||
'pattern',
|
'pattern',
|
||||||
'related',
|
'related',
|
||||||
'response')
|
'response',
|
||||||
|
'options',
|
||||||
|
)
|
||||||
|
|
||||||
def __init__(self,
|
def __init__(self,
|
||||||
raw_def,
|
raw_def,
|
||||||
@ -58,17 +64,18 @@ class MessageDefinition:
|
|||||||
message):
|
message):
|
||||||
# default value for non mandatory key
|
# default value for non mandatory key
|
||||||
self.version = version
|
self.version = version
|
||||||
self.parameters = OrderedDict()
|
self.parameters = {}
|
||||||
self.errors = []
|
self.errors = []
|
||||||
self.related = []
|
self.related = []
|
||||||
self.default_roles = []
|
self.default_roles = []
|
||||||
self.response = None
|
self.response = None
|
||||||
self.uri = message
|
self.message = message
|
||||||
|
self.options = None
|
||||||
|
|
||||||
# loads yaml information into object
|
# loads yaml information into object
|
||||||
for key, value in raw_def.items():
|
for key, value in raw_def.items():
|
||||||
if key == 'uri':
|
if key == 'message':
|
||||||
raise Exception('uri in not allowed in message')
|
raise Exception('message in not allowed in message')
|
||||||
if isinstance(value, str):
|
if isinstance(value, str):
|
||||||
value = value.strip()
|
value = value.strip()
|
||||||
if key == 'pattern':
|
if key == 'pattern':
|
||||||
@ -84,8 +91,11 @@ class MessageDefinition:
|
|||||||
elif key == 'response':
|
elif key == 'response':
|
||||||
value = ResponseDefinition(value,
|
value = ResponseDefinition(value,
|
||||||
self.version)
|
self.version)
|
||||||
elif key == 'errors':
|
elif key == 'description':
|
||||||
value = _parse_error_definition(value)
|
value = value.strip().rstrip()
|
||||||
|
if value.endswith('.'):
|
||||||
|
value = value[:-1]
|
||||||
|
value = MESSAGE_TRANSLATION(value)
|
||||||
setattr(self, key, value)
|
setattr(self, key, value)
|
||||||
# check mandatory keys
|
# check mandatory keys
|
||||||
for key in self.__slots__:
|
for key in self.__slots__:
|
||||||
@ -131,6 +141,10 @@ class ParameterDefinition:
|
|||||||
else:
|
else:
|
||||||
self._valid_type(value)
|
self._valid_type(value)
|
||||||
#self._valid_type(value)
|
#self._valid_type(value)
|
||||||
|
elif key == 'description':
|
||||||
|
if value.endswith('.'):
|
||||||
|
value = value[:-1]
|
||||||
|
value = MESSAGE_TRANSLATION(value)
|
||||||
setattr(self, key, value)
|
setattr(self, key, value)
|
||||||
# check mandatory keys
|
# check mandatory keys
|
||||||
for key in self.__slots__:
|
for key in self.__slots__:
|
||||||
@ -143,7 +157,7 @@ class ParameterDefinition:
|
|||||||
def _valid_type(self, typ):
|
def _valid_type(self, typ):
|
||||||
if typ.startswith('[]'):
|
if typ.startswith('[]'):
|
||||||
self._valid_type(typ[2:])
|
self._valid_type(typ[2:])
|
||||||
elif typ not in ['Boolean', 'String', 'Number', 'File', 'Dict', 'Any']:
|
elif typ not in ['Boolean', 'String', 'Number', 'File', 'Dict', 'Any', 'Float']:
|
||||||
raise Exception(_('unknown parameter type: {}').format(typ))
|
raise Exception(_('unknown parameter type: {}').format(typ))
|
||||||
|
|
||||||
|
|
||||||
@ -180,9 +194,12 @@ class ResponseDefinition:
|
|||||||
if value.startswith('[]'):
|
if value.startswith('[]'):
|
||||||
value = '[]{}'.format(CUSTOMTYPES[version][tvalue].type)
|
value = '[]{}'.format(CUSTOMTYPES[version][tvalue].type)
|
||||||
else:
|
else:
|
||||||
value = CUSTOMTYPES[version][value].type
|
value = CUSTOMTYPES[version][tvalue].type
|
||||||
|
self.description = CUSTOMTYPES[version][tvalue].description
|
||||||
else:
|
else:
|
||||||
self._valid_type(value)
|
raise Exception('only customtype is supported in response')
|
||||||
|
elif key == 'description':
|
||||||
|
raise Exception('description is not allowed in response')
|
||||||
setattr(self, key, value)
|
setattr(self, key, value)
|
||||||
# check mandatory keys
|
# check mandatory keys
|
||||||
for key in self.__slots__:
|
for key in self.__slots__:
|
||||||
@ -191,36 +208,10 @@ class ResponseDefinition:
|
|||||||
except AttributeError:
|
except AttributeError:
|
||||||
raise Exception(_('mandatory key not set {}').format(key))
|
raise Exception(_('mandatory key not set {}').format(key))
|
||||||
|
|
||||||
def _valid_type(self, typ):
|
|
||||||
if typ.startswith('[]'):
|
|
||||||
self._valid_type(typ[2:])
|
|
||||||
elif typ not in ['Boolean', 'String', 'Number', 'File', 'Dict']:
|
|
||||||
raise Exception(_('unknown parameter type: {}').format(typ))
|
|
||||||
|
|
||||||
|
|
||||||
class ErrorDefinition:
|
|
||||||
"""
|
|
||||||
An ErrorDefinition is a representation of an error in the Zephir application messaging context
|
|
||||||
"""
|
|
||||||
__slots__ = ('uri',)
|
|
||||||
|
|
||||||
def __init__(self, raw_err):
|
|
||||||
extra_keys = set(raw_err) - set(self.__slots__)
|
|
||||||
if extra_keys:
|
|
||||||
raise Exception(_('extra keys for errors: {}').format(extra_keys))
|
|
||||||
self.uri = raw_err['uri']
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_error_definition(raw_defs):
|
|
||||||
new_value = []
|
|
||||||
for raw_err in raw_defs:
|
|
||||||
new_value.append(ErrorDefinition(raw_err))
|
|
||||||
return new_value
|
|
||||||
|
|
||||||
|
|
||||||
def _parse_parameters(raw_defs,
|
def _parse_parameters(raw_defs,
|
||||||
version):
|
version):
|
||||||
parameters = OrderedDict()
|
parameters = {}
|
||||||
for name, raw_def in raw_defs.items():
|
for name, raw_def in raw_defs.items():
|
||||||
parameters[name] = ParameterDefinition(name,
|
parameters[name] = ParameterDefinition(name,
|
||||||
version,
|
version,
|
||||||
@ -229,12 +220,13 @@ def _parse_parameters(raw_defs,
|
|||||||
|
|
||||||
|
|
||||||
def get_message(uri: str,
|
def get_message(uri: str,
|
||||||
current_module_name: str):
|
current_module_names: str,
|
||||||
|
) -> MessageDefinition:
|
||||||
try:
|
try:
|
||||||
version, message = uri.split('.', 1)
|
version, message = uri.split('.', 1)
|
||||||
path = get_message_file_path(version,
|
path = get_message_file_path(version,
|
||||||
message,
|
message,
|
||||||
current_module_name)
|
current_module_names)
|
||||||
with open(path, "r") as message_file:
|
with open(path, "r") as message_file:
|
||||||
return MessageDefinition(load(message_file.read(), Loader=SafeLoader),
|
return MessageDefinition(load(message_file.read(), Loader=SafeLoader),
|
||||||
version,
|
version,
|
||||||
@ -247,22 +239,22 @@ def get_message(uri: str,
|
|||||||
|
|
||||||
def get_message_file_path(version,
|
def get_message_file_path(version,
|
||||||
message,
|
message,
|
||||||
current_module_name):
|
current_module_names):
|
||||||
module_name, filename = message.split('.', 1)
|
module_name, filename = message.split('.', 1)
|
||||||
if current_module_name and module_name != current_module_name:
|
if current_module_names and module_name not in current_module_names:
|
||||||
raise Exception(f'should only load message for {current_module_name}, not {message}')
|
raise Exception(f'should only load message for {current_module_names}, not {message}')
|
||||||
return join(MESSAGE_ROOT_PATH, version, module_name, 'messages', filename + '.yml')
|
return join(MESSAGE_ROOT_PATH, version, module_name, 'messages', filename + '.yml')
|
||||||
|
|
||||||
|
|
||||||
def list_messages(uris,
|
def list_messages(uris,
|
||||||
current_module_name,
|
current_module_names,
|
||||||
current_version):
|
current_version,
|
||||||
def get_module_paths():
|
):
|
||||||
if current_module_name is not None:
|
def get_module_paths(current_module_names):
|
||||||
yield current_module_name, join(MESSAGE_ROOT_PATH, version, current_module_name, 'messages')
|
if current_module_names is None:
|
||||||
else:
|
current_module_names = listdir(join(MESSAGE_ROOT_PATH, version))
|
||||||
for module_name in listdir(join(MESSAGE_ROOT_PATH, version)):
|
for module_name in current_module_names:
|
||||||
yield module_name, join(MESSAGE_ROOT_PATH, version, module_name, 'messages')
|
yield module_name, join(MESSAGE_ROOT_PATH, version, module_name, 'messages')
|
||||||
|
|
||||||
if current_version:
|
if current_version:
|
||||||
versions = [current_version]
|
versions = [current_version]
|
||||||
@ -270,7 +262,7 @@ def list_messages(uris,
|
|||||||
versions = listdir(join(MESSAGE_ROOT_PATH))
|
versions = listdir(join(MESSAGE_ROOT_PATH))
|
||||||
versions.sort()
|
versions.sort()
|
||||||
for version in versions:
|
for version in versions:
|
||||||
for module_name, message_path in get_module_paths():
|
for module_name, message_path in get_module_paths(current_module_names):
|
||||||
for message in listdir(message_path):
|
for message in listdir(message_path):
|
||||||
if message.endswith('.yml'):
|
if message.endswith('.yml'):
|
||||||
uri = version + '.' + module_name + '.' + message.rsplit('.', 1)[0]
|
uri = version + '.' + module_name + '.' + message.rsplit('.', 1)[0]
|
||||||
@ -301,6 +293,10 @@ class CustomParam:
|
|||||||
value = self._convert_type(value, raw_def)
|
value = self._convert_type(value, raw_def)
|
||||||
elif key == 'items':
|
elif key == 'items':
|
||||||
continue
|
continue
|
||||||
|
elif key == 'description':
|
||||||
|
if value.endswith('.'):
|
||||||
|
value = value[:-1]
|
||||||
|
value = MESSAGE_TRANSLATION(value)
|
||||||
setattr(self, key, value)
|
setattr(self, key, value)
|
||||||
|
|
||||||
# check mandatory keys
|
# check mandatory keys
|
||||||
@ -318,7 +314,8 @@ class CustomParam:
|
|||||||
'number': 'Number',
|
'number': 'Number',
|
||||||
'object': 'Dict',
|
'object': 'Dict',
|
||||||
'array': 'Array',
|
'array': 'Array',
|
||||||
'file': 'File'}
|
'file': 'File',
|
||||||
|
'float': 'Float'}
|
||||||
|
|
||||||
if typ not in list(types.keys()):
|
if typ not in list(types.keys()):
|
||||||
# validate after
|
# validate after
|
||||||
@ -333,7 +330,7 @@ class CustomParam:
|
|||||||
|
|
||||||
|
|
||||||
def _parse_custom_params(raw_defs, required):
|
def _parse_custom_params(raw_defs, required):
|
||||||
parameters = OrderedDict()
|
parameters = {}
|
||||||
for name, raw_def in raw_defs.items():
|
for name, raw_def in raw_defs.items():
|
||||||
parameters[name] = CustomParam(name, raw_def, required)
|
parameters[name] = CustomParam(name, raw_def, required)
|
||||||
return parameters
|
return parameters
|
||||||
@ -359,6 +356,10 @@ class CustomType:
|
|||||||
value = self._convert_type(value, raw_def)
|
value = self._convert_type(value, raw_def)
|
||||||
elif key == 'properties':
|
elif key == 'properties':
|
||||||
value = _parse_custom_params(value, raw_def.get('required', {}))
|
value = _parse_custom_params(value, raw_def.get('required', {}))
|
||||||
|
elif key == 'description':
|
||||||
|
if value.endswith('.'):
|
||||||
|
value = value[:-1]
|
||||||
|
value = MESSAGE_TRANSLATION(value)
|
||||||
|
|
||||||
setattr(self, key, value)
|
setattr(self, key, value)
|
||||||
# check mandatory keys
|
# check mandatory keys
|
||||||
@ -390,48 +391,30 @@ class CustomType:
|
|||||||
return self.title
|
return self.title
|
||||||
|
|
||||||
|
|
||||||
def load_customtypes(current_module_name: str) -> None:
|
def load_customtypes() -> None:
|
||||||
versions = listdir(MESSAGE_ROOT_PATH)
|
versions = listdir(MESSAGE_ROOT_PATH)
|
||||||
versions.sort()
|
versions.sort()
|
||||||
def convert_properties(customtype: str,
|
ret = {}
|
||||||
version: str) -> None:
|
|
||||||
""" if properties include an other customtype, replace it
|
|
||||||
"""
|
|
||||||
properties = {}
|
|
||||||
for key, value in customtype.properties.items():
|
|
||||||
type_ = value.type
|
|
||||||
if type_.startswith('[]'):
|
|
||||||
if type_ in CUSTOMTYPES[version]:
|
|
||||||
raise Exception(_('cannot have []CustomType'))
|
|
||||||
properties[key] = value
|
|
||||||
else:
|
|
||||||
if type_ in CUSTOMTYPES[version]:
|
|
||||||
print('====== ca existe')
|
|
||||||
properties[key] = CUSTOMTYPES[version][ttype_]
|
|
||||||
else:
|
|
||||||
properties[key] = value
|
|
||||||
customtype.properties = properties
|
|
||||||
for version in versions:
|
for version in versions:
|
||||||
if version not in CUSTOMTYPES:
|
if version not in ret:
|
||||||
CUSTOMTYPES[version] = {}
|
ret[version] = {}
|
||||||
types_path = join(MESSAGE_ROOT_PATH,
|
for current_module_name in listdir(join(MESSAGE_ROOT_PATH, version)):
|
||||||
version,
|
types_path = join(MESSAGE_ROOT_PATH,
|
||||||
current_module_name,
|
version,
|
||||||
'types')
|
current_module_name,
|
||||||
for message in listdir(types_path):
|
'types')
|
||||||
if message.endswith('.yml'):
|
for message in listdir(types_path):
|
||||||
path = join(types_path, message)
|
if message.endswith('.yml'):
|
||||||
# remove extension
|
path = join(types_path, message)
|
||||||
message = message.rsplit('.', 1)[0]
|
# remove extension
|
||||||
with open(path, "r") as message_file:
|
message = message.rsplit('.', 1)[0]
|
||||||
try:
|
with open(path, "r") as message_file:
|
||||||
custom_type = CustomType(load(message_file, Loader=SafeLoader))
|
try:
|
||||||
convert_properties(custom_type,
|
custom_type = CustomType(load(message_file, Loader=SafeLoader))
|
||||||
version)
|
ret[version][custom_type.getname()] = custom_type
|
||||||
CUSTOMTYPES[version][custom_type.getname()] = custom_type
|
except Exception as err:
|
||||||
except Exception as err:
|
raise Exception(_(f'enable to load type "{message}": {err}'))
|
||||||
raise Exception(_(f'enable to load type {err}: {message}'))
|
return ret
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
def _get_description(description,
|
def _get_description(description,
|
||||||
@ -443,25 +426,27 @@ def _get_description(description,
|
|||||||
doc = name
|
doc = name
|
||||||
if doc.endswith('.'):
|
if doc.endswith('.'):
|
||||||
doc= description[:-1]
|
doc= description[:-1]
|
||||||
|
doc = MESSAGE_TRANSLATION(doc)
|
||||||
return doc
|
return doc
|
||||||
|
|
||||||
|
|
||||||
def _get_option(name,
|
def _get_option(name,
|
||||||
arg,
|
arg,
|
||||||
file_path,
|
uri,
|
||||||
select_option,
|
select_option,
|
||||||
optiondescription):
|
):
|
||||||
"""generate option
|
"""generate option
|
||||||
"""
|
"""
|
||||||
props = []
|
props = []
|
||||||
if not hasattr(arg, 'default'):
|
if not hasattr(arg, 'default'):
|
||||||
props.append('mandatory')
|
props.append('mandatory')
|
||||||
props.append(Calculation(calc_value,
|
if select_option:
|
||||||
Params(ParamValue('disabled'),
|
props.append(Calculation(calc_value,
|
||||||
kwargs={'condition': ParamOption(select_option, todict=True),
|
Params(ParamValue('disabled'),
|
||||||
'expected': ParamValue(optiondescription),
|
kwargs={'condition': ParamOption(select_option, todict=True),
|
||||||
'reverse_condition': ParamValue(True)}),
|
'expected': ParamValue(uri),
|
||||||
calc_value_property_help))
|
'reverse_condition': ParamValue(True)}),
|
||||||
|
calc_value_property_help))
|
||||||
|
|
||||||
description = arg.description.strip().rstrip()
|
description = arg.description.strip().rstrip()
|
||||||
kwargs = {'name': name,
|
kwargs = {'name': name,
|
||||||
@ -485,27 +470,28 @@ def _get_option(name,
|
|||||||
obj = IntOption(**kwargs)
|
obj = IntOption(**kwargs)
|
||||||
elif type_ == 'Boolean':
|
elif type_ == 'Boolean':
|
||||||
obj = BoolOption(**kwargs)
|
obj = BoolOption(**kwargs)
|
||||||
|
elif type_ == 'Float':
|
||||||
|
obj = FloatOption(**kwargs)
|
||||||
else:
|
else:
|
||||||
raise Exception('unsupported type {} in {}'.format(type_, file_path))
|
raise Exception('unsupported type {} in {}'.format(type_, uri))
|
||||||
obj.impl_set_information('ref', arg.ref)
|
obj.impl_set_information('ref', arg.ref)
|
||||||
return obj
|
return obj
|
||||||
|
|
||||||
|
|
||||||
def get_options(message_def,
|
def get_options(message_def,
|
||||||
file_path,
|
uri,
|
||||||
needs,
|
|
||||||
select_option,
|
select_option,
|
||||||
optiondescription,
|
load_shortarg,
|
||||||
load_shortarg):
|
):
|
||||||
"""build option with args/kwargs
|
"""build option with args/kwargs
|
||||||
"""
|
"""
|
||||||
options =[]
|
options =[]
|
||||||
for name, arg in message_def.parameters.items():
|
for name, arg in message_def.parameters.items():
|
||||||
current_opt = _get_option(name,
|
current_opt = _get_option(name,
|
||||||
arg,
|
arg,
|
||||||
file_path,
|
uri,
|
||||||
select_option,
|
select_option,
|
||||||
optiondescription)
|
)
|
||||||
options.append(current_opt)
|
options.append(current_opt)
|
||||||
if hasattr(arg, 'shortarg') and arg.shortarg and load_shortarg:
|
if hasattr(arg, 'shortarg') and arg.shortarg and load_shortarg:
|
||||||
options.append(SymLinkOption(arg.shortarg, current_opt))
|
options.append(SymLinkOption(arg.shortarg, current_opt))
|
||||||
@ -513,17 +499,18 @@ def get_options(message_def,
|
|||||||
|
|
||||||
|
|
||||||
def _parse_responses(message_def,
|
def _parse_responses(message_def,
|
||||||
file_path):
|
uri,
|
||||||
|
):
|
||||||
"""build option with returns
|
"""build option with returns
|
||||||
"""
|
"""
|
||||||
if message_def.response.parameters is None:
|
if message_def.response.parameters is None:
|
||||||
raise Exception('uri "{}" did not returned any valid parameters.'.format(message_def.uri))
|
raise Exception(f'message "{message_def.message}" did not returned any valid parameters')
|
||||||
|
|
||||||
options = []
|
options = []
|
||||||
names = []
|
names = []
|
||||||
for name, obj in message_def.response.parameters.items():
|
for name, obj in message_def.response.parameters.items():
|
||||||
if name in names:
|
if name in names:
|
||||||
raise Exception('multi response with name {} in {}'.format(name, file_path))
|
raise Exception(f'multi response with name "{name}" in "{uri}"')
|
||||||
names.append(name)
|
names.append(name)
|
||||||
|
|
||||||
kwargs = {'name': name,
|
kwargs = {'name': name,
|
||||||
@ -536,44 +523,27 @@ def _parse_responses(message_def,
|
|||||||
'Number': IntOption,
|
'Number': IntOption,
|
||||||
'Boolean': BoolOption,
|
'Boolean': BoolOption,
|
||||||
'Dict': DictOption,
|
'Dict': DictOption,
|
||||||
|
'Float': FloatOption,
|
||||||
# FIXME
|
# FIXME
|
||||||
'File': StrOption}.get(type_)
|
'File': StrOption}.get(type_)
|
||||||
if not option:
|
if not option:
|
||||||
raise Exception(f'unknown param type {obj.type} in responses of message {message_def.uri}')
|
raise Exception(f'unknown param type {obj.type} in responses of message {message_def.message}')
|
||||||
if hasattr(obj, 'default'):
|
if hasattr(obj, 'default'):
|
||||||
kwargs['default'] = obj.default
|
kwargs['default'] = obj.default
|
||||||
else:
|
else:
|
||||||
kwargs['properties'] = ('mandatory',)
|
kwargs['properties'] = ('mandatory',)
|
||||||
options.append(option(**kwargs))
|
options.append(option(**kwargs))
|
||||||
od = OptionDescription(message_def.uri,
|
od = OptionDescription(uri,
|
||||||
message_def.response.description,
|
message_def.response.description,
|
||||||
options)
|
options,
|
||||||
|
)
|
||||||
od.impl_set_information('multi', message_def.response.multi)
|
od.impl_set_information('multi', message_def.response.multi)
|
||||||
return od
|
return od
|
||||||
|
|
||||||
|
|
||||||
def _getoptions_from_yml(message_def,
|
def _get_root_option(select_option,
|
||||||
optiondescriptions,
|
optiondescriptions,
|
||||||
file_path,
|
):
|
||||||
needs,
|
|
||||||
select_option,
|
|
||||||
load_shortarg):
|
|
||||||
if message_def.pattern == 'event' and message_def.response:
|
|
||||||
raise Exception('event with response?: {}'.format(file_path))
|
|
||||||
if message_def.pattern == 'rpc' and not message_def.response:
|
|
||||||
print('rpc without response?: {}'.format(file_path))
|
|
||||||
options = get_options(message_def,
|
|
||||||
file_path,
|
|
||||||
needs,
|
|
||||||
select_option,
|
|
||||||
message_def.uri,
|
|
||||||
load_shortarg)
|
|
||||||
name = message_def.uri
|
|
||||||
description = message_def.description.strip().rstrip()
|
|
||||||
optiondescriptions[name] = (description, options)
|
|
||||||
|
|
||||||
|
|
||||||
def _get_root_option(select_option, optiondescriptions):
|
|
||||||
"""get root option
|
"""get root option
|
||||||
"""
|
"""
|
||||||
def _get_od(curr_ods):
|
def _get_od(curr_ods):
|
||||||
@ -612,53 +582,52 @@ def _get_root_option(select_option, optiondescriptions):
|
|||||||
return OptionDescription('root', 'root', options_obj)
|
return OptionDescription('root', 'root', options_obj)
|
||||||
|
|
||||||
|
|
||||||
def get_messages(load_shortarg=False,
|
def get_messages(current_module_names,
|
||||||
|
load_shortarg=False,
|
||||||
current_version=None,
|
current_version=None,
|
||||||
uris=None,
|
uris=None,
|
||||||
current_module_name=MODULE_NAME):
|
):
|
||||||
"""generate description from yml files
|
"""generate description from yml files
|
||||||
"""
|
"""
|
||||||
global CUSTOMTYPES
|
|
||||||
optiondescriptions = {}
|
optiondescriptions = {}
|
||||||
optiondescriptions_info = {}
|
optiondescriptions_info = {}
|
||||||
needs = {}
|
|
||||||
messages = list(list_messages(uris,
|
messages = list(list_messages(uris,
|
||||||
current_module_name,
|
current_module_names,
|
||||||
current_version))
|
current_version,
|
||||||
|
))
|
||||||
messages.sort()
|
messages.sort()
|
||||||
optiondescriptions_name = [message_name.split('.', 1)[1] for message_name in messages]
|
# optiondescriptions_name = [message_name.split('.', 1)[1] for message_name in messages]
|
||||||
select_option = ChoiceOption('message',
|
select_option = ChoiceOption('message',
|
||||||
'Nom du message.',
|
'Nom du message.',
|
||||||
tuple(optiondescriptions_name),
|
tuple(messages),
|
||||||
properties=frozenset(['mandatory', 'positional']))
|
properties=frozenset(['mandatory', 'positional']))
|
||||||
if current_module_name is None:
|
for uri in messages:
|
||||||
CUSTOMTYPES = {}
|
message_def = get_message(uri,
|
||||||
if not CUSTOMTYPES:
|
current_module_names,
|
||||||
if current_module_name is None:
|
)
|
||||||
for version in listdir(MESSAGE_ROOT_PATH):
|
optiondescriptions_info[message_def.message] = {'pattern': message_def.pattern,
|
||||||
for module_name in listdir(join(MESSAGE_ROOT_PATH, version)):
|
'default_roles': message_def.default_roles,
|
||||||
load_customtypes(module_name)
|
'version': message_def.version,
|
||||||
else:
|
}
|
||||||
load_customtypes(current_module_name)
|
|
||||||
for message_name in messages:
|
|
||||||
message_def = get_message(message_name,
|
|
||||||
current_module_name)
|
|
||||||
optiondescriptions_info[message_def.uri] = {'pattern': message_def.pattern,
|
|
||||||
'default_roles': message_def.default_roles,
|
|
||||||
'version': message_name.split('.')[0]}
|
|
||||||
if message_def.pattern == 'rpc':
|
if message_def.pattern == 'rpc':
|
||||||
optiondescriptions_info[message_def.uri]['response'] = _parse_responses(message_def,
|
if not message_def.response:
|
||||||
message_name)
|
raise Exception(f'rpc without response is not allowed {uri}')
|
||||||
|
optiondescriptions_info[message_def.message]['response'] = _parse_responses(message_def,
|
||||||
|
uri,
|
||||||
|
)
|
||||||
elif message_def.response:
|
elif message_def.response:
|
||||||
raise Exception(f'response not allowed for {message_def.uri}')
|
raise Exception(f'response is not allowed for {uri}')
|
||||||
_getoptions_from_yml(message_def,
|
message_def.options = get_options(message_def,
|
||||||
optiondescriptions,
|
uri,
|
||||||
message_name,
|
select_option,
|
||||||
needs,
|
load_shortarg,
|
||||||
select_option,
|
)
|
||||||
load_shortarg)
|
optiondescriptions[uri] = (message_def.description, message_def.options)
|
||||||
|
|
||||||
root = _get_root_option(select_option, optiondescriptions)
|
root = _get_root_option(select_option,
|
||||||
if current_module_name is None:
|
optiondescriptions,
|
||||||
CUSTOMTYPES = {}
|
)
|
||||||
return optiondescriptions_info, root
|
return optiondescriptions_info, root
|
||||||
|
|
||||||
|
|
||||||
|
CUSTOMTYPES = load_customtypes()
|
@ -1 +0,0 @@
|
|||||||
from .message import get_messages
|
|
@ -1,9 +1,13 @@
|
|||||||
from tiramisu import Config
|
try:
|
||||||
|
from tiramisu3 import Config
|
||||||
|
except:
|
||||||
|
from tiramisu import Config
|
||||||
from inspect import signature
|
from inspect import signature
|
||||||
from typing import Callable, Optional
|
from typing import Callable, Optional, List
|
||||||
import asyncpg
|
from asyncpg import create_pool
|
||||||
from json import dumps, loads
|
from json import dumps, loads
|
||||||
|
from pkg_resources import iter_entry_points
|
||||||
|
import risotto
|
||||||
from .utils import _
|
from .utils import _
|
||||||
from .error import RegistrationError
|
from .error import RegistrationError
|
||||||
from .message import get_messages
|
from .message import get_messages
|
||||||
@ -12,8 +16,66 @@ from .config import get_config
|
|||||||
from .logger import log
|
from .logger import log
|
||||||
|
|
||||||
|
|
||||||
|
class Services():
|
||||||
|
services = {}
|
||||||
|
modules_loaded = False
|
||||||
|
services_loaded = False
|
||||||
|
|
||||||
|
def load_services(self):
|
||||||
|
for entry_point in iter_entry_points(group='risotto_services'):
|
||||||
|
self.services.setdefault(entry_point.name, {})
|
||||||
|
self.services_loaded = True
|
||||||
|
|
||||||
|
def load_modules(self,
|
||||||
|
limit_services: Optional[List[str]]=None,
|
||||||
|
) -> None:
|
||||||
|
for entry_point in iter_entry_points(group='risotto_modules'):
|
||||||
|
service_name, module_name = entry_point.name.split('.')
|
||||||
|
if limit_services is None or service_name in limit_services:
|
||||||
|
self.services[service_name][module_name] = entry_point.load()
|
||||||
|
self.modules_loaded = True
|
||||||
|
#
|
||||||
|
# def get_services(self):
|
||||||
|
# if not self.services_loaded:
|
||||||
|
# self.load_services()
|
||||||
|
# return [(service, getattr(self, service)) for service in self.services]
|
||||||
|
|
||||||
|
def get_modules(self,
|
||||||
|
limit_services: Optional[List[str]]=None,
|
||||||
|
) -> List[str]:
|
||||||
|
if not self.modules_loaded:
|
||||||
|
self.load_modules(limit_services=limit_services)
|
||||||
|
return [(module + '.' + submodule, entry_point) for module, submodules in self.services.items() for submodule, entry_point in submodules.items()]
|
||||||
|
|
||||||
|
def get_services_list(self):
|
||||||
|
return self.services.keys()
|
||||||
|
|
||||||
|
def get_modules_list(self):
|
||||||
|
return [m for s in self.services for m in self.services[s]]
|
||||||
|
|
||||||
|
def link_to_dispatcher(self,
|
||||||
|
dispatcher,
|
||||||
|
validate: bool=True,
|
||||||
|
test: bool=False,
|
||||||
|
limit_services: Optional[List[str]]=None,
|
||||||
|
):
|
||||||
|
for submodule_name, module in self.get_modules(limit_services=limit_services):
|
||||||
|
dispatcher.set_module(submodule_name,
|
||||||
|
module,
|
||||||
|
test,
|
||||||
|
)
|
||||||
|
if validate:
|
||||||
|
dispatcher.validate()
|
||||||
|
|
||||||
|
|
||||||
|
services = Services()
|
||||||
|
services.load_services()
|
||||||
|
setattr(risotto, 'services', services)
|
||||||
|
|
||||||
|
|
||||||
def register(uris: str,
|
def register(uris: str,
|
||||||
notification: str=None):
|
notification: str=None,
|
||||||
|
) -> None:
|
||||||
""" Decorator to register function to the dispatcher
|
""" Decorator to register function to the dispatcher
|
||||||
"""
|
"""
|
||||||
if not isinstance(uris, list):
|
if not isinstance(uris, list):
|
||||||
@ -36,52 +98,55 @@ class RegisterDispatcher:
|
|||||||
# postgresql pool
|
# postgresql pool
|
||||||
self.pool = None
|
self.pool = None
|
||||||
# load tiramisu objects
|
# load tiramisu objects
|
||||||
messages, self.option = get_messages()
|
self.risotto_modules = services.get_services_list()
|
||||||
|
messages, self.option = get_messages(self.risotto_modules)
|
||||||
# list of uris with informations: {"v1": {"module_name.xxxxx": yyyyyy}}
|
# list of uris with informations: {"v1": {"module_name.xxxxx": yyyyyy}}
|
||||||
version = 'v1'
|
|
||||||
self.messages = {}
|
self.messages = {}
|
||||||
for tiramisu_message, obj in messages.items():
|
for tiramisu_message, obj in messages.items():
|
||||||
version = obj['version']
|
version = obj['version']
|
||||||
if version not in self.messages:
|
if version not in self.messages:
|
||||||
self.messages[version] = {}
|
self.messages[version] = {}
|
||||||
self.messages[version][tiramisu_message] = obj
|
self.messages[version][tiramisu_message] = obj
|
||||||
self.risotto_module = get_config()['global']['module_name']
|
|
||||||
|
|
||||||
def get_function_args(self,
|
def get_function_args(self,
|
||||||
function: Callable):
|
function: Callable):
|
||||||
# remove self
|
# remove self and risotto_context
|
||||||
first_argument_index = 1
|
first_argument_index = 2
|
||||||
return [param.name for param in list(signature(function).parameters.values())[first_argument_index:]]
|
return {param.name for param in list(signature(function).parameters.values())[first_argument_index:]}
|
||||||
|
|
||||||
|
async def get_message_args(self,
|
||||||
|
message: str,
|
||||||
|
version: str,
|
||||||
|
):
|
||||||
|
# load config
|
||||||
|
async with await Config(self.option, display_name=lambda self, dyn_name, suffix: self.impl_getname()) as config:
|
||||||
|
uri = f'{version}.{message}'
|
||||||
|
await config.property.read_write()
|
||||||
|
# set message to the message name
|
||||||
|
await config.option('message').value.set(uri)
|
||||||
|
# get message argument
|
||||||
|
dico = await config.option(uri).value.dict()
|
||||||
|
return set(dico.keys())
|
||||||
|
|
||||||
async def valid_rpc_params(self,
|
async def valid_rpc_params(self,
|
||||||
version: str,
|
version: str,
|
||||||
message: str,
|
message: str,
|
||||||
function: Callable,
|
function: Callable,
|
||||||
module_name: str):
|
module_name: str,
|
||||||
|
):
|
||||||
""" parameters function must have strictly all arguments with the correct name
|
""" parameters function must have strictly all arguments with the correct name
|
||||||
"""
|
"""
|
||||||
async def get_message_args():
|
|
||||||
# load config
|
|
||||||
async with await Config(self.option) as config:
|
|
||||||
await config.property.read_write()
|
|
||||||
# set message to the uri name
|
|
||||||
await config.option('message').value.set(message)
|
|
||||||
# get message argument
|
|
||||||
dico = await config.option(message).value.dict()
|
|
||||||
return set(dico.keys())
|
|
||||||
|
|
||||||
def get_function_args():
|
|
||||||
function_args = self.get_function_args(function)
|
|
||||||
# risotto_context is a special argument, remove it
|
|
||||||
function_args = function_args[1:]
|
|
||||||
return set(function_args)
|
|
||||||
|
|
||||||
# get message arguments
|
# get message arguments
|
||||||
message_args = await get_message_args()
|
message_args = await self.get_message_args(message,
|
||||||
|
version,
|
||||||
|
)
|
||||||
# get function arguments
|
# get function arguments
|
||||||
function_args = get_function_args()
|
function_args = self.get_function_args(function)
|
||||||
# compare message arguments with function parameter
|
# compare message arguments with function parameter
|
||||||
# it must not have more or less arguments
|
# it must not have more or less arguments
|
||||||
|
for arg in function_args - message_args:
|
||||||
|
if arg.startswith('_'):
|
||||||
|
message_args.add(arg)
|
||||||
if message_args != function_args:
|
if message_args != function_args:
|
||||||
# raise if arguments are not equal
|
# raise if arguments are not equal
|
||||||
msg = []
|
msg = []
|
||||||
@ -99,29 +164,16 @@ class RegisterDispatcher:
|
|||||||
version: str,
|
version: str,
|
||||||
message: str,
|
message: str,
|
||||||
function: Callable,
|
function: Callable,
|
||||||
module_name: str):
|
module_name: str,
|
||||||
|
):
|
||||||
""" parameters function validation for event messages
|
""" parameters function validation for event messages
|
||||||
"""
|
"""
|
||||||
async def get_message_args():
|
|
||||||
# load config
|
|
||||||
async with await Config(self.option) as config:
|
|
||||||
await config.property.read_write()
|
|
||||||
# set message to the message name
|
|
||||||
await config.option('message').value.set(message)
|
|
||||||
# get message argument
|
|
||||||
dico = await config.option(message).value.dict()
|
|
||||||
return set(dico.keys())
|
|
||||||
|
|
||||||
def get_function_args():
|
|
||||||
function_args = self.get_function_args(function)
|
|
||||||
# risotto_context is a special argument, remove it
|
|
||||||
function_args = function_args[1:]
|
|
||||||
return set(function_args)
|
|
||||||
|
|
||||||
# get message arguments
|
# get message arguments
|
||||||
message_args = await get_message_args()
|
message_args = await self.get_message_args(message,
|
||||||
|
version,
|
||||||
|
)
|
||||||
# get function arguments
|
# get function arguments
|
||||||
function_args = get_function_args()
|
function_args = self.get_function_args(function)
|
||||||
# compare message arguments with function parameter
|
# compare message arguments with function parameter
|
||||||
# it can have less arguments but not more
|
# it can have less arguments but not more
|
||||||
extra_function_args = function_args - message_args
|
extra_function_args = function_args - message_args
|
||||||
@ -135,7 +187,8 @@ class RegisterDispatcher:
|
|||||||
version: str,
|
version: str,
|
||||||
message: str,
|
message: str,
|
||||||
notification: str,
|
notification: str,
|
||||||
function: Callable):
|
function: Callable,
|
||||||
|
):
|
||||||
""" register a function to an URI
|
""" register a function to an URI
|
||||||
URI is a message
|
URI is a message
|
||||||
"""
|
"""
|
||||||
@ -144,18 +197,20 @@ class RegisterDispatcher:
|
|||||||
if message not in self.messages[version]:
|
if message not in self.messages[version]:
|
||||||
raise RegistrationError(_(f'the message {message} not exists'))
|
raise RegistrationError(_(f'the message {message} not exists'))
|
||||||
|
|
||||||
# xxx module can only be register with v1.xxxx..... message
|
# xxx submodule can only be register with v1.yyy.xxx..... message
|
||||||
module_name = function.__module__.split('.')[-2]
|
full_module_name = function.__module__
|
||||||
message_namespace = message.split('.', 1)[0]
|
risotto_module_name, submodule_name = full_module_name.split('.')[-3:-1]
|
||||||
message_risotto_module, message_namespace, message_name = message.split('.', 2)
|
module_name = risotto_module_name.split('_')[-1]
|
||||||
if message_risotto_module != self.risotto_module:
|
message_module, message_submodule, message_name = message.split('.', 2)
|
||||||
raise RegistrationError(_(f'cannot registered the "{message}" is not "{self.risotto_module}"'))
|
if message_module not in self.risotto_modules:
|
||||||
if self.messages[version][message]['pattern'] == 'rpc' and message_namespace != module_name:
|
raise RegistrationError(_(f'cannot registered the "{message}" is not "{self.risotto_modules}"'))
|
||||||
raise RegistrationError(_(f'cannot registered the "{message}" message in module "{module_name}"'))
|
if self.messages[version][message]['pattern'] == 'rpc' and \
|
||||||
|
module_name != message_module and \
|
||||||
|
message_submodule != submodule_name:
|
||||||
|
raise RegistrationError(_(f'cannot registered the "{message}" message in submodule "{module_name}.{submodule_name}"'))
|
||||||
|
|
||||||
# True if first argument is the risotto_context
|
# True if first argument is the risotto_context
|
||||||
function_args = self.get_function_args(function)
|
function_args = self.get_function_args(function)
|
||||||
function_args.pop(0)
|
|
||||||
|
|
||||||
# check if already register
|
# check if already register
|
||||||
if 'function' in self.messages[version][message]:
|
if 'function' in self.messages[version][message]:
|
||||||
@ -168,19 +223,24 @@ class RegisterDispatcher:
|
|||||||
register = self.register_event
|
register = self.register_event
|
||||||
register(version,
|
register(version,
|
||||||
message,
|
message,
|
||||||
module_name,
|
f'{module_name}.{submodule_name}',
|
||||||
|
full_module_name,
|
||||||
function,
|
function,
|
||||||
function_args,
|
function_args,
|
||||||
notification)
|
notification,
|
||||||
|
)
|
||||||
|
|
||||||
def register_rpc(self,
|
def register_rpc(self,
|
||||||
version: str,
|
version: str,
|
||||||
message: str,
|
message: str,
|
||||||
module_name: str,
|
module_name: str,
|
||||||
|
full_module_name: str,
|
||||||
function: Callable,
|
function: Callable,
|
||||||
function_args: list,
|
function_args: list,
|
||||||
notification: Optional[str]):
|
notification: Optional[str],
|
||||||
|
):
|
||||||
self.messages[version][message]['module'] = module_name
|
self.messages[version][message]['module'] = module_name
|
||||||
|
self.messages[version][message]['full_module_name'] = full_module_name
|
||||||
self.messages[version][message]['function'] = function
|
self.messages[version][message]['function'] = function
|
||||||
self.messages[version][message]['arguments'] = function_args
|
self.messages[version][message]['arguments'] = function_args
|
||||||
if notification:
|
if notification:
|
||||||
@ -190,26 +250,34 @@ class RegisterDispatcher:
|
|||||||
version: str,
|
version: str,
|
||||||
message: str,
|
message: str,
|
||||||
module_name: str,
|
module_name: str,
|
||||||
|
full_module_name: str,
|
||||||
function: Callable,
|
function: Callable,
|
||||||
function_args: list,
|
function_args: list,
|
||||||
notification: Optional[str]):
|
notification: Optional[str],
|
||||||
|
):
|
||||||
if 'functions' not in self.messages[version][message]:
|
if 'functions' not in self.messages[version][message]:
|
||||||
self.messages[version][message]['functions'] = []
|
self.messages[version][message]['functions'] = []
|
||||||
|
|
||||||
dico = {'module': module_name,
|
dico = {'module': module_name,
|
||||||
|
'full_module_name': full_module_name,
|
||||||
'function': function,
|
'function': function,
|
||||||
'arguments': function_args}
|
'arguments': function_args,
|
||||||
|
}
|
||||||
if notification and notification:
|
if notification and notification:
|
||||||
dico['notification'] = notification
|
dico['notification'] = notification
|
||||||
self.messages[version][message]['functions'].append(dico)
|
self.messages[version][message]['functions'].append(dico)
|
||||||
|
|
||||||
def set_module(self, module_name, module, test):
|
def set_module(self,
|
||||||
|
submodule_name,
|
||||||
|
module,
|
||||||
|
test,
|
||||||
|
):
|
||||||
""" register and instanciate a new module
|
""" register and instanciate a new module
|
||||||
"""
|
"""
|
||||||
try:
|
try:
|
||||||
self.injected_self[module_name] = module.Risotto(test)
|
self.injected_self[submodule_name] = module.Risotto(test)
|
||||||
except AttributeError as err:
|
except AttributeError as err:
|
||||||
raise RegistrationError(_(f'unable to register the module {module_name}, this module must have Risotto class'))
|
raise RegistrationError(_(f'unable to register the module {submodule_name}, this module must have Risotto class'))
|
||||||
|
|
||||||
def validate(self):
|
def validate(self):
|
||||||
""" check if all messages have a function
|
""" check if all messages have a function
|
||||||
@ -223,9 +291,11 @@ class RegisterDispatcher:
|
|||||||
else:
|
else:
|
||||||
missing_messages.append(message)
|
missing_messages.append(message)
|
||||||
if missing_messages:
|
if missing_messages:
|
||||||
raise RegistrationError(_(f'missing uri {missing_messages}'))
|
raise RegistrationError(_(f'no matching function for uri {missing_messages}'))
|
||||||
|
|
||||||
async def on_join(self):
|
async def on_join(self,
|
||||||
|
truncate: bool=False,
|
||||||
|
) -> None:
|
||||||
internal_user = get_config()['global']['internal_user']
|
internal_user = get_config()['global']['internal_user']
|
||||||
async with self.pool.acquire() as connection:
|
async with self.pool.acquire() as connection:
|
||||||
await connection.set_type_codec(
|
await connection.set_type_codec(
|
||||||
@ -234,14 +304,18 @@ class RegisterDispatcher:
|
|||||||
decoder=loads,
|
decoder=loads,
|
||||||
schema='pg_catalog'
|
schema='pg_catalog'
|
||||||
)
|
)
|
||||||
|
if truncate:
|
||||||
|
async with connection.transaction():
|
||||||
|
await connection.execute('TRUNCATE InfraServer, InfraSite, InfraZone, Log, ProviderDeployment, ProviderFactoryCluster, ProviderFactoryClusterNode, SettingApplicationservice, SettingApplicationServiceDependency, SettingRelease, SettingServer, SettingServermodel, SettingSource, UserRole, UserRoleURI, UserURI, UserUser, InfraServermodel, ProviderZone, ProviderServer, ProviderSource, ProviderApplicationservice, ProviderServermodel')
|
||||||
async with connection.transaction():
|
async with connection.transaction():
|
||||||
for module_name, module in self.injected_self.items():
|
for submodule_name, module in self.injected_self.items():
|
||||||
risotto_context = Context()
|
risotto_context = Context()
|
||||||
risotto_context.username = internal_user
|
risotto_context.username = internal_user
|
||||||
risotto_context.paths.append(f'{module_name}.on_join')
|
risotto_context.paths.append(f'internal.{submodule_name}.on_join')
|
||||||
risotto_context.type = None
|
risotto_context.type = None
|
||||||
risotto_context.connection = connection
|
risotto_context.connection = connection
|
||||||
info_msg = _(f'in module {module_name}.on_join')
|
risotto_context.module = submodule_name.split('.', 1)[0]
|
||||||
|
info_msg = _(f'in function risotto_{submodule_name}.on_join')
|
||||||
await log.info_msg(risotto_context,
|
await log.info_msg(risotto_context,
|
||||||
None,
|
None,
|
||||||
info_msg)
|
info_msg)
|
||||||
@ -250,18 +324,20 @@ class RegisterDispatcher:
|
|||||||
async def load(self):
|
async def load(self):
|
||||||
# valid function's arguments
|
# valid function's arguments
|
||||||
db_conf = get_config()['database']['dsn']
|
db_conf = get_config()['database']['dsn']
|
||||||
self.pool = await asyncpg.create_pool(db_conf)
|
self.pool = await create_pool(db_conf)
|
||||||
async with self.pool.acquire() as connection:
|
async with self.pool.acquire() as connection:
|
||||||
async with connection.transaction():
|
async with connection.transaction():
|
||||||
for version, messages in self.messages.items():
|
for version, messages in self.messages.items():
|
||||||
for message, message_infos in messages.items():
|
for message, message_infos in messages.items():
|
||||||
if message_infos['pattern'] == 'rpc':
|
if message_infos['pattern'] == 'rpc':
|
||||||
module_name = message_infos['module']
|
# module not available during test
|
||||||
function = message_infos['function']
|
if 'module' in message_infos:
|
||||||
await self.valid_rpc_params(version,
|
module_name = message_infos['module']
|
||||||
message,
|
function = message_infos['function']
|
||||||
function,
|
await self.valid_rpc_params(version,
|
||||||
module_name)
|
message,
|
||||||
|
function,
|
||||||
|
module_name)
|
||||||
elif 'functions' in message_infos:
|
elif 'functions' in message_infos:
|
||||||
# event with functions
|
# event with functions
|
||||||
for function_infos in message_infos['functions']:
|
for function_infos in message_infos['functions']:
|
||||||
|
@ -1,57 +0,0 @@
|
|||||||
from aiohttp import ClientSession
|
|
||||||
from requests import get, post
|
|
||||||
from json import dumps
|
|
||||||
from tiramisu_api import Config
|
|
||||||
|
|
||||||
|
|
||||||
from .config import get_config
|
|
||||||
#
|
|
||||||
#
|
|
||||||
# ALLOW_INSECURE_HTTPS = get_config()['submodule']['allow_insecure_https']
|
|
||||||
|
|
||||||
|
|
||||||
class Remote:
|
|
||||||
submodules = {}
|
|
||||||
|
|
||||||
async def _get_config(self,
|
|
||||||
submodule: str,
|
|
||||||
url: str) -> None:
|
|
||||||
if submodule not in self.submodules:
|
|
||||||
session = ClientSession()
|
|
||||||
async with session.get(url) as resp:
|
|
||||||
if resp.status != 200:
|
|
||||||
try:
|
|
||||||
json = await resp.json()
|
|
||||||
err = json['error']['kwargs']['reason']
|
|
||||||
except:
|
|
||||||
err = await resp.text()
|
|
||||||
raise Exception(err)
|
|
||||||
json = await resp.json()
|
|
||||||
self.submodules[submodule] = json
|
|
||||||
return Config(self.submodules[submodule])
|
|
||||||
|
|
||||||
async def remove_call(self,
|
|
||||||
submodule: str,
|
|
||||||
version: str,
|
|
||||||
message: str,
|
|
||||||
payload) -> dict:
|
|
||||||
domain_name = get_config()['submodule'][submodule]
|
|
||||||
remote_url = f'http://{domain_name}:8080/api/{version}'
|
|
||||||
message_url = f'{remote_url}/{message}'
|
|
||||||
|
|
||||||
config = await self._get_config(submodule,
|
|
||||||
remote_url)
|
|
||||||
for key, value in payload.items():
|
|
||||||
path = message + '.' + key
|
|
||||||
config.option(path).value.set(value)
|
|
||||||
session = ClientSession()
|
|
||||||
async with session.post(message_url, data=dumps(payload)) as resp:
|
|
||||||
response = await resp.json()
|
|
||||||
if 'error' in response:
|
|
||||||
if 'reason' in response['error']['kwargs']:
|
|
||||||
raise Exception("{}".format(response['error']['kwargs']['reason']))
|
|
||||||
raise Exception('erreur inconnue')
|
|
||||||
return response['response']
|
|
||||||
|
|
||||||
|
|
||||||
remote = Remote()
|
|
33
src/risotto/services/__init__.py
Normal file
33
src/risotto/services/__init__.py
Normal file
@ -0,0 +1,33 @@
|
|||||||
|
from os import listdir
|
||||||
|
from os.path import isdir, isfile, dirname, abspath, basename, join
|
||||||
|
from importlib import import_module
|
||||||
|
# from ..dispatcher import dispatcher
|
||||||
|
|
||||||
|
|
||||||
|
def list_modules():
|
||||||
|
abs_here = dirname(abspath(__file__))
|
||||||
|
here = basename(abs_here)
|
||||||
|
return [name for name in listdir(abs_here) if not name.startswith('__') and isdir(join(abs_here, name))]
|
||||||
|
|
||||||
|
|
||||||
|
def load_submodules(dispatcher,
|
||||||
|
modules=None,
|
||||||
|
validate: bool=True,
|
||||||
|
test: bool=False):
|
||||||
|
abs_here = dirname(abspath(__file__))
|
||||||
|
here = basename(abs_here)
|
||||||
|
module = basename(dirname(abs_here))
|
||||||
|
if not modules:
|
||||||
|
modules = listdir(abs_here)
|
||||||
|
for module in modules:
|
||||||
|
absmodule = join(abs_here, module)
|
||||||
|
if isdir(absmodule):
|
||||||
|
for submodule in listdir(absmodule):
|
||||||
|
absfilename = join(absmodule, submodule)
|
||||||
|
if isdir(absfilename) and isfile(join(absfilename, '__init__.py')):
|
||||||
|
dispatcher.set_module(submodule,
|
||||||
|
import_module(f'.{here}.{module}.{submodule}',
|
||||||
|
f'risotto'),
|
||||||
|
test)
|
||||||
|
if validate:
|
||||||
|
dispatcher.validate()
|
0
tests/__init__.py
Normal file
0
tests/__init__.py
Normal file
@ -1,5 +1,15 @@
|
|||||||
from tiramisu import Storage
|
try:
|
||||||
from risotto.config import DATABASE_DIR
|
from tiramisu3 import Storage
|
||||||
|
except:
|
||||||
|
from tiramisu import Storage
|
||||||
|
from os.path import isfile as _isfile
|
||||||
|
import os as _os
|
||||||
|
_envfile = '/etc/risotto/risotto.conf'
|
||||||
|
if _isfile(_envfile):
|
||||||
|
with open(_envfile, 'r') as fh_env:
|
||||||
|
for line in fh_env.readlines():
|
||||||
|
key, value = line.strip().split('=')
|
||||||
|
_os.environ[key] = value
|
||||||
|
|
||||||
|
|
||||||
STORAGE = Storage(engine='sqlite3', dir_database=DATABASE_DIR, name='test')
|
STORAGE = Storage(engine='sqlite3')
|
||||||
|
@ -1,20 +1,29 @@
|
|||||||
from importlib import import_module
|
from importlib import import_module
|
||||||
import pytest
|
import pytest
|
||||||
from tiramisu import list_sessions, delete_session
|
try:
|
||||||
|
from tiramisu3 import list_sessions, delete_session as _delete_session
|
||||||
|
except:
|
||||||
|
from tiramisu import list_sessions, delete_session as _delete_session
|
||||||
|
|
||||||
from .storage import STORAGE
|
from .storage import STORAGE
|
||||||
|
from risotto import services
|
||||||
from risotto.context import Context
|
from risotto.context import Context
|
||||||
from risotto.services import load_services
|
#from risotto.services import load_services
|
||||||
from risotto.dispatcher import dispatcher
|
from risotto.dispatcher import dispatcher
|
||||||
|
|
||||||
|
|
||||||
|
SOURCE_NAME = 'test'
|
||||||
|
SERVERMODEL_NAME = 'sm1'
|
||||||
|
|
||||||
|
|
||||||
def setup_module(module):
|
def setup_module(module):
|
||||||
load_services(['config'],
|
# load_services(['config'],
|
||||||
validate=False)
|
# validate=False)
|
||||||
|
services.link_to_dispatcher(dispatcher, limit_services=['setting'], validate=False)
|
||||||
config_module = dispatcher.get_service('config')
|
config_module = dispatcher.get_service('config')
|
||||||
config_module.save_storage = STORAGE
|
config_module.save_storage = STORAGE
|
||||||
dispatcher.set_module('server', import_module(f'.server', 'fake_services'), True)
|
#dispatcher.set_module('server', import_module(f'.server', 'fake_services'), True)
|
||||||
dispatcher.set_module('servermodel', import_module(f'.servermodel', 'fake_services'), True)
|
#dispatcher.set_module('servermodel', import_module(f'.servermodel', 'fake_services'), True)
|
||||||
|
|
||||||
|
|
||||||
def setup_function(function):
|
def setup_function(function):
|
||||||
@ -23,11 +32,11 @@ def setup_function(function):
|
|||||||
config_module.servermodel = {}
|
config_module.servermodel = {}
|
||||||
|
|
||||||
|
|
||||||
def teardown_function(function):
|
async def delete_session():
|
||||||
# delete all sessions
|
# delete all sessions
|
||||||
config_module = dispatcher.get_service('config')
|
config_module = dispatcher.get_service('config')
|
||||||
for session in list_sessions(storage=config_module.save_storage):
|
for session in await list_sessions(storage=config_module.save_storage):
|
||||||
delete_session(storage=config_module.save_storage, session_id=session)
|
await _delete_session(storage=config_module.save_storage, session_id=session)
|
||||||
|
|
||||||
|
|
||||||
def get_fake_context(module_name):
|
def get_fake_context(module_name):
|
||||||
@ -38,127 +47,166 @@ def get_fake_context(module_name):
|
|||||||
return risotto_context
|
return risotto_context
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
async def onjoin(source=True):
|
||||||
async def test_on_join():
|
|
||||||
config_module = dispatcher.get_service('config')
|
config_module = dispatcher.get_service('config')
|
||||||
assert config_module.servermodel == {}
|
assert config_module.servermodel == {}
|
||||||
assert config_module.server == {}
|
assert config_module.server == {}
|
||||||
|
await delete_session()
|
||||||
#
|
#
|
||||||
|
#config_module.cache_root_path = 'tests/data'
|
||||||
|
await dispatcher.load()
|
||||||
|
await dispatcher.on_join(truncate=True)
|
||||||
|
if source:
|
||||||
|
fake_context = get_fake_context('config')
|
||||||
|
await dispatcher.call('v1',
|
||||||
|
'setting.source.create',
|
||||||
|
fake_context,
|
||||||
|
source_name=SOURCE_NAME,
|
||||||
|
source_directory='tests/data',
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
INTERNAL_SOURCE = {'source_name': 'internal', 'source_directory': '/srv/risotto/seed/internal'}
|
||||||
|
TEST_SOURCE = {'source_name': 'test', 'source_directory': 'tests/data'}
|
||||||
|
|
||||||
|
|
||||||
|
##############################################################################################################################
|
||||||
|
# Source / Release
|
||||||
|
##############################################################################################################################
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_source_on_join():
|
||||||
|
# onjoin must create internal source
|
||||||
|
sources = [INTERNAL_SOURCE]
|
||||||
|
await onjoin(False)
|
||||||
fake_context = get_fake_context('config')
|
fake_context = get_fake_context('config')
|
||||||
config_module.cache_root_path = 'tests/data'
|
assert await dispatcher.call('v1',
|
||||||
await config_module.on_join(fake_context)
|
'setting.source.list',
|
||||||
assert list(config_module.servermodel.keys()) == [1, 2]
|
fake_context,
|
||||||
assert list(config_module.server) == [3]
|
) == sources
|
||||||
assert set(config_module.server[3]) == {'server', 'server_to_deploy', 'funcs_file'}
|
await delete_session()
|
||||||
assert config_module.server[3]['funcs_file'] == 'tests/data/1/funcs.py'
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_server_created():
|
async def test_source_create():
|
||||||
|
sources = [INTERNAL_SOURCE, TEST_SOURCE]
|
||||||
|
await onjoin()
|
||||||
config_module = dispatcher.get_service('config')
|
config_module = dispatcher.get_service('config')
|
||||||
|
assert list(config_module.servermodel.keys()) == ['last_base']
|
||||||
|
assert list(config_module.server) == []
|
||||||
fake_context = get_fake_context('config')
|
fake_context = get_fake_context('config')
|
||||||
config_module.cache_root_path = 'tests/data'
|
assert await dispatcher.call('v1',
|
||||||
await config_module.on_join(fake_context)
|
'setting.source.list',
|
||||||
#
|
fake_context,
|
||||||
assert list(config_module.server) == [3]
|
) == sources
|
||||||
await dispatcher.publish('v1',
|
await delete_session()
|
||||||
'server.created',
|
|
||||||
fake_context,
|
|
||||||
server_id=4,
|
|
||||||
server_name='name3',
|
|
||||||
server_description='description3',
|
|
||||||
server_servermodel_id=2)
|
|
||||||
assert list(config_module.server) == [3, 4]
|
|
||||||
assert set(config_module.server[4]) == {'server', 'server_to_deploy', 'funcs_file'}
|
|
||||||
assert config_module.server[4]['funcs_file'] == 'tests/data/2/funcs.py'
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_server_deleted():
|
async def test_source_describe():
|
||||||
config_module = dispatcher.get_service('config')
|
await onjoin()
|
||||||
fake_context = get_fake_context('config')
|
fake_context = get_fake_context('config')
|
||||||
config_module.cache_root_path = 'tests/data'
|
assert await dispatcher.call('v1',
|
||||||
await config_module.on_join(fake_context)
|
'setting.source.describe',
|
||||||
#
|
fake_context,
|
||||||
assert list(config_module.server) == [3]
|
source_name='internal',
|
||||||
await dispatcher.publish('v1',
|
) == INTERNAL_SOURCE
|
||||||
'server.created',
|
assert await dispatcher.call('v1',
|
||||||
fake_context,
|
'setting.source.describe',
|
||||||
server_id=4,
|
fake_context,
|
||||||
server_name='name4',
|
source_name=SOURCE_NAME,
|
||||||
server_description='description4',
|
) == TEST_SOURCE
|
||||||
server_servermodel_id=2)
|
await delete_session()
|
||||||
assert list(config_module.server) == [3, 4]
|
|
||||||
await dispatcher.publish('v1',
|
|
||||||
'server.deleted',
|
@pytest.mark.asyncio
|
||||||
fake_context,
|
async def test_release_internal_list():
|
||||||
server_id=4)
|
releases = [{'release_distribution': 'last',
|
||||||
assert list(config_module.server) == [3]
|
'release_name': 'none',
|
||||||
|
'source_name': 'internal'}]
|
||||||
|
|
||||||
|
await onjoin()
|
||||||
|
fake_context = get_fake_context('config')
|
||||||
|
assert await dispatcher.call('v1',
|
||||||
|
'setting.source.release.list',
|
||||||
|
fake_context,
|
||||||
|
source_name='internal',
|
||||||
|
) == releases
|
||||||
|
await delete_session()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_release_list():
|
||||||
|
releases = [{'release_distribution': 'last',
|
||||||
|
'release_name': '1',
|
||||||
|
'source_name': 'test'}]
|
||||||
|
|
||||||
|
await onjoin()
|
||||||
|
fake_context = get_fake_context('config')
|
||||||
|
assert await dispatcher.call('v1',
|
||||||
|
'setting.source.release.list',
|
||||||
|
fake_context,
|
||||||
|
source_name='test',
|
||||||
|
) == releases
|
||||||
|
await delete_session()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_release_describe():
|
||||||
|
|
||||||
|
await onjoin()
|
||||||
|
fake_context = get_fake_context('config')
|
||||||
|
assert await dispatcher.call('v1',
|
||||||
|
'setting.source.release.describe',
|
||||||
|
fake_context,
|
||||||
|
source_name='internal',
|
||||||
|
release_distribution='last',
|
||||||
|
) == {'release_distribution': 'last',
|
||||||
|
'release_name': 'none',
|
||||||
|
'source_name': 'internal'}
|
||||||
|
assert await dispatcher.call('v1',
|
||||||
|
'setting.source.release.describe',
|
||||||
|
fake_context,
|
||||||
|
source_name='test',
|
||||||
|
release_distribution='last',
|
||||||
|
) == {'release_distribution': 'last',
|
||||||
|
'release_name': '1',
|
||||||
|
'source_name': 'test'}
|
||||||
|
await delete_session()
|
||||||
|
|
||||||
|
|
||||||
|
##############################################################################################################################
|
||||||
|
# Servermodel
|
||||||
|
##############################################################################################################################
|
||||||
|
async def create_servermodel(name=SERVERMODEL_NAME,
|
||||||
|
parents_name=['base'],
|
||||||
|
):
|
||||||
|
fake_context = get_fake_context('config')
|
||||||
|
await dispatcher.call('v1',
|
||||||
|
'setting.servermodel.create',
|
||||||
|
fake_context,
|
||||||
|
servermodel_name=name,
|
||||||
|
servermodel_description='servermodel 1',
|
||||||
|
parents_name=parents_name,
|
||||||
|
source_name=SOURCE_NAME,
|
||||||
|
release_distribution='last',
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_servermodel_created():
|
async def test_servermodel_created():
|
||||||
|
await onjoin()
|
||||||
config_module = dispatcher.get_service('config')
|
config_module = dispatcher.get_service('config')
|
||||||
fake_context = get_fake_context('config')
|
|
||||||
config_module.cache_root_path = 'tests/data'
|
|
||||||
await config_module.on_join(fake_context)
|
|
||||||
#
|
#
|
||||||
assert list(config_module.servermodel) == [1, 2]
|
assert list(config_module.servermodel) == ['last_base']
|
||||||
servermodel = {'servermodeid': 3,
|
await create_servermodel()
|
||||||
'servermodelname': 'name3'}
|
assert list(config_module.servermodel) == ['last_base', 'last_sm1']
|
||||||
await dispatcher.publish('v1',
|
assert not list(await config_module.servermodel['last_base'].config.parents())
|
||||||
'servermodel.created',
|
assert len(list(await config_module.servermodel['last_sm1'].config.parents())) == 1
|
||||||
fake_context,
|
await delete_session()
|
||||||
servermodel_id=3,
|
#
|
||||||
servermodel_description='name3',
|
#
|
||||||
release_id=1,
|
|
||||||
servermodel_name='name3')
|
|
||||||
assert list(config_module.servermodel) == [1, 2, 3]
|
|
||||||
assert not list(await config_module.servermodel[3].config.parents())
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_servermodel_herited_created():
|
|
||||||
config_module = dispatcher.get_service('config')
|
|
||||||
fake_context = get_fake_context('config')
|
|
||||||
config_module.cache_root_path = 'tests/data'
|
|
||||||
await config_module.on_join(fake_context)
|
|
||||||
#
|
|
||||||
assert list(config_module.servermodel) == [1, 2]
|
|
||||||
await dispatcher.publish('v1',
|
|
||||||
'servermodel.created',
|
|
||||||
fake_context,
|
|
||||||
servermodel_id=3,
|
|
||||||
servermodel_name='name3',
|
|
||||||
release_id=1,
|
|
||||||
servermodel_description='name3',
|
|
||||||
servermodel_parents_id=[1])
|
|
||||||
assert list(config_module.servermodel) == [1, 2, 3]
|
|
||||||
assert len(list(await config_module.servermodel[3].config.parents())) == 1
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
|
||||||
async def test_servermodel_multi_herited_created():
|
|
||||||
config_module = dispatcher.get_service('config')
|
|
||||||
fake_context = get_fake_context('config')
|
|
||||||
config_module.cache_root_path = 'tests/data'
|
|
||||||
await config_module.on_join(fake_context)
|
|
||||||
#
|
|
||||||
assert list(config_module.servermodel) == [1, 2]
|
|
||||||
await dispatcher.publish('v1',
|
|
||||||
'servermodel.created',
|
|
||||||
fake_context,
|
|
||||||
servermodel_id=3,
|
|
||||||
servermodel_name='name3',
|
|
||||||
release_id=1,
|
|
||||||
servermodel_description='name3',
|
|
||||||
servermodel_parents_id=[1, 2])
|
|
||||||
assert list(config_module.servermodel) == [1, 2, 3]
|
|
||||||
assert len(list(await config_module.servermodel[3].config.parents())) == 2
|
|
||||||
|
|
||||||
|
|
||||||
#@pytest.mark.asyncio
|
#@pytest.mark.asyncio
|
||||||
#async def test_servermodel_updated_not_exists():
|
#async def test_servermodel_herited_created():
|
||||||
# config_module = dispatcher.get_service('config')
|
# config_module = dispatcher.get_service('config')
|
||||||
# fake_context = get_fake_context('config')
|
# fake_context = get_fake_context('config')
|
||||||
# config_module.cache_root_path = 'tests/data'
|
# config_module.cache_root_path = 'tests/data'
|
||||||
@ -166,7 +214,28 @@ async def test_servermodel_multi_herited_created():
|
|||||||
# #
|
# #
|
||||||
# assert list(config_module.servermodel) == [1, 2]
|
# assert list(config_module.servermodel) == [1, 2]
|
||||||
# await dispatcher.publish('v1',
|
# await dispatcher.publish('v1',
|
||||||
# 'servermodel.updated',
|
# 'servermodel.created',
|
||||||
|
# fake_context,
|
||||||
|
# servermodel_id=3,
|
||||||
|
# servermodel_name='name3',
|
||||||
|
# release_id=1,
|
||||||
|
# servermodel_description='name3',
|
||||||
|
# servermodel_parents_id=[1])
|
||||||
|
# assert list(config_module.servermodel) == [1, 2, 3]
|
||||||
|
# assert len(list(await config_module.servermodel[3].config.parents())) == 1
|
||||||
|
# await delete_session()
|
||||||
|
#
|
||||||
|
#
|
||||||
|
#@pytest.mark.asyncio
|
||||||
|
#async def test_servermodel_multi_herited_created():
|
||||||
|
# config_module = dispatcher.get_service('config')
|
||||||
|
# fake_context = get_fake_context('config')
|
||||||
|
# config_module.cache_root_path = 'tests/data'
|
||||||
|
# await config_module.on_join(fake_context)
|
||||||
|
# #
|
||||||
|
# assert list(config_module.servermodel) == [1, 2]
|
||||||
|
# await dispatcher.publish('v1',
|
||||||
|
# 'servermodel.created',
|
||||||
# fake_context,
|
# fake_context,
|
||||||
# servermodel_id=3,
|
# servermodel_id=3,
|
||||||
# servermodel_name='name3',
|
# servermodel_name='name3',
|
||||||
@ -175,164 +244,311 @@ async def test_servermodel_multi_herited_created():
|
|||||||
# servermodel_parents_id=[1, 2])
|
# servermodel_parents_id=[1, 2])
|
||||||
# assert list(config_module.servermodel) == [1, 2, 3]
|
# assert list(config_module.servermodel) == [1, 2, 3]
|
||||||
# assert len(list(await config_module.servermodel[3].config.parents())) == 2
|
# assert len(list(await config_module.servermodel[3].config.parents())) == 2
|
||||||
|
# await delete_session()
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# @pytest.mark.asyncio
|
##@pytest.mark.asyncio
|
||||||
# async def test_servermodel_updated1():
|
##async def test_servermodel_updated_not_exists():
|
||||||
# config_module = dispatcher.get_service('config')
|
## config_module = dispatcher.get_service('config')
|
||||||
# fake_context = get_fake_context('config')
|
## fake_context = get_fake_context('config')
|
||||||
# config_module.cache_root_path = 'tests/data'
|
## config_module.cache_root_path = 'tests/data'
|
||||||
# await config_module.on_join(fake_context)
|
## await config_module.on_join(fake_context)
|
||||||
# #
|
## #
|
||||||
# assert list(config_module.servermodel) == [1, 2]
|
## assert list(config_module.servermodel) == [1, 2]
|
||||||
# metaconfig1 = config_module.servermodel[1]
|
## await dispatcher.publish('v1',
|
||||||
# metaconfig2 = config_module.servermodel[2]
|
## 'servermodel.updated',
|
||||||
# mixconfig1 = (await metaconfig1.config.list())[0]
|
## fake_context,
|
||||||
# mixconfig2 = (await metaconfig2.config.list())[0]
|
## servermodel_id=3,
|
||||||
# assert len(list(await metaconfig1.config.parents())) == 0
|
## servermodel_name='name3',
|
||||||
# assert len(list(await metaconfig2.config.parents())) == 1
|
## release_id=1,
|
||||||
# assert len(list(await mixconfig1.config.list())) == 1
|
## servermodel_description='name3',
|
||||||
# assert len(list(await mixconfig2.config.list())) == 0
|
## servermodel_parents_id=[1, 2])
|
||||||
# #
|
## assert list(config_module.servermodel) == [1, 2, 3]
|
||||||
# await dispatcher.publish('v1',
|
## assert len(list(await config_module.servermodel[3].config.parents())) == 2
|
||||||
# 'servermodel.updated',
|
## await delete_session()
|
||||||
# fake_context,
|
##
|
||||||
# servermodel_id=1,
|
##
|
||||||
# servermodel_name='name1-1',
|
## @pytest.mark.asyncio
|
||||||
# release_id=1,
|
## async def test_servermodel_updated1():
|
||||||
# servermodel_description='name1-1')
|
## config_module = dispatcher.get_service('config')
|
||||||
# assert set(config_module.servermodel) == {1, 2}
|
## fake_context = get_fake_context('config')
|
||||||
# assert config_module.servermodel[1].information.get('servermodel_name') == 'name1-1'
|
## config_module.cache_root_path = 'tests/data'
|
||||||
# assert metaconfig1 != config_module.servermodel[1]
|
## await config_module.on_join(fake_context)
|
||||||
# assert metaconfig2 == config_module.servermodel[2]
|
## #
|
||||||
# metaconfig1 = config_module.servermodel[1]
|
## assert list(config_module.servermodel) == [1, 2]
|
||||||
# assert mixconfig1 != next(metaconfig1.config.list())
|
## metaconfig1 = config_module.servermodel[1]
|
||||||
# mixconfig1 = next(metaconfig1.config.list())
|
## metaconfig2 = config_module.servermodel[2]
|
||||||
# #
|
## mixconfig1 = (await metaconfig1.config.list())[0]
|
||||||
# assert len(list(await metaconfig1.config.parents())) == 0
|
## mixconfig2 = (await metaconfig2.config.list())[0]
|
||||||
# assert len(list(await metaconfig2.config.parents())) == 1
|
## assert len(list(await metaconfig1.config.parents())) == 0
|
||||||
# assert len(list(await mixconfig1.config.list())) == 1
|
## assert len(list(await metaconfig2.config.parents())) == 1
|
||||||
# assert len(list(await mixconfig2.config.list())) == 0
|
## assert len(list(await mixconfig1.config.list())) == 1
|
||||||
#
|
## assert len(list(await mixconfig2.config.list())) == 0
|
||||||
#
|
## #
|
||||||
# @pytest.mark.asyncio
|
## await dispatcher.publish('v1',
|
||||||
# async def test_servermodel_updated2():
|
## 'servermodel.updated',
|
||||||
# config_module = dispatcher.get_service('config')
|
## fake_context,
|
||||||
# fake_context = get_fake_context('config')
|
## servermodel_id=1,
|
||||||
# config_module.cache_root_path = 'tests/data'
|
## servermodel_name='name1-1',
|
||||||
# await config_module.on_join(fake_context)
|
## release_id=1,
|
||||||
# # create a new servermodel
|
## servermodel_description='name1-1')
|
||||||
# assert list(config_module.servermodel) == [1, 2]
|
## assert set(config_module.servermodel) == {1, 2}
|
||||||
# mixconfig1 = next(config_module.servermodel[1].config.list())
|
## assert config_module.servermodel[1].information.get('servermodel_name') == 'name1-1'
|
||||||
# mixconfig2 = next(config_module.servermodel[2].config.list())
|
## assert metaconfig1 != config_module.servermodel[1]
|
||||||
# assert len(list(mixconfig1.config.list())) == 1
|
## assert metaconfig2 == config_module.servermodel[2]
|
||||||
# assert len(list(mixconfig2.config.list())) == 0
|
## metaconfig1 = config_module.servermodel[1]
|
||||||
# await dispatcher.publish('v1',
|
## assert mixconfig1 != next(metaconfig1.config.list())
|
||||||
# 'servermodel.created',
|
## mixconfig1 = next(metaconfig1.config.list())
|
||||||
# fake_context,
|
## #
|
||||||
# servermodel_id=3,
|
## assert len(list(await metaconfig1.config.parents())) == 0
|
||||||
# servermodel_name='name3',
|
## assert len(list(await metaconfig2.config.parents())) == 1
|
||||||
# release_id=1,
|
## assert len(list(await mixconfig1.config.list())) == 1
|
||||||
# servermodel_description='name3',
|
## assert len(list(await mixconfig2.config.list())) == 0
|
||||||
# servermodel_parents_id=[1])
|
## await delete_session()
|
||||||
# assert list(config_module.servermodel) == [1, 2, 3]
|
##
|
||||||
# assert len(list(await config_module.servermodel[3].config.parents())) == 1
|
##
|
||||||
# assert await config_module.servermodel[3].information.get('servermodel_name') == 'name3'
|
## @pytest.mark.asyncio
|
||||||
# assert len(list(await mixconfig1.config.list())) == 2
|
## async def test_servermodel_updated2():
|
||||||
# assert len(list(await mixconfig2.config.list())) == 0
|
## config_module = dispatcher.get_service('config')
|
||||||
# #
|
## fake_context = get_fake_context('config')
|
||||||
# await dispatcher.publish('v1',
|
## config_module.cache_root_path = 'tests/data'
|
||||||
# 'servermodel.updated',
|
## await config_module.on_join(fake_context)
|
||||||
# fake_context,
|
## # create a new servermodel
|
||||||
# servermodel_id=3,
|
## assert list(config_module.servermodel) == [1, 2]
|
||||||
# servermodel_name='name3-1',
|
## mixconfig1 = next(config_module.servermodel[1].config.list())
|
||||||
# release_id=1,
|
## mixconfig2 = next(config_module.servermodel[2].config.list())
|
||||||
# servermodel_description='name3-1',
|
## assert len(list(mixconfig1.config.list())) == 1
|
||||||
# servermodel_parents_id=[1, 2])
|
## assert len(list(mixconfig2.config.list())) == 0
|
||||||
# assert list(config_module.servermodel) == [1, 2, 3]
|
## await dispatcher.publish('v1',
|
||||||
# assert config_module.servermodel[3].information.get('servermodel_name') == 'name3-1'
|
## 'servermodel.created',
|
||||||
# assert len(list(mixconfig1.config.list())) == 2
|
## fake_context,
|
||||||
# assert len(list(mixconfig2.config.list())) == 1
|
## servermodel_id=3,
|
||||||
#
|
## servermodel_name='name3',
|
||||||
#
|
## release_id=1,
|
||||||
# @pytest.mark.asyncio
|
## servermodel_description='name3',
|
||||||
# async def test_servermodel_updated_config():
|
## servermodel_parents_id=[1])
|
||||||
# config_module = dispatcher.get_service('config')
|
## assert list(config_module.servermodel) == [1, 2, 3]
|
||||||
# fake_context = get_fake_context('config')
|
## assert len(list(await config_module.servermodel[3].config.parents())) == 1
|
||||||
# config_module.cache_root_path = 'tests/data'
|
## assert await config_module.servermodel[3].information.get('servermodel_name') == 'name3'
|
||||||
# await config_module.on_join(fake_context)
|
## assert len(list(await mixconfig1.config.list())) == 2
|
||||||
# #
|
## assert len(list(await mixconfig2.config.list())) == 0
|
||||||
# config_module.servermodel[1].property.read_write()
|
## #
|
||||||
# assert config_module.servermodel[1].option('creole.general.mode_conteneur_actif').value.get() == 'non'
|
## await dispatcher.publish('v1',
|
||||||
# config_module.servermodel[1].option('creole.general.mode_conteneur_actif').value.set('oui')
|
## 'servermodel.updated',
|
||||||
# assert config_module.servermodel[1].option('creole.general.mode_conteneur_actif').value.get() == 'oui'
|
## fake_context,
|
||||||
# #
|
## servermodel_id=3,
|
||||||
# await dispatcher.publish('v1',
|
## servermodel_name='name3-1',
|
||||||
# 'servermodel.updated',
|
## release_id=1,
|
||||||
# fake_context,
|
## servermodel_description='name3-1',
|
||||||
# servermodel_id=1,
|
## servermodel_parents_id=[1, 2])
|
||||||
# servermodel_name='name1-1',
|
## assert list(config_module.servermodel) == [1, 2, 3]
|
||||||
# release_id=1,
|
## assert config_module.servermodel[3].information.get('servermodel_name') == 'name3-1'
|
||||||
# servermodel_description='name1-1')
|
## assert len(list(mixconfig1.config.list())) == 2
|
||||||
# assert config_module.servermodel[1].option('creole.general.mode_conteneur_actif').value.get() == 'oui'
|
## assert len(list(mixconfig2.config.list())) == 1
|
||||||
|
## await delete_session()
|
||||||
|
##
|
||||||
|
##
|
||||||
|
## @pytest.mark.asyncio
|
||||||
|
## async def test_servermodel_updated_config():
|
||||||
|
## config_module = dispatcher.get_service('config')
|
||||||
|
## fake_context = get_fake_context('config')
|
||||||
|
## config_module.cache_root_path = 'tests/data'
|
||||||
|
## await config_module.on_join(fake_context)
|
||||||
|
## #
|
||||||
|
## config_module.servermodel[1].property.read_write()
|
||||||
|
## assert config_module.servermodel[1].option('configuration.general.mode_conteneur_actif').value.get() == 'non'
|
||||||
|
## config_module.servermodel[1].option('configuration.general.mode_conteneur_actif').value.set('oui')
|
||||||
|
## assert config_module.servermodel[1].option('configuration.general.mode_conteneur_actif').value.get() == 'oui'
|
||||||
|
## #
|
||||||
|
## await dispatcher.publish('v1',
|
||||||
|
## 'servermodel.updated',
|
||||||
|
## fake_context,
|
||||||
|
## servermodel_id=1,
|
||||||
|
## servermodel_name='name1-1',
|
||||||
|
## release_id=1,
|
||||||
|
## servermodel_description='name1-1')
|
||||||
|
## assert config_module.servermodel[1].option('configuration.general.mode_conteneur_actif').value.get() == 'oui'
|
||||||
|
## await delete_session()
|
||||||
|
|
||||||
|
|
||||||
|
##############################################################################################################################
|
||||||
|
# Server
|
||||||
|
##############################################################################################################################
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_server_created_base():
|
||||||
|
await onjoin()
|
||||||
|
config_module = dispatcher.get_service('config')
|
||||||
|
fake_context = get_fake_context('config')
|
||||||
|
#
|
||||||
|
assert list(config_module.server) == []
|
||||||
|
await dispatcher.on_join(truncate=True)
|
||||||
|
server_name = 'dns.test.lan'
|
||||||
|
await dispatcher.publish('v1',
|
||||||
|
'infra.server.created',
|
||||||
|
fake_context,
|
||||||
|
server_name=server_name,
|
||||||
|
server_description='description_created',
|
||||||
|
servermodel_name='base',
|
||||||
|
release_distribution='last',
|
||||||
|
site_name='site_1',
|
||||||
|
zones_name=['zones'],
|
||||||
|
)
|
||||||
|
assert list(config_module.server) == [server_name]
|
||||||
|
assert set(config_module.server[server_name]) == {'server', 'server_to_deploy', 'funcs_file'}
|
||||||
|
assert config_module.server[server_name]['funcs_file'] == '/var/cache/risotto/servermodel/last/base/funcs.py'
|
||||||
|
await delete_session()
|
||||||
|
|
||||||
|
|
||||||
|
@pytest.mark.asyncio
|
||||||
|
async def test_server_created_own_sm():
|
||||||
|
await onjoin()
|
||||||
|
config_module = dispatcher.get_service('config')
|
||||||
|
fake_context = get_fake_context('config')
|
||||||
|
await create_servermodel()
|
||||||
|
#
|
||||||
|
assert list(config_module.server) == []
|
||||||
|
await dispatcher.on_join(truncate=True)
|
||||||
|
server_name = 'dns.test.lan'
|
||||||
|
await dispatcher.publish('v1',
|
||||||
|
'infra.server.created',
|
||||||
|
fake_context,
|
||||||
|
server_name=server_name,
|
||||||
|
server_description='description_created',
|
||||||
|
servermodel_name=SERVERMODEL_NAME,
|
||||||
|
source_name=SOURCE_NAME,
|
||||||
|
release_distribution='last',
|
||||||
|
site_name='site_1',
|
||||||
|
zones_name=['zones'],
|
||||||
|
)
|
||||||
|
assert list(config_module.server) == [server_name]
|
||||||
|
assert set(config_module.server[server_name]) == {'server', 'server_to_deploy', 'funcs_file'}
|
||||||
|
assert config_module.server[server_name]['funcs_file'] == '/var/cache/risotto/servermodel/last/sm1/funcs.py'
|
||||||
|
await delete_session()
|
||||||
|
|
||||||
|
|
||||||
|
#@pytest.mark.asyncio
|
||||||
|
#async def test_server_deleted():
|
||||||
|
# config_module = dispatcher.get_service('config')
|
||||||
|
# config_module.cache_root_path = 'tests/data'
|
||||||
|
# await config_module.on_join(fake_context)
|
||||||
|
# #
|
||||||
|
# assert list(config_module.server) == [3]
|
||||||
|
# await dispatcher.publish('v1',
|
||||||
|
# 'server.created',
|
||||||
|
# fake_context,
|
||||||
|
# server_id=4,
|
||||||
|
# server_name='name4',
|
||||||
|
# server_description='description4',
|
||||||
|
# server_servermodel_id=2)
|
||||||
|
# assert list(config_module.server) == [3, 4]
|
||||||
|
# await dispatcher.publish('v1',
|
||||||
|
# 'server.deleted',
|
||||||
|
# fake_context,
|
||||||
|
# server_id=4)
|
||||||
|
# assert list(config_module.server) == [3]
|
||||||
|
# await delete_session()
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_server_configuration_get():
|
async def test_server_configuration_get():
|
||||||
|
await onjoin()
|
||||||
config_module = dispatcher.get_service('config')
|
config_module = dispatcher.get_service('config')
|
||||||
fake_context = get_fake_context('config')
|
fake_context = get_fake_context('config')
|
||||||
config_module.cache_root_path = 'tests/data'
|
await create_servermodel()
|
||||||
await config_module.on_join(fake_context)
|
await dispatcher.on_join(truncate=True)
|
||||||
|
server_name = 'dns.test.lan'
|
||||||
|
await dispatcher.publish('v1',
|
||||||
|
'infra.server.created',
|
||||||
|
fake_context,
|
||||||
|
server_name=server_name,
|
||||||
|
server_description='description_created',
|
||||||
|
servermodel_name=SERVERMODEL_NAME,
|
||||||
|
source_name=SOURCE_NAME,
|
||||||
|
release_distribution='last',
|
||||||
|
site_name='site_1',
|
||||||
|
zones_name=['zones'],
|
||||||
|
)
|
||||||
#
|
#
|
||||||
await config_module.server[3]['server_to_deploy'].property.read_write()
|
await config_module.server[server_name]['server'].property.read_write()
|
||||||
assert await config_module.server[3]['server_to_deploy'].option('creole.general.mode_conteneur_actif').value.get() == 'non'
|
assert await config_module.server[server_name]['server'].option('configuration.general.number_of_interfaces').value.get() == 1
|
||||||
await config_module.server[3]['server_to_deploy'].option('creole.general.mode_conteneur_actif').value.set('oui')
|
await config_module.server[server_name]['server'].option('configuration.general.number_of_interfaces').value.set(2)
|
||||||
assert await config_module.server[3]['server_to_deploy'].option('creole.general.mode_conteneur_actif').value.get() == 'oui'
|
assert await config_module.server[server_name]['server'].option('configuration.general.number_of_interfaces').value.get() == 2
|
||||||
assert await config_module.server[3]['server'].option('creole.general.mode_conteneur_actif').value.get() == 'non'
|
assert await config_module.server[server_name]['server_to_deploy'].option('configuration.general.number_of_interfaces').value.get() == 1
|
||||||
#
|
#
|
||||||
|
configuration = {'server_name': server_name,
|
||||||
|
'deployed': False,
|
||||||
|
'configuration': {'configuration.general.number_of_interfaces': 1,
|
||||||
|
'configuration.general.interfaces_list': [0],
|
||||||
|
'configuration.interface_0.domain_name_eth0': 'dns.test.lan'
|
||||||
|
}
|
||||||
|
}
|
||||||
values = await dispatcher.call('v1',
|
values = await dispatcher.call('v1',
|
||||||
'config.configuration.server.get',
|
'setting.config.configuration.server.get',
|
||||||
fake_context,
|
fake_context,
|
||||||
server_id=3)
|
server_name=server_name,
|
||||||
configuration = {'configuration':
|
deployed=False,
|
||||||
{'creole.general.mode_conteneur_actif': 'non',
|
)
|
||||||
'creole.general.master.master': [],
|
|
||||||
'creole.general.master.slave1': [],
|
|
||||||
'creole.general.master.slave2': [],
|
|
||||||
'containers.container0.files.file0.mkdir': False,
|
|
||||||
'containers.container0.files.file0.name': '/etc/mailname',
|
|
||||||
'containers.container0.files.file0.rm': False,
|
|
||||||
'containers.container0.files.file0.source': 'mailname',
|
|
||||||
'containers.container0.files.file0.activate': True},
|
|
||||||
'server_id': 3,
|
|
||||||
'deployed': True}
|
|
||||||
assert values == configuration
|
assert values == configuration
|
||||||
#
|
#
|
||||||
values = await dispatcher.call('v1',
|
await delete_session()
|
||||||
'config.configuration.server.get',
|
|
||||||
fake_context,
|
|
||||||
server_id=3,
|
|
||||||
deployed=False)
|
|
||||||
configuration['configuration']['creole.general.mode_conteneur_actif'] = 'oui'
|
|
||||||
configuration['deployed'] = False
|
|
||||||
assert values == configuration
|
|
||||||
|
|
||||||
|
|
||||||
@pytest.mark.asyncio
|
@pytest.mark.asyncio
|
||||||
async def test_config_deployed():
|
async def test_server_configuration_deployed():
|
||||||
|
await onjoin()
|
||||||
config_module = dispatcher.get_service('config')
|
config_module = dispatcher.get_service('config')
|
||||||
fake_context = get_fake_context('config')
|
fake_context = get_fake_context('config')
|
||||||
config_module.cache_root_path = 'tests/data'
|
await create_servermodel()
|
||||||
await config_module.on_join(fake_context)
|
await dispatcher.on_join(truncate=True)
|
||||||
|
server_name = 'dns.test.lan'
|
||||||
|
await dispatcher.publish('v1',
|
||||||
|
'infra.server.created',
|
||||||
|
fake_context,
|
||||||
|
server_name=server_name,
|
||||||
|
server_description='description_created',
|
||||||
|
servermodel_name=SERVERMODEL_NAME,
|
||||||
|
source_name=SOURCE_NAME,
|
||||||
|
release_distribution='last',
|
||||||
|
site_name='site_1',
|
||||||
|
zones_name=['zones'],
|
||||||
|
)
|
||||||
#
|
#
|
||||||
await config_module.server[3]['server_to_deploy'].property.read_write()
|
await config_module.server[server_name]['server'].property.read_write()
|
||||||
assert await config_module.server[3]['server_to_deploy'].option('creole.general.mode_conteneur_actif').value.get() == 'non'
|
assert await config_module.server[server_name]['server'].option('configuration.general.number_of_interfaces').value.get() == 1
|
||||||
await config_module.server[3]['server_to_deploy'].option('creole.general.mode_conteneur_actif').value.set('oui')
|
await config_module.server[server_name]['server'].option('configuration.general.number_of_interfaces').value.set(2)
|
||||||
assert await config_module.server[3]['server_to_deploy'].option('creole.general.mode_conteneur_actif').value.get() == 'oui'
|
assert await config_module.server[server_name]['server'].option('configuration.general.number_of_interfaces').value.get() == 2
|
||||||
assert await config_module.server[3]['server'].option('creole.general.mode_conteneur_actif').value.get() == 'non'
|
assert await config_module.server[server_name]['server_to_deploy'].option('configuration.general.number_of_interfaces').value.get() == 1
|
||||||
values = await dispatcher.publish('v1',
|
#
|
||||||
'config.configuration.server.deploy',
|
configuration = {'server_name': server_name,
|
||||||
fake_context,
|
'deployed': False,
|
||||||
server_id=3)
|
'configuration': {'configuration.general.number_of_interfaces': 1,
|
||||||
assert await config_module.server[3]['server_to_deploy'].option('creole.general.mode_conteneur_actif').value.get() == 'oui'
|
'configuration.general.interfaces_list': [0],
|
||||||
assert await config_module.server[3]['server'].option('creole.general.mode_conteneur_actif').value.get() == 'oui'
|
'configuration.interface_0.domain_name_eth0': 'dns.test.lan'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
try:
|
||||||
|
await dispatcher.call('v1',
|
||||||
|
'setting.config.configuration.server.get',
|
||||||
|
fake_context,
|
||||||
|
server_name=server_name,
|
||||||
|
)
|
||||||
|
except:
|
||||||
|
pass
|
||||||
|
else:
|
||||||
|
raise Exception('should raise propertyerror')
|
||||||
|
|
||||||
|
values = await dispatcher.call('v1',
|
||||||
|
'setting.config.configuration.server.deploy',
|
||||||
|
fake_context,
|
||||||
|
server_name=server_name,
|
||||||
|
)
|
||||||
|
assert values == {'server_name': 'dns.test.lan', 'deployed': True}
|
||||||
|
await dispatcher.call('v1',
|
||||||
|
'setting.config.configuration.server.get',
|
||||||
|
fake_context,
|
||||||
|
server_name=server_name,
|
||||||
|
)
|
||||||
|
|
||||||
|
#
|
||||||
|
await delete_session()
|
||||||
|
@ -2,7 +2,7 @@ from importlib import import_module
|
|||||||
import pytest
|
import pytest
|
||||||
from .storage import STORAGE
|
from .storage import STORAGE
|
||||||
from risotto.context import Context
|
from risotto.context import Context
|
||||||
from risotto.services import load_services
|
#from risotto.services import load_services
|
||||||
from risotto.dispatcher import dispatcher
|
from risotto.dispatcher import dispatcher
|
||||||
from risotto.services.session.storage import storage_server, storage_servermodel
|
from risotto.services.session.storage import storage_server, storage_servermodel
|
||||||
|
|
||||||
@ -16,9 +16,9 @@ def get_fake_context(module_name):
|
|||||||
|
|
||||||
|
|
||||||
def setup_module(module):
|
def setup_module(module):
|
||||||
load_services(['config', 'session'],
|
#load_services(['config', 'session'],
|
||||||
validate=False,
|
# validate=False,
|
||||||
test=True)
|
# test=True)
|
||||||
config_module = dispatcher.get_service('config')
|
config_module = dispatcher.get_service('config')
|
||||||
config_module.save_storage = STORAGE
|
config_module.save_storage = STORAGE
|
||||||
dispatcher.set_module('server', import_module(f'.server', 'fake_services'), True)
|
dispatcher.set_module('server', import_module(f'.server', 'fake_services'), True)
|
||||||
|
Reference in New Issue
Block a user