add v1.applicationservice.dependency.add message

add applicationservice.dependency.add message
remove source.release.get_by_distribution message
2020-02-23 16:53:29 +01:00 · 2020-02-21 16:16:50 +01:00 · 2020-02-21 16:10:06 +01:00 · 2020-02-21 16:08:31 +01:00 · 2020-01-31 11:34:27 +01:00 · 2020-01-31 11:23:41 +01:00
64 changed files with 916 additions and 762 deletions
--- a/README.md
+++ b/README.md
@ -26,8 +26,7 @@ docker exec -ti postgres bash
 psql -U postgres -h localhost -c "CREATE ROLE risotto WITH LOGIN PASSWORD 'risotto';"
 psql -U postgres -h localhost -c "CREATE DATABASE risotto;"
 psql -U postgres -h localhost -c "GRANT ALL ON DATABASE risotto TO risotto;"
-psql -U postgres -h localhost -c "CREATE EXTENSION hstore;"
-psql -U postgres -h localhost -c "CREATE EXTENSION pgcrypto;"
+#psql -U postgres -h localhost -c "CREATE EXTENSION hstore;" risotto
 ```

 Gestion de la base de données avec Sqitch
@ -45,22 +44,67 @@ 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 tiramisu
+drop table value; drop table property; drop table permissive; drop table information; drop table session;
+
 # Import EOLE
 ./script/cucchiaiata source.create -n eole -u http://localhost
 ./script/cucchiaiata source.release.create -s eole -n 2.7.1.1 -d last
 ./script/cucchiaiata applicationservice.dataset.updated -s eole -r last
 ./script/cucchiaiata servermodel.dataset.updated -s eole -r last

-# Create a server
-./script/cucchiaiata server.create -s test -d description -m eolebase -n eole -r last
+# Create a new user and set role 'server_rw' for this server
+./script/cucchiaiata user.create -l gnunux -n gnunux -s gnunux
+./script/cucchiaiata user.role.create -u gnunux -n 'server_rw' -a 'Server.ServerName' -v test
+
+# Heritage
+## ACA
+./script/cucchiaiata servermodel.create -n aca -d Aca -p eolebase -s eole -r last
+./script/cucchiaiata session.servermodel.start -s aca
+S=xxxxxxxxxxxxxxxxxxxxxx
+### verif
+./script/cucchiaiata session.servermodel.get -s $S -n creole.reseau.unbound_route_address
+./script/cucchiaiata session.servermodel.get -s $S -n creole.reseau.unbound_domain_name
+./script/cucchiaiata session.servermodel.get -s $S -n creole.serveur_dns.unbound_local_zones
+./script/cucchiaiata session.servermodel.get -s $S -n creole.reseau.unbound_ip_address_cidr
+
+./script/cucchiaiata session.servermodel.configure -s $S --creole.reseau.unbound_route_address 192.168.1.2
+./script/cucchiaiata session.servermodel.configure -s $S --creole.serveur_dns.unbound_allowed_client_cidr 192.168.1.0/24
+./script/cucchiaiata session.servermodel.stop -s $S -a
+
+## etab1
+./script/cucchiaiata servermodel.create -n etab1 -d "Etab 1" -p aca -s internal -r last
+./script/cucchiaiata session.servermodel.start -s etab1
+S=xxxxxxxxxxxxxxxxxxxxxx
+./script/cucchiaiata session.servermodel.configure -s $S --creole.reseau.unbound_domain_name test.cadoles.com
+./script/cucchiaiata session.servermodel.stop -s $S -a
+
+## unbound
+./script/cucchiaiata servermodel.create -n unbound -d "generic unbound configuration" -p eolebase -s eole -r last
+./script/cucchiaiata session.servermodel.start -s unbound
+S=xxxxxxxxxxxxxxxxxxxxxx
+./script/cucchiaiata session.servermodel.configure -s $S --creole.serveur_dns.unbound_local_zones cadoles.com
+./script/cucchiaiata session.servermodel.filter -s $S -n unbound
+./script/cucchiaiata session.servermodel.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.hostname_cadoles_com toto titi
+./script/cucchiaiata session.servermodel.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.ip_cadoles_com 0 192.168.1.25
+./script/cucchiaiata session.servermodel.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.type_cadoles_com 1 CNAME
+./script/cucchiaiata session.servermodel.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.cname_cadoles_com 1 toto.cadoles.com
+./script/cucchiaiata session.servermodel.stop -s $S -a
+
+## unbound_etab1
+./script/cucchiaiata servermodel.create -n unbound_etab1 -d "unbound configuration for etab1" -p etab1 unbound -s internal -r last
+
+### verif
+./script/cucchiaiata session.servermodel.start -s unbound_etab1
+S=xxxxxxxxxxxxxxxxxxxxxx
+XXXXX
+
+# Create a server
+./script/cucchiaiata server.create -s test -d description -m unbound_etab1 -r last

-# Configure the server
 ./script/cucchiaiata session.server.start -s test
 S=xxxxxxxxxxxxxxxxxxxxxx
-./script/cucchiaiata session.server.configure -s $S --creole.reseau.unbound_ip_address_cidr 192.168.1.1/24 --creole.reseau.unbound_route_address 192.168.1.2 --creole.serveur_dns.unbound_allowed_client_cidr 192.168.1.0/24 --creole.serveur_dns.unbound_local_zones cadoles.com
-./script/cucchiaiata session.server.configure -s $S --creole.reseau.unbound_domain_name test.cadoles.com
-./script/cucchiaiata session.server.filter -s $S -n unbound
-./script/cucchiaiata session.server.configure -s $S --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.hostname_cadoles_com toto titi --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.ip_cadoles_com 0 192.168.1.25 --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.type_cadoles_com 1 CNAME  --unbound.unbound_zone_cadoles_com.hostname_cadoles_com.cname_cadoles_com 1 toto.cadoles.com
+./script/cucchiaiata session.server.configure -s $S --creole.reseau.unbound_ip_address_cidr 192.168.1.1/24
 ./script/cucchiaiata session.server.validate -s $S
 ./script/cucchiaiata session.server.stop -s $S -a

@ -68,6 +112,14 @@ S=xxxxxxxxxxxxxxxxxxxxxx
 ./script/cucchiaiata config.configuration.server.deploy -s test
 ./script/cucchiaiata template.generate -s test

-# Create a new user and set role 'server_rw' for this server
-./script/cucchiaiata user.create -l gnunux -n gnunux -s gnunux
-./script/cucchiaiata user.role.create -u gnunux -n 'server_rw' -a 'Server.ServerName' -v test
+
+# OpenSSH
+#add servermodel openssh link to eolebase
+#add servermodel openssh2 lint to openssh
+#link openssh applicationservice to this servermodel
+
+./script/cucchiaiata servermodel.create -n openssh_1 -d description -p eolebase -s eole -r last
+./script/cucchiaiata servermodel.create -n openssh_2 -d openssh_2 -p openssh_1 -s internal -r last
+./script/cucchiaiata applicationservice.dependency.add -n local_openssh_1 -a openssh -s eole -r last
+
+#./script/cucchiaiata server.create -s test -d description -m eolebase -r last
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -20,7 +20,7 @@ RUN ln -s /srv/src/tiramisu/tiramisu /usr/local/lib/python3.7
 RUN ln -s /srv/src/rougail/src/rougail /usr/local/lib/python3.7
 RUN ln -s /srv/src/risotto/src/risotto /usr/local/lib/python3.7

-RUN pip install Cheetah3 PyJWT
+RUN pip install Cheetah3
 RUN cd /srv/src/risotto && pip install -r requirements.txt

 # Installation
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@ -6,7 +6,6 @@ services:
      dockerfile: docker/Dockerfile
    volumes:
      - ../.:/srv/src/risotto
-      - ../messages:/usr/local/lib/messages
    ports:
      - "8080:8080"
    depends_on:
@ -16,6 +15,9 @@ services:
    #command: tail -F /var/log
    command: python -u /srv/src/risotto/script/server.py
    restart: on-failure
+    environment:
+        RISOTTO_DSN: ${RISOTTO_DSN:-postgres://risotto:risotto@postgres:5432/risotto}
+        RISOTTO_TIRAMISU_DSN: ${RISOTTO_TIRAMISU_DSN:-postgres://risotto:risotto@postgres:5432/tiramisu}
  postgres:
    image: postgres:11-alpine
    environment:
--- a/docker/postgres-init/10-postgres.init.sh
+++ b/docker/postgres-init/10-postgres.init.sh
@ -7,7 +7,6 @@ psql --username "$POSTGRES_USER" <<-EOSQL
    GRANT ALL ON DATABASE risotto TO risotto;
    \c risotto
    CREATE EXTENSION hstore;
-    CREATE EXTENSION pgcrypto;
 EOSQL

 psql --username "risotto" --password "risotto" <<-EOSQL
@ -65,7 +64,6 @@ psql --username "risotto" --password "risotto" <<-EOSQL
    CREATE TABLE RisottoUser (
    UserId SERIAL PRIMARY KEY,
    UserLogin VARCHAR(100) NOT NULL UNIQUE,
-    UserPassword TEXT NOT NULL,
    UserName VARCHAR(100) NOT NULL,
    UserSurname VARCHAR(100) NOT NULL
    );
--- a/messages/v1/messages/applicationservice.create.yml
+++ b/messages/v1/messages/applicationservice.create.yml
@ -22,11 +22,6 @@ parameters:
    shortarg: a
    description: ID des services applicatif donc dépendant le service applicatif.
    default: []
-  release_id:
-    type: Number
-    shortarg: r
-    description: |
-      Identifiant de la version associée au service applicatif.

 response:
  type: ApplicationService
--- a/messages/v1/messages/applicationservice.dependency.add.yml
+++ b/messages/v1/messages/applicationservice.dependency.add.yml
@ -0,0 +1,30 @@
+---
+uri: applicationservice.dependency.add
+
+description: |
+  Ajouter une dépendance à un service applicatif.
+
+pattern: rpc
+
+parameters:
+  applicationservice_name:
+    type: String
+    shortarg: n
+    description: |
+      Nom du service applicatif.
+  applicationservice_dependency:
+    type: String
+    shortarg: a
+    description: Service applicatif donc dépendant le service applicatif.
+  source_name:
+    type: String
+    shortarg: s
+    description: Source du service applicatif a ajouter en dépendance.
+  release_distribution:
+    type: String
+    shortarg: r
+    description: Version du service applicatif a ajouter en dépendance.
+
+response:
+  type: ApplicationService
+  description: Informations sur le service applicatif modifié.
--- a/messages/v1/messages/applicationservice.describe.yml
+++ b/messages/v1/messages/applicationservice.describe.yml
@ -12,11 +12,16 @@ parameters:
    shortarg: n
    description: |
      Nom du service applicatif à créer.
-  release_id:
-    type: Number
+  source_name:
+    type: String
+    shortarg: s
+    description: |
+      Nom de la source.
+  release_distribution:
+    type: String
    shortarg: r
    description: |
-      Identifiant de la version associée au service applicatif.
+      Version associée au service applicatif.

 response:
  type: ApplicationService
--- a/messages/v1/messages/applicationservice.updated.yml
+++ b/messages/v1/messages/applicationservice.updated.yml
@ -0,0 +1,10 @@
+---
+uri: applicationservice.updated
+
+description: Un service application a été modifié.
+
+pattern: event
+
+parameters:
+  type: 'ApplicationService'
+  description: Informations sur le service applicatif modifié.
--- a/messages/v1/messages/old/identity.session-user.get.yml
+++ b/messages/v1/messages/old/identity.session-user.get.yml
@ -5,7 +5,7 @@ description: |
  Retourne des informations sur la session HTTP courante de l'utilisateur.

 sampleuse: |
-  cucchiaiata identity.session-user.get
+  zephir-client identity.session-user.get

 pattern: rpc

--- a/messages/v1/messages/old/identity.settings.get.yml
+++ b/messages/v1/messages/old/identity.settings.get.yml
@ -5,7 +5,7 @@ description: |
  Retourne les préférences de l'utilisateur spécifié.

 sampleuse: |
-  cucchiaiata identity.settings.get -u yo
+  zephir-client identity.settings.get -u yo

 pattern: rpc

--- a/messages/v1/messages/old/identity.settings.set.yml
+++ b/messages/v1/messages/old/identity.settings.set.yml
@ -5,7 +5,7 @@ description: |
  Enregistre des préférences pour l'utilisateur spécifié.

 sampleuse: |
-        cucchiaiata identity.settings.set -u yo
+        zephir-client identity.settings.set -u yo

 pattern: rpc

--- a/messages/v1/messages/old/server.delete.yml
+++ b/messages/v1/messages/old/server.delete.yml
@ -11,7 +11,7 @@ pattern: rpc
 domain: server-domain

 sampleuse: |
-  cucchiaiata server.delete -s 1
+  zephir-client server.delete -s 1

 parameters:
  serverid:
--- a/messages/v1/messages/old/server.exec.command.yml
+++ b/messages/v1/messages/old/server.exec.command.yml
@ -5,7 +5,7 @@ description: |
  Transmet une commande à exécuter sur un serveur donné.

 sampleuse: |
-  cucchiaiata server.exec.command -s 1 -c reconfigure
+  zephir-client server.exec.command -s 1 -c reconfigure

 domain: server-domain

--- a/messages/v1/messages/old/server.exec.deploy.yml
+++ b/messages/v1/messages/old/server.exec.deploy.yml
@ -5,7 +5,7 @@ description: |
  Déploie la configuration sur un serveur donné.

 sampleuse: |
-  cucchiaiata server.exec.deploy -s 1
+  zephir-client server.exec.deploy -s 1

 domain: server-domain

--- a/messages/v1/messages/old/server.exec.describe.yml
+++ b/messages/v1/messages/old/server.exec.describe.yml
@ -5,7 +5,7 @@ description: |
  Liste les commandes exécuté pour un identifiant de tâche.

 sampleuse: |
-  cucchiaiata server.exec.list -j 1
+  zephir-client server.exec.list -j 1

 domain: execution-domain

--- a/messages/v1/messages/old/server.exec.list.yml
+++ b/messages/v1/messages/old/server.exec.list.yml
@ -5,7 +5,7 @@ description: |
  Liste les commandes exécutées sur un serveur donné.

 sampleuse: |
-  cucchiaiata server.exec.list -s 1
+  zephir-client server.exec.list -s 1

 domain: execution-domain

--- a/messages/v1/messages/old/server.serverselection.list.yml
+++ b/messages/v1/messages/old/server.serverselection.list.yml
@ -5,7 +5,7 @@ description: |
   Retourne la liste des sélections de serveurs d'un serveur

 sampleuse: |
-  cucchiaiata server.serverselection.list
+  zephir-client server.serverselection.list

 pattern: rpc

--- a/messages/v1/messages/old/server.update.yml
+++ b/messages/v1/messages/old/server.update.yml
@ -7,7 +7,7 @@ description: |
 public: true

 sampleuse: |
-  cucchiaiata server.update -s 1 -n toto -d "server description"
+  zephir-client server.update -s 1 -n toto -d "server description"

 pattern: rpc

--- a/messages/v1/messages/old/servermodel.applicationservice.join.yml
+++ b/messages/v1/messages/old/servermodel.applicationservice.join.yml
@ -5,7 +5,7 @@ description: |
  Associe un service applicatif à un modèle de serveur.

 sampleuse: |
-  cucchiaiata servermodel.applicationservice.join -m 1 -s 1
+  zephir-client servermodel.applicationservice.join -m 1 -s 1

 pattern: rpc

--- a/messages/v1/messages/old/servermodel.applicationservice.list.yml
+++ b/messages/v1/messages/old/servermodel.applicationservice.list.yml
@ -5,7 +5,7 @@ description: |
  Retourne la liste des applications service.

 sampleuse: |
-  cucchiaiata servermodel.applicationservice.list -s 6
+  zephir-client servermodel.applicationservice.list -s 6

 pattern: rpc

--- a/messages/v1/messages/old/servermodel.create.yml
+++ b/messages/v1/messages/old/servermodel.create.yml
@ -5,7 +5,7 @@ description: |
  Crée un modèle de serveur.

 sampleuse: |
-  cucchiaiata servermodel.create -p 1 -n "MonServeurModele" -d "Ma description" -s 1
+  zephir-client servermodel.create -p 1 -n "MonServeurModele" -d "Ma description" -s 1

 pattern: rpc

--- a/messages/v1/messages/old/servermodel.subrelease.list.yml
+++ b/messages/v1/messages/old/servermodel.subrelease.list.yml
@ -5,7 +5,7 @@ description: |
  Retourne la liste des subreleases.

 sampleuse: |
-  cucchiaiata servermodel.subrelease.list
+  zephir-client servermodel.subrelease.list

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.create.yml
+++ b/messages/v1/messages/old/serverselection.create.yml
@ -5,7 +5,7 @@ description: |
  Crée un sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.create -n Select1 -d "Ma description"
+  zephir-client serverselection.create -n Select1 -d "Ma description"

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.delete.yml
+++ b/messages/v1/messages/old/serverselection.delete.yml
@ -5,7 +5,7 @@ description: |
  Supprime une sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.delete -s 1
+  zephir-client serverselection.delete -s 1

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.describe.yml
+++ b/messages/v1/messages/old/serverselection.describe.yml
@ -6,7 +6,7 @@ description: |


 sampleuse: |
-  cucchiaiata serverselection.describe -s 1
+  zephir-client serverselection.describe -s 1

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.exec.command.yml
+++ b/messages/v1/messages/old/serverselection.exec.command.yml
@ -5,7 +5,7 @@ description: |
  Transmet une commande à exécuter sur une sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.exec.command -s 1 -c reconfigure
+  zephir-client serverselection.exec.command -s 1 -c reconfigure

 domain: server-domain

--- a/messages/v1/messages/old/serverselection.exec.deploy.yml
+++ b/messages/v1/messages/old/serverselection.exec.deploy.yml
@ -5,7 +5,7 @@ description: |
  Déploie la configuration sur les serveurs d'une sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.exec.deploy -s 1
+  zephir-client serverselection.exec.deploy -s 1

 domain: server-domain

--- a/messages/v1/messages/old/serverselection.list.yml
+++ b/messages/v1/messages/old/serverselection.list.yml
@ -5,7 +5,7 @@ description: |
   Retourne la liste des sélections de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.list
+  zephir-client serverselection.list

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.server.add.yml
+++ b/messages/v1/messages/old/serverselection.server.add.yml
@ -5,7 +5,7 @@ description: |
  Ajoute un serveur à une sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.add.server -s 1 -i 1
+  zephir-client serverselection.add.server -s 1 -i 1

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.server.remove.yml
+++ b/messages/v1/messages/old/serverselection.server.remove.yml
@ -5,7 +5,7 @@ description: |
  Supprime un serveur d'une sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.remove.server -s 1 -i 1
+  zephir-client serverselection.remove.server -s 1 -i 1

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.server.set.yml
+++ b/messages/v1/messages/old/serverselection.server.set.yml
@ -5,7 +5,7 @@ description: |
  Renseigne une liste de serveur dans une sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.server.set -s 1 -i 1
+  zephir-client serverselection.server.set -s 1 -i 1

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.update.yml
+++ b/messages/v1/messages/old/serverselection.update.yml
@ -5,7 +5,7 @@ description: |
  Modifie une sélection de serveur.

 sampleuse: |
-  cucchiaiata serverselection.update -s 1 -n Select1 -d "Ma description"
+  zephir-client serverselection.update -s 1 -n Select1 -d "Ma description"

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.user.add.yml
+++ b/messages/v1/messages/old/serverselection.user.add.yml
@ -5,7 +5,7 @@ description: |
  Associe un utilisateur à une sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.add.user -s 1 -u yo -r admin
+  zephir-client serverselection.add.user -s 1 -u yo -r admin

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.user.default.yml
+++ b/messages/v1/messages/old/serverselection.user.default.yml
@ -5,7 +5,7 @@ description: |
  Retourne la sélection de serveurs par défaut de l'utilisateur.

 sampleuse: |
-  cucchiaiata serverselection.user.default
+  zephir-client serverselection.user.default

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.user.list.yml
+++ b/messages/v1/messages/old/serverselection.user.list.yml
@ -5,7 +5,7 @@ description: |
  Retourne les sélections de serveurs dont l'utilisateur fait parti.

 sampleuse: |
-  cucchiaiata serverselection.user.list
+  zephir-client serverselection.user.list

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.user.remove.yml
+++ b/messages/v1/messages/old/serverselection.user.remove.yml
@ -5,7 +5,7 @@ description: |
  Dissocie un utilisateur d'une sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.remove.user -s 1 -u yo
+  zephir-client serverselection.remove.user -s 1 -u yo

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.user.role.get.yml
+++ b/messages/v1/messages/old/serverselection.user.role.get.yml
@ -5,7 +5,7 @@ description: |
  Retourne le rôle d'utilisateur sur une selection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.user.role.get -d '{}'
+  zephir-client serverselection.user.role.get -d '{}'

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.user.role.server.get.yml
+++ b/messages/v1/messages/old/serverselection.user.role.server.get.yml
@ -5,7 +5,7 @@ description: |
  Retourne le rôle d'un utlisateur sur un serveur.

 sampleuse: |
-  cucchiaiata serverselection.user.role.server.get -d '{}'
+  zephir-client serverselection.user.role.server.get -d '{}'

 pattern: rpc

--- a/messages/v1/messages/old/serverselection.user.update.yml
+++ b/messages/v1/messages/old/serverselection.user.update.yml
@ -5,7 +5,7 @@ description: |
  Modifie le rôle d'un utilisateur pour une sélection de serveurs.

 sampleuse: |
-  cucchiaiata serverselection.update.user -s 1 -u yo -r admin
+  zephir-client serverselection.update.user -s 1 -u yo -r admin

 pattern: rpc

--- a/messages/v1/messages/server.create.yml
+++ b/messages/v1/messages/server.create.yml
@ -19,11 +19,6 @@ parameters:
    shortarg: m
    ref: Servermodel.ServermodelName
    description: Nom du modèle de serveur.
-  source_name:
-    type: String
-    shortarg: n
-    ref: Source.SourceName
-    description: Nom de la source.
  release_distribution:
    type: String
    shortarg: r
--- a/messages/v1/messages/servermodel.create.yml
+++ b/messages/v1/messages/servermodel.create.yml
@ -0,0 +1,35 @@
+---
+uri: servermodel.create
+
+description: |
+  Crée un modèle de serveur.
+
+pattern: rpc
+
+parameters:
+  servermodel_name:
+    type: String
+    shortarg: n
+    description: Nom du modèle de serveur à créer.
+  servermodel_description:
+    type: String
+    shortarg: d
+    description: |
+      Description du modèle de serveur à créer.
+  servermodel_parents_name:
+    type: "[]String"
+    ref: Servermodel.ServermodelName
+    shortarg: p
+    description: Nom des modèles de serveur parents auquels rattacher le nouveau modèle.
+  servermodel_parents_source_name:
+    type: String
+    shortarg: s
+    description: Nom de la source des modèles parents.
+  servermodel_parents_release_distribution:
+    type: String
+    shortarg: r
+    description: Nom de la distribution des modèles parents.
+
+response:
+  type: Servermodel
+  description: Informations sur le modèle de serveur créé.
--- a/messages/v1/messages/servermodel.get_by_id.yml
+++ b/messages/v1/messages/servermodel.get_by_id.yml
@ -1,17 +0,0 @@
---
-uri: servermodel.get_by_id
-
-description: Retourne les attributs détaillés d'un modèle de serveur suivant son identifiant.
-
-pattern: rpc
-
-parameters:
-  servermodel_id:
-    type: Number
-    shortarg: s
-    description: Identifiant du modèle de serveur à récupérer.
-    ref: Servermodel.ServermodelId
-
-response:
-  type: Servermodel
-  description: Description du modèle de serveur.
--- a/messages/v1/messages/session.servermodel.start.yml
+++ b/messages/v1/messages/session.servermodel.start.yml
@ -11,16 +11,6 @@ parameters:
    ref: Servermodel.ServermodelName
    shortarg: s
    description: Nom du serveurmodel.
-  source_name:
-    type: String
-    shortarg: n
-    description: Nom de la source.
-    ref: Source.SourceName
-  release_distribution:
-    type: String
-    shortarg: r
-    description: Nom de la distribution.
-    ref: Source.ReleaseDistribution

 response:
  type: Session
--- a/messages/v1/messages/source.release.get_by_distribution.yml
+++ b/messages/v1/messages/source.release.get_by_distribution.yml
@ -1,22 +0,0 @@
---
-uri: source.release.get_by_distribution
-
-description: |
-  Retourne version suivant le nom de la distribution.
-
-pattern: rpc
-
-parameters:
-  source_id:
-    type: Number
-    shortarg: s
-    description: ID de la source.
-  release_distribution:
-    type: String
-    shortarg: r
-    description: Distribution de la version.
-
-response:
-  type: 'Release'
-  description: La version disponibles.
-
--- a/messages/v1/messages/user.create.yml
+++ b/messages/v1/messages/user.create.yml
@ -11,10 +11,6 @@ parameters:
    shortarg: l
    description: Login de l'utilisateur.
    ref: User.Login
-  user_password:
-    type: String
-    shortarg: p
-    description: Password de l'utilisateur.
  user_name:
    type: String
    shortarg: n
--- a/messages/v1/types/servermodel.yml
+++ b/messages/v1/types/servermodel.yml
@ -23,8 +23,13 @@ properties:
    type: number
    ref: Servermodel.SubreleaseId
    description: Version du modèle de serveur.
+  servermodel_applicationservice_id:
+    type: number
+    ref: Applicationservice.ApplicationserviceId
+    description: Identifiant de l'application service local.
 required:
  - servermodel_id
  - servermodel_name
  - servermodel_description
  - release_id
+  - servermodel_applicationservice_id
--- a/script/database_manager.py
+++ b/script/database_manager.py
@ -3,14 +3,14 @@ import asyncio
 from risotto.config import get_config

 VERSION_INIT = """
-- Création de la table Source
+-- Source
 CREATE TABLE Source (
  SourceId SERIAL PRIMARY KEY,
  SourceName VARCHAR(255) NOT NULL UNIQUE,
  SourceURL TEXT
 );

-- Création de la table Release
+-- Release
 CREATE TABLE Release (
  ReleaseId SERIAL PRIMARY KEY,
  ReleaseName VARCHAR(255) NOT NULL,
@ -21,30 +21,35 @@ CREATE TABLE Release (
  FOREIGN KEY (ReleaseSourceId) REFERENCES Source(SourceId)
 );

-
-- Création de la table Servermodel
+-- Servermodel
 CREATE TABLE Servermodel (
  ServermodelId SERIAL PRIMARY KEY,
  ServermodelName VARCHAR(255) NOT NULL,
  ServermodelDescription VARCHAR(255) NOT NULL,
  ServermodelParentsId INTEGER [] DEFAULT '{}',
  ServermodelReleaseId INTEGER NOT NULL,
-  ServermodelApplicationServiceId INTEGER NOT NULL,
-  ServermodelUsers hstore,
+  ServermodelApplicationserviceId INTEGER NOT NULL,
  UNIQUE (ServermodelName, ServermodelReleaseId)
 );
+CREATE INDEX ServermodelApplicationserviceId_index ON Servermodel (ServermodelApplicationserviceId);

-- Création de la table ApplicationService
-CREATE TABLE ApplicationService (
-  ApplicationServiceId SERIAL PRIMARY KEY,
-  ApplicationServiceName VARCHAR(255) NOT NULL,
-  ApplicationServiceDescription VARCHAR(255) NOT NULL,
-  ApplicationServiceReleaseId INTEGER NOT NULL,
-  ApplicationServiceDependencies JSON,
-  UNIQUE (ApplicationServiceName, ApplicationServiceReleaseId)
+-- Applicationservice
+CREATE TABLE Applicationservice (
+  ApplicationserviceId SERIAL PRIMARY KEY,
+  ApplicationserviceName VARCHAR(255) NOT NULL,
+  ApplicationserviceDescription VARCHAR(255) NOT NULL,
+  ApplicationserviceReleaseId INTEGER NOT NULL,
+  UNIQUE (ApplicationserviceName, ApplicationserviceReleaseId)
+);
+CREATE TABLE ApplicationserviceDependency (
+  ApplicationserviceId INTEGER NOT NULL,
+  ApplicationserviceDependencyId INTEGER NOT NULL,
+  UNIQUE(ApplicationserviceId, ApplicationserviceDependencyId),
+  FOREIGN KEY (ApplicationserviceId) REFERENCES Applicationservice(ApplicationserviceId),
+  FOREIGN KEY (ApplicationserviceDependencyId) REFERENCES Applicationservice(ApplicationserviceId)
 );

-- Server table creation
+-- Server
 CREATE TABLE Server (
  ServerId SERIAL PRIMARY KEY,
  ServerName VARCHAR(255) NOT NULL UNIQUE,
@ -52,12 +57,10 @@ CREATE TABLE Server (
  ServerServermodelId INTEGER NOT NULL
 );

-- User, Role and ACL table creation
-
+-- User, Role and ACL
 CREATE TABLE RisottoUser (
  UserId SERIAL PRIMARY KEY,
  UserLogin VARCHAR(100) NOT NULL UNIQUE,
-  UserPassword TEXT NOT NULL,
  UserName VARCHAR(100) NOT NULL,
  UserSurname VARCHAR(100) NOT NULL
 );
@ -83,8 +86,7 @@ CREATE TABLE RoleURI (
  PRIMARY KEY (RoleName, URIId)
 );

-- Log table creation
-
+-- Log
 CREATE TABLE log(
  Msg VARCHAR(255) NOT NULL,
  Level VARCHAR(10) NOT NULL,
@ -93,20 +95,11 @@ CREATE TABLE log(
  Data JSON,
  Date timestamp DEFAULT current_timestamp
 );
-
 """

 async def main():
-    db_conf = get_config().get('database')
-    #asyncpg.connect('postgresql://postgres@localhost/test')
-    engine = db_conf.get('engine')
-    host = db_conf.get('host')
-    dbname = db_conf.get('dbname')
-    dbuser = db_conf.get('user')
-    dbpassword = db_conf.get('password')
-    dbport = db_conf.get('port')
-    cfg = "{}://{}:{}@{}:{}/{}".format(engine, dbuser, dbpassword, host, dbport, dbname)
-    pool = await asyncpg.create_pool(cfg)
+    db_conf = get_config()['database']['dsn']
+    pool = await asyncpg.create_pool(db_conf)
    async with pool.acquire() as connection:
        async with connection.transaction():
            returns = await connection.execute(VERSION_INIT)
@ -115,4 +108,3 @@ if __name__ == '__main__':
    loop = asyncio.get_event_loop()
    loop.run_until_complete(main())
    # asyncio.run(main())
-
--- a/script/server.py
+++ b/script/server.py
@ -1,6 +1,7 @@
 from asyncio import get_event_loop
 from risotto import get_app

+
 if __name__ == '__main__':
    loop = get_event_loop()
    loop.run_until_complete(get_app(loop))
@ -8,5 +9,3 @@ if __name__ == '__main__':
        loop.run_forever()
    except KeyboardInterrupt:
        pass
-
-
--- a/src/risotto/config.py
+++ b/src/risotto/config.py
@ -1,45 +1,32 @@
 MESSAGE_ROOT_PATH = 'messages'
-DATABASE_DIR = '/var/cache/risotto/database'
 INTERNAL_USER = 'internal'
 CONFIGURATION_DIR = 'configurations'
 TEMPLATE_DIR = 'templates'
 TMP_DIR = 'tmp'
-ROUGAIL_DTD_PATH = '../rougail/data/creole.dtd'
-DEFAULT_USER = 'gnunux'
-DEFAULT_USER_PASSWORD = 'gnunux'
-URI = 'http://localhost'
-PORT = 8080
-JWT_SECRET = 'MY_SUPER_SECRET'
-JWT_TOKEN_EXPIRE = 3600
-JWT_TOKEN_AUDIENCE = "Risotto"
+DEFAULT_USER = 'Anonymous'
+DEFAULT_DSN = 'postgres:///risotto?host=/var/run/postgresql/&user=risotto'
+DEFAULT_TIRAMISU_DSN = 'postgres:///tiramisu?host=/var/run/postgresql/&user=tiramisu'

-import os
+from os import environ
 from pathlib import PurePosixPath
 CURRENT_PATH = PurePosixPath(__file__)

 def get_config():
-    return {'database': {'engine': 'postgres',
-                         'host': 'postgres',
-                         'port': 5432,
-                         'dbname': 'risotto',
-                         'user': 'risotto',
-                         'password': 'risotto',
+    return {'database': {'dsn': environ.get('RISOTTO_DSN', DEFAULT_DSN),
+                         'tiramisu_dsn': environ.get('RISOTTO_TIRAMISU_DSN', DEFAULT_TIRAMISU_DSN),
                         },
-            'http_server': {'port': PORT,
+            'http_server': {'port': 8080,
+                            #'default_user': "gnunux"},
                            'default_user': DEFAULT_USER},
            'global': {'message_root_path': CURRENT_PATH.parents[2] / 'messages',
                       'debug': True,
                       'internal_user': 'internal',
                       'check_role': True,
-                       'rougail_dtd_path': '../rougail/data/creole.dtd',
-                       'admin_user': DEFAULT_USER,
-                       'admin_user_password': DEFAULT_USER_PASSWORD},
+                       'admin_user': DEFAULT_USER},
            'source': {'root_path': '/srv/seed'},
            'cache': {'root_path': '/var/cache/risotto'},
-            'jwt': {
-                'secret': JWT_SECRET,
-                'token_expire': JWT_TOKEN_EXPIRE,
-                'issuer': URI,
-                'audience': JWT_TOKEN_AUDIENCE}
+            'servermodel': {'internal_source': 'internal',
+                            'internal_distribution': 'last',
+                            'internal_release_name': 'none'},
            }

--- a/src/risotto/dispatcher.py
+++ b/src/risotto/dispatcher.py
@ -38,8 +38,7 @@ class CallDispatcher:
            raise Exception('hu?')
        else:
            for ret in returns:
-                config = await Config(response,
-                                      display_name=lambda self, dyn_name: self.impl_getname())
+                async with await Config(response, display_name=lambda self, dyn_name: self.impl_getname()) as config:
                    await config.property.read_write()
                    try:
                        for key, value in ret.items():
@ -88,6 +87,7 @@ class CallDispatcher:
                                     kwargs,
                                     function_objs)
        else:
+            try:
                async with self.pool.acquire() as connection:
                    await connection.set_type_codec(
                        'json',
@ -103,6 +103,23 @@ class CallDispatcher:
                                                 check_role,
                                                 kwargs,
                                                 function_objs)
+            except CallError as err:
+                raise err
+            except Exception as err:
+                # if there is a problem with arguments, just send an error and do nothing
+                if get_config()['global']['debug']:
+                    print_exc()
+                async with self.pool.acquire() as connection:
+                    await connection.set_type_codec(
+                        'json',
+                        encoder=dumps,
+                        decoder=loads,
+                        schema='pg_catalog'
+                    )
+                    risotto_context.connection = connection
+                    async with connection.transaction():
+                        await log.error_msg(risotto_context, kwargs, err)
+                raise err


 class PublishDispatcher:
@ -127,6 +144,7 @@ class PublishDispatcher:
                                     kwargs,
                                     function_objs)
        else:
+            try:
                async with self.pool.acquire() as connection:
                    await connection.set_type_codec(
                        'json',
@ -142,6 +160,23 @@ class PublishDispatcher:
                                                 check_role,
                                                 kwargs,
                                                 function_objs)
+            except CallError as err:
+                raise err
+            except Exception as err:
+                # if there is a problem with arguments, just send an error and do nothing
+                if get_config()['global']['debug']:
+                    print_exc()
+                async with self.pool.acquire() as connection:
+                    await connection.set_type_codec(
+                        'json',
+                        encoder=dumps,
+                        decoder=loads,
+                        schema='pg_catalog'
+                    )
+                    risotto_context.connection = connection
+                    async with connection.transaction():
+                        await log.error_msg(risotto_context, kwargs, err)
+                raise err


 class Dispatcher(register.RegisterDispatcher, CallDispatcher, PublishDispatcher):
@ -182,7 +217,7 @@ class Dispatcher(register.RegisterDispatcher, CallDispatcher, PublishDispatcher)
        """ create a new Config et set values to it
        """
        # create a new config
-        config = await Config(self.option)
+        async with await Config(self.option) as config:
            await config.property.read_write()
            # set message's option
            await config.option('message').value.set(risotto_context.message)
@ -268,19 +303,10 @@ class Dispatcher(register.RegisterDispatcher, CallDispatcher, PublishDispatcher)
                     function_objs: List) -> Optional[Dict]:
        await self.check_message_type(risotto_context,
                                      kwargs)
-        try:
        config_arguments = await self.load_kwargs_to_config(risotto_context,
                                                            f'{version}.{message}',
                                                            kwargs,
                                                            check_role)
-        except Exception as err:
-            # if there is a problem with arguments, just send an error and do nothing
-            if get_config()['global']['debug']:
-                print_exc()
-            await log.error_msg(risotto_context, kwargs, err)
-            if risotto_context.type == 'rpc':
-                raise err
-            return
        # config is ok, so send the message
        for function_obj in function_objs:
            function = function_obj['function']
@ -306,13 +332,13 @@ class Dispatcher(register.RegisterDispatcher, CallDispatcher, PublishDispatcher)
                    raise err
                continue
            except Exception as err:
+                if risotto_context.type == 'rpc':
+                    raise err
                if get_config().get('global').get('debug'):
                    print_exc()
                await log.error_msg(risotto_context,
                                    kwargs,
                                    err)
-                if risotto_context.type == 'rpc':
-                    raise CallError(str(err))
                continue
            else:
                if risotto_context.type == 'rpc':
--- a/src/risotto/http.py
+++ b/src/risotto/http.py
@ -1,10 +1,8 @@
-from aiohttp.web import Application, Response, get, post, HTTPBadRequest, HTTPInternalServerError, HTTPNotFound, HTTPUnauthorized
-from aiohttp import BasicAuth, RequestInfo
+from aiohttp.web import Application, Response, get, post, HTTPBadRequest, HTTPInternalServerError, HTTPNotFound
 from json import dumps
 from traceback import print_exc
-from tiramisu import Config
-import datetime
-import jwt
+from tiramisu import Config, default_storage
+

 from .dispatcher import dispatcher
 from .utils import _
@ -18,16 +16,6 @@ from .services import load_services

 def create_context(request):
    risotto_context = Context()
-    if 'Authorization' in request.headers:
-        token = request.headers['Authorization']
-        if not token.startswith("Bearer "):
-            raise HTTPBadRequest(reason='Unexpected bearer format')
-        token = token[7:]
-        decoded = verify_token(token)
-        if 'user' in decoded:
-            risotto_context.username = decoded['user']
-            return risotto_context
-    else:
    risotto_context.username = request.match_info.get('username',
                                                      get_config()['http_server']['default_user'])
    return risotto_context
@ -61,7 +49,7 @@ class extra_route_handler:
        try:
            returns = await cls.function(**kwargs)
        except NotAllowedError as err:
-            raise HTTPUnauthorized(reason=str(err))
+            raise HTTPNotFound(reason=str(err))
        except CallError as err:
            raise HTTPBadRequest(reason=str(err))
        except Exception as err:
@ -89,7 +77,7 @@ async def handle(request):
                            check_role=True,
                            **kwargs)
    except NotAllowedError as err:
-        raise HTTPUnauthorized(reason=str(err))
+        raise HTTPNotFound(reason=str(err))
    except CallError as err:
        raise HTTPBadRequest(reason=str(err).replace('\n', ' '))
    except Exception as err:
@ -114,7 +102,7 @@ async def api(request, risotto_context):
                WHERE RoleURI.URIId = URI.URIId
                '''
                uris = [uri['uriname'] for uri in await connection.fetch(sql)]
-        config = await Config(get_messages(load_shortarg=True, uris=uris)[1])
+        async with await Config(get_messages(load_shortarg=True, uris=uris)[1]) as config:
            await config.property.read_write()
            tiramisu = await config.option.dict(remotable='none')
    return tiramisu
@ -131,6 +119,7 @@ async def get_app(loop):
    load_services()
    app = Application(loop=loop)
    routes = []
+    default_storage.engine('dictionary')
    await dispatcher.load()
    for version, messages in dispatcher.messages.items():
        print()
@ -153,76 +142,8 @@ async def get_app(loop):
        print()
    del extra_routes
    app.add_routes(routes)
-    app.router.add_post('/auth', auth)
-    app.router.add_post('/access_token', access_token)
    await dispatcher.on_join()
    return await loop.create_server(app.make_handler(), '*', get_config()['http_server']['port'])

-async def auth(request):
-    auth_code = request.headers['Authorization']
-    if not auth_code.startswith("Basic "):
-        raise HTTPBadRequest(reason='Unexpected bearer format')
-    auth = BasicAuth.decode(auth_code)
-    async with dispatcher.pool.acquire() as connection:
-        async with connection.transaction():
-            # Check role with ACL
-            sql = '''
-            SELECT UserName
-            FROM RisottoUser
-            WHERE UserLogin = $1
-            AND UserPassword = crypt($2, UserPassword);
-            '''
-            res = await connection.fetch(sql, auth.login, auth.password)
-            if res:
-                res = gen_token(auth)
-                if verify_token(res):
-                    return Response(text=str(res.decode('utf-8')))
-                else:
-                    return HTTPInternalServerError(reason='Token could not be verified just after creation')
-            else:
-                raise HTTPUnauthorized(reason='Unauthorized')
-
-def gen_token(auth):
-    secret = get_config()['jwt']['secret']
-    expire = get_config()['jwt']['token_expire']
-    issuer = get_config()['jwt']['issuer']
-    audience = get_config()['jwt']['audience']
-    payload = {
-                'user': auth.login,
-                'exp': datetime.datetime.utcnow() + datetime.timedelta(seconds=expire),
-                'iss': issuer,
-                'aud': audience
-              }
-    token = jwt.encode(payload, secret, algorithm='HS256')
-    return token
-
-def access_token(request):
-    expire = get_config()['jwt']['token_expire']
-    secret = get_config()['jwt']['secret']
-    token = request.headers['Authorization']
-    if not token.startswith("Bearer "):
-        raise HTTPBadRequest(reason='Unexpected bearer format')
-    token = token[7:]   
-    decoded = verify_token(token)
-    if decoded:
-        decoded['exp'] = datetime.datetime.utcnow() + datetime.timedelta(seconds=expire)
-        token = jwt.encode(decoded, secret, algorithm='HS256')
-        return Response(text=str(token.decode('utf-8')))
-    else:
-        return HTTPUnauthorized(reason='Token could not be verified')
-
-def verify_token(token):
-    secret = get_config()['jwt']['secret']
-    issuer = get_config()['jwt']['issuer']
-    audience = get_config()['jwt']['audience']
-    try:
-        decoded = jwt.decode(token, secret, issuer=issuer, audience=audience, algorithms=['HS256'])
-    except jwt.ExpiredSignatureError:
-        raise HTTPUnauthorized(reason='Token Expired')
-    except jwt.InvalidIssuerError:
-        raise HTTPUnauthorized(reason='Token could not be verified')
-    except jwt.InvalidAudienceError:
-        raise HTTPUnauthorized(reason='Token audience not match')
-    return decoded

 tiramisu = None
--- a/src/risotto/message/message.py
+++ b/src/risotto/message/message.py
@ -38,7 +38,7 @@ class AnyOption(Option):

 class MessageDefinition:
    """
-    A MessageDefinition is a representation of a message in the Risotto application messaging context
+    A MessageDefinition is a representation of a message in the Zephir application messaging context
    """
    __slots__ = ('version',
                 'uri',
@ -135,7 +135,7 @@ class ParameterDefinition:

 class ResponseDefinition:
    """
-    An ResponseDefinition is a representation of a response in the Risotto application messaging context
+    An ResponseDefinition is a representation of a response in the Zephir application messaging context
    """
    __slots__ = ('description',
                 'type',
@ -184,7 +184,7 @@ class ResponseDefinition:

 class ErrorDefinition:
    """
-    An ErrorDefinition is a representation of an error in the Risotto application messaging context
+    An ErrorDefinition is a representation of an error in the Zephir application messaging context
    """
    __slots__ = ('uri',)

--- a/src/risotto/register.py
+++ b/src/risotto/register.py
@ -9,6 +9,7 @@ from .error import RegistrationError
 from .message import get_messages
 from .context import Context
 from .config import INTERNAL_USER, get_config
+from .logger import log


 def register(uris: str,
@ -59,7 +60,7 @@ class RegisterDispatcher:
        """
        async def get_message_args():
            # load config
-            config = await Config(self.option)
+            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)
@ -101,7 +102,7 @@ class RegisterDispatcher:
        """
        async def get_message_args():
            # load config
-            config = await Config(self.option)
+            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)
@ -234,6 +235,10 @@ class RegisterDispatcher:
                    risotto_context.paths.append(f'{module_name}.on_join')
                    risotto_context.type = None
                    risotto_context.connection = connection
+                    info_msg = _(f'in module {module_name}.on_join')
+                    await log.info_msg(risotto_context,
+                                       None,
+                                       info_msg)
                    await module.on_join(risotto_context)

    async def insert_message(self,
@ -247,16 +252,8 @@ class RegisterDispatcher:

    async def load(self):
        # valid function's arguments
-        db_conf = get_config().get('database')
-
-        engine = db_conf.get('engine')
-        host = db_conf.get('host')
-        dbname = db_conf.get('dbname')
-        dbuser = db_conf.get('user')
-        dbpassword = db_conf.get('password')
-        dbport = db_conf.get('port')
-        cfg = "{}://{}:{}@{}:{}/{}".format(engine, dbuser, dbpassword, host, dbport, dbname)
-        self.pool = await asyncpg.create_pool(cfg)
+        db_conf = get_config()['database']['dsn']
+        self.pool = await asyncpg.create_pool(db_conf)
        async with self.pool.acquire() as connection:
            async with connection.transaction():
                for version, messages in self.messages.items():
--- a/src/risotto/services/applicationservice/applicationservice.py
+++ b/src/risotto/services/applicationservice/applicationservice.py
@ -2,7 +2,7 @@ from os import listdir
 from os.path import join
 from traceback import print_exc
 from yaml import load, SafeLoader
-from typing import Dict, List
+from typing import Dict, List, Set

 from ...controller import Controller
 from ...register import register
@ -15,6 +15,22 @@ class Risotto(Controller):
    def __init__(self,
                 test: bool) -> None:
        self.source_root_path = get_config().get('source').get('root_path')
+        self.internal_source_name = get_config()['servermodel']['internal_source']
+        self.internal_distribution_name = get_config()['servermodel']['internal_distribution']
+        self.internal_release_name = get_config()['servermodel']['internal_release_name']
+
+    async def on_join(self,
+                      risotto_context: Context) -> None:
+        internal_source = await self.call('v1.source.create',
+                                          risotto_context,
+                                          source_name=self.internal_source_name,
+                                          source_url='none')
+        internal_release = await self.call('v1.source.release.create',
+                                           risotto_context,
+                                           source_name=self.internal_source_name,
+                                           release_name=self.internal_release_name,
+                                           release_distribution=self.internal_distribution_name)
+        self.internal_release_id = internal_release['release_id']

    async def _applicationservice_create(self,
                                         risotto_context: Context,
@ -22,43 +38,126 @@ class Risotto(Controller):
                                         applicationservice_description: str,
                                         applicationservice_dependencies: List[int],
                                         release_id: int) -> Dict:
-        applicationservice_update_query = """INSERT INTO ApplicationService(ApplicationServiceName, ApplicationServiceDescription, ApplicationServiceDependencies, ApplicationServiceReleaseId) VALUES ($1,$2,$3,$4)
-        RETURNING ApplicationServiceId
-        """
+        applicationservice_update_query = '''INSERT INTO Applicationservice(ApplicationserviceName, ApplicationserviceDescription, ApplicationserviceReleaseId)
+        VALUES ($1,$2,$3)
+        RETURNING ApplicationserviceId
+        '''
        applicationservice_id = await risotto_context.connection.fetchval(applicationservice_update_query,
                                                                          applicationservice_name,
                                                                          applicationservice_description,
-                                                                          applicationservice_dependencies,
                                                                          release_id)
+        await self.insert_dependency(risotto_context,
+                                     applicationservice_id,
+                                     applicationservice_dependencies)
        return {'applicationservice_name': applicationservice_name,
                'applicationservice_description': applicationservice_description,
                'applicationservice_release_id': release_id,
                'applicationservice_id': applicationservice_id}

+    async def insert_dependency(self,
+                                risotto_context: Context,
+                                applicationservice_id: int,
+                                dependencies: list) -> None:
+        sql = '''INSERT INTO ApplicationserviceDependency(ApplicationserviceId, ApplicationserviceDependencyId)
+        VALUES ($1, $2)'''
+        for dependency in dependencies:
+            await risotto_context.connection.execute(sql,
+                                                     applicationservice_id,
+                                                     dependency)
+
+    @register('v1.applicationservice.dependency.add')
+    async def applicationservice_dependency_add(self,
+                                                risotto_context: Context,
+                                                applicationservice_name: str,
+                                                applicationservice_dependency: str,
+                                                source_name: str,
+                                                release_distribution: str) -> Dict:
+        release = await self.call('v1.source.release.describe',
+                                  risotto_context,
+                                  source_name=source_name,
+                                  release_distribution=release_distribution)
+        as_descr = await self._applicationservice_describe(risotto_context,
+                                                           applicationservice_name,
+                                                           self.internal_release_id)
+        dependency_descr = await self._applicationservice_describe(risotto_context,
+                                                                   applicationservice_dependency,
+                                                                   release['release_id'])
+        sql = '''SELECT ApplicationserviceDependencyId
+        FROM ApplicationserviceDependency
+        WHERE ApplicationserviceId = $1 AND ApplicationserviceDependencyId = $2'''
+        if await risotto_context.connection.fetchrow(sql,
+                                                     as_descr['applicationservice_id'],
+                                                     dependency_descr['applicationservice_id']):
+            raise Exception(_(f'{applicationservice_name} has already a dependency to {applicationservice_dependency}'))
+        else:
+            await self.insert_dependency(risotto_context,
+                                         as_descr['applicationservice_id'],
+                                         [dependency_descr['applicationservice_id']])
+        await self.publish('v1.applicationservice.updated',
+                           risotto_context,
+                           **as_descr)
+        await self.updated_related_applicationservice(risotto_context,
+                                                      as_descr['applicationservice_id'])
+        return as_descr
+
+    async def updated_related_applicationservice(self,
+                                                 risotto_context: Context,
+                                                 applicationservice_id: int) -> None:
+        sql = """
+        SELECT ApplicationserviceId as applicationservice_id
+        FROM ApplicationserviceDependency
+        WHERE ApplicationserviceDependencyId = $1"""
+        for dependency in await risotto_context.connection.fetch(sql,
+                                                                 applicationservice_id):
+            dependency_id = dependency['applicationservice_id']
+            applicationservice = await self._applicationservice_get_by_id(risotto_context,
+                                                                          dependency_id)
+            await self.publish('v1.applicationservice.updated',
+                               risotto_context,
+                               **applicationservice)
+            await self.updated_related_applicationservice(risotto_context,
+                                                          dependency_id)
+
+    async def get_dependencies(self,
+                               risotto_context: Context,
+                               applicationservice_id: int) -> List[int]:
+        dependencies = set()
+        sql = """
+        SELECT ApplicationserviceDependencyId as applicationservice_dependency_id
+        FROM ApplicationserviceDependency
+        WHERE ApplicationserviceId = $1"""
+        for dependency in await risotto_context.connection.fetch(sql,
+                                                                 applicationservice_id):
+            dependencies.add(dependency['applicationservice_dependency_id'])
+        for dependency in dependencies.copy():
+            dependencies |= await self.get_dependencies(risotto_context,
+                                                        dependency)
+        return dependencies
+
    @register('v1.applicationservice.create')
    async def applicationservice_create(self,
                                        risotto_context: Context,
                                        applicationservice_name: str,
                                        applicationservice_description: str,
-                                        applicationservice_dependencies: List[int],
-                                        release_id: int) -> Dict:
-        return await self._applicationservice_create(risotto_context,
+                                        applicationservice_dependencies: List[int]) -> Dict:
+        applicationservice = await self._applicationservice_create(risotto_context,
                                                                   applicationservice_name,
                                                                   applicationservice_description,
                                                                   applicationservice_dependencies,
-                                                     release_id)
+                                                                   self.internal_release_id)
+        dependencies = list(await self.get_dependencies(risotto_context,
+                                                        applicationservice['applicationservice_id']))
+        applicationservice['applicationservice_dependencies'] = dependencies
+        return applicationservice

    @register('v1.applicationservice.dataset.updated')
    async def applicationservice_update(self,
                                        risotto_context: Context,
                                        source_name: str,
                                        release_distribution: str) -> Dict:
-        source = await self.call('v1.source.describe',
+        release = await self.call('v1.source.release.describe',
                                  risotto_context,
-                                 source_name=source_name)
-        release = await self.call('v1.source.release.get_by_distribution',
-                                  risotto_context,
-                                  source_id=source['source_id'],
+                                  source_name=source_name,
                                  release_distribution=release_distribution)
        applicationservice_path = join(self.source_root_path,
                                       source_name,
@ -81,7 +180,7 @@ class Risotto(Controller):
                await self._applicationservice_create(risotto_context,
                                                      applicationservice_description['name'],
                                                      applicationservice_description['description'],
-                                                      [], # FIXME dependencies
+                                                      [],
                                                      release_id)
            except Exception as err:
                if get_config().get('global').get('debug'):
@ -94,28 +193,56 @@ class Risotto(Controller):
    async def applicationservice_get_by_id(self,
                                           risotto_context: Context,
                                           applicationservice_id: int) -> Dict:
+        return await self._applicationservice_get_by_id(risotto_context,
+                                                        applicationservice_id)
+
+    async def _applicationservice_get_by_id(self,
+                                            risotto_context: Context,
+                                            applicationservice_id: int) -> Dict:
        applicationservice_query = """
-        SELECT ApplicationServiceId as applicationservice_id, ApplicationServiceName as applicationservice_name, ApplicationServiceDependencies as applicationservice_dependencies, ApplicationServiceReleaseId as applicationservice_release_id
+        SELECT ApplicationserviceId as applicationservice_id, ApplicationserviceName as applicationservice_name, ApplicationserviceReleaseId as applicationservice_release_id
        FROM applicationservice
-        WHERE applicationserviceid=$1"""
+        WHERE ApplicationserviceId=$1"""
        applicationservice = await risotto_context.connection.fetchrow(applicationservice_query,
                                                                       applicationservice_id)
        if applicationservice is None:
            raise Exception(_(f'unknown service with ID {applicationservice_id}'))
-        return dict(applicationservice)
+        dependencies = list(await self.get_dependencies(risotto_context,
+                                                        applicationservice['applicationservice_id']))
+        applicationservice = dict(applicationservice)
+        applicationservice['applicationservice_dependencies'] = dependencies
+        return applicationservice

-    @register('v1.applicationservice.describe')
-    async def applicationservice_describe(self,
+    async def _applicationservice_describe(self,
                                           risotto_context: Context,
                                           applicationservice_name,
                                           release_id):
        applicationservice_query = """
-        SELECT ApplicationServiceId as applicationservice_id, ApplicationServiceName as applicationservice_name, ApplicationServiceDependencies as applicationservice_dependencies, ApplicationServiceReleaseId as applicationservice_release_id
-        FROM ApplicationService
-        WHERE ApplicationServiceName=$1 AND ApplicationServiceReleaseId=$2"""
+        SELECT ApplicationserviceId as applicationservice_id, ApplicationserviceName as applicationservice_name, ApplicationserviceReleaseId as applicationservice_release_id
+        FROM Applicationservice
+        WHERE ApplicationserviceName=$1 AND ApplicationserviceReleaseId=$2"""
        applicationservice = await risotto_context.connection.fetchrow(applicationservice_query,
                                                                       applicationservice_name,
                                                                       release_id)
        if applicationservice is None:
            raise Exception(_(f'unknown service {applicationservice_name} in release ID {release_id}'))
        return dict(applicationservice)
+
+
+    @register('v1.applicationservice.describe')
+    async def applicationservice_describe(self,
+                                          risotto_context: Context,
+                                          applicationservice_name,
+                                          source_name,
+                                          release_distribution):
+        release = await self.call('v1.source.release.describe',
+                                  risotto_context,
+                                  source_name=source_name,
+                                  release_distribution=release_distribution)
+        applicationservice = await self._applicationservice_describe(risotto_context,
+                                                                     applicationservice_name,
+                                                                     release['release_id'])
+        dependencies = list(await self.get_dependencies(risotto_context,
+                                                        applicationservice['applicationservice_id']))
+        applicationservice['applicationservice_dependencies'] = dependencies
+        return applicationservice
--- a/src/risotto/services/config/config.py
+++ b/src/risotto/services/config/config.py
@ -7,10 +7,11 @@ from typing import Dict, List

 from tiramisu import Storage, delete_session, MetaConfig, MixConfig
 from rougail import load as rougail_load
+from rougail.config import dtdfilename

 from ...controller import Controller
 from ...register import register
-from ...config import DATABASE_DIR, ROUGAIL_DTD_PATH, get_config
+from ...config import get_config
 from ...context import Context
 from ...utils import _
 from ...error import CallError, RegistrationError
@ -23,11 +24,12 @@ class Risotto(Controller):
                 test) -> None:
        global conf_storage
        self.cache_root_path = join(get_config().get('cache').get('root_path'), 'servermodel')
-        for dirname in [self.cache_root_path, DATABASE_DIR]:
-            if not isdir(dirname):
-                raise RegistrationError(_(f'unable to find the cache dir "{dirname}"'))
+        if not isdir(self.cache_root_path):
+            raise RegistrationError(_(f'unable to find the cache dir "{self.cache_root_path}"'))
        if not test:
-            self.save_storage = Storage(engine='sqlite3', dir_database=DATABASE_DIR)
+            db_conf = get_config()['database']['tiramisu_dsn']
+            self.save_storage = Storage(engine='postgres')
+            self.save_storage.setting(dsn=db_conf)
        self.servermodel = {}
        self.server = {}
        super().__init__(test)
@ -109,18 +111,16 @@ class Risotto(Controller):
        # build tiramisu's session ID
        session_id = f'v_{servermodel_id}'
        optiondescription = rougail_load(xmlroot,
-                                         ROUGAIL_DTD_PATH,
+                                         dtdfilename,
                                         funcs_file)

        # build servermodel metaconfig (v_xxx.m_v_xxx)
        metaconfig = await MetaConfig([],
                                      optiondescription=optiondescription,
-                                      persistent=True,
                                      session_id=session_id,
                                      storage=self.save_storage)
        mixconfig = await MixConfig(children=[],
                                    optiondescription=optiondescription,
-                                    persistent=True,
                                    session_id='m_' + session_id,
                                    storage=self.save_storage)
        await metaconfig.config.add(mixconfig)
@ -248,8 +248,7 @@ class Risotto(Controller):
        """ build server's config
        """
        config = await metaconfig.config.new(session_id,
-                                             storage=self.save_storage,
-                                             persistent=True)
+                                             storage=self.save_storage)
        await config.information.set('server_id', server_id)
        await config.information.set('server_name', server_name)
        await config.owner.set(server_name)
--- a/src/risotto/services/server/server.py
+++ b/src/risotto/services/server/server.py
@ -3,10 +3,15 @@ from typing import Dict
 from ...controller import Controller
 from ...register import register
 from ...context import Context
+from ...config import get_config
 from ...utils import _


 class Risotto(Controller):
+    def __init__(self,
+                 test: bool) -> None:
+        self.internal_source_name = get_config()['servermodel']['internal_source']
+
    @register('v1.server.list')
    async def server_list(self,
                          risotto_context: Context) -> Dict:
@ -23,12 +28,11 @@ class Risotto(Controller):
                            server_name: str,
                            server_description: str,
                            servermodel_name: str,
-                            source_name: str,
                            release_distribution: str) -> Dict:
        servermodel = await self.call('v1.servermodel.describe',
                                      risotto_context,
                                      servermodel_name=servermodel_name,
-                                      source_name=source_name,
+                                      source_name=self.internal_source_name,
                                      release_distribution=release_distribution)
        server_insert = """INSERT INTO Server(ServerName, ServerDescription, ServerServermodelId)
        VALUES ($1,$2,$3)
--- a/src/risotto/services/servermodel/generator.py
+++ b/src/risotto/services/servermodel/generator.py
@ -0,0 +1,172 @@
+from os.path import join, isdir, isfile
+from os import listdir, makedirs
+from shutil import rmtree, copyfile
+from typing import Dict, List, Optional
+from rougail import CreoleObjSpace
+from rougail.config import dtdfilename
+from ...controller import Controller
+from ...context import Context
+from ...logger import log
+from ...utils import _
+
+
+class Generator(Controller):
+    async def generate(self,
+                       risotto_context: Context,
+                       servermodel_name: str,
+                       servermodel_id: int,
+                       dependencies: List[int],
+                       generate_cache: Optional[Dict]=None) -> None:
+        if generate_cache is None:
+            generate_cache = {'applicationservice': {},
+                              'release_id': {}}
+        await self.servermodel_gen_funcs(servermodel_name,
+                                         servermodel_id,
+                                         dependencies,
+                                         generate_cache,
+                                         risotto_context)
+        await self.servermodel_gen_schema(servermodel_name,
+                                          servermodel_id,
+                                          dependencies,
+                                          generate_cache,
+                                          risotto_context)
+        await self.servermodel_copy_templates(servermodel_name,
+                                              servermodel_id,
+                                              dependencies,
+                                              generate_cache,
+                                              risotto_context)
+
+    async def servermodel_gen_funcs(self,
+                                    servermodel_name: str,
+                                    servermodel_id: int,
+                                    dependencies: Dict,
+                                    generate_cache: Dict,
+                                    risotto_context: Context) -> None:
+        as_names = []
+        dest_file = self.get_servermodel_cache(servermodel_id, 'funcs.py')
+        with open(dest_file, 'wb') as funcs:
+            funcs.write(b'from tiramisu import valid_network_netmask, valid_ip_netmask, valid_broadcast, valid_in_network, valid_not_equal as valid_differ, valid_not_equal, calc_value\n\n')
+            for dependency in dependencies:
+                if dependency not in generate_cache['applicationservice']:
+                    applicationservice = await self.call('v1.applicationservice.get_by_id',
+                                                         risotto_context,
+                                                         applicationservice_id=dependency)
+                    generate_cache['applicationservice'][dependency] = (applicationservice['applicationservice_name'],
+                                                                        applicationservice['applicationservice_release_id'])
+                applicationservice_name, release_id = generate_cache['applicationservice'][dependency]
+                if release_id not in generate_cache['release_id']:
+                    release = await self.call('v1.source.release.get_by_id',
+                                              risotto_context,
+                                              release_id=release_id)
+                    generate_cache['release_id'][release_id] = (release['source_name'],
+                                                                release['release_name'])
+                source_name, release_name = generate_cache['release_id'][release_id]
+                path = join(self.source_root_path,
+                            source_name,
+                            release_name,
+                            'applicationservice',
+                            applicationservice_name,
+                            'funcs')
+                if isdir(path):
+                    as_names.append(applicationservice_name)
+                    for fil in listdir(path):
+                        if not fil.endswith('.py'):
+                            continue
+                        fil_path = join(path, fil)
+                        with open(fil_path, 'rb') as fh:
+                            funcs.write(f'# {fil_path}\n'.encode())
+                            funcs.write(fh.read())
+                            funcs.write(b'\n')
+
+        as_names_str = '", "'.join(as_names)
+        await log.info(risotto_context,
+                       _(f'gen funcs for "{servermodel_name}" with application services "{as_names_str}"'))
+
+    async def servermodel_gen_schema(self,
+                                     servermodel_name: str,
+                                     servermodel_id: int,
+                                     dependencies: Dict,
+                                     generate_cache: Dict,
+                                     risotto_context: Context) -> None:
+        paths = []
+        extras = []
+        as_names = set()
+        for dependency in dependencies:
+            applicationservice_name, release_id = generate_cache['applicationservice'][dependency]
+            source_name, release_name = generate_cache['release_id'][release_id]
+            # load creole dictionaries
+            path = join(self.source_root_path,
+                        source_name,
+                        release_name,
+                        'applicationservice',
+                        applicationservice_name,
+                        'dictionaries')
+            if isdir(path):
+                as_names.add(applicationservice_name)
+                paths.append(path)
+
+            # load extra dictionaries
+            path = join(self.source_root_path,
+                        source_name,
+                        release_name,
+                        'applicationservice',
+                        applicationservice_name,
+                        'extras')
+            if isdir(path):
+                for namespace in listdir(path):
+                    extra_dir = join(path, namespace)
+                    if not isdir(extra_dir):
+                        continue
+                    as_names.add(applicationservice_name)
+                    extras.append((namespace, [extra_dir]))
+        eolobj = CreoleObjSpace(dtdfilename)
+        as_names_str = '", "'.join(as_names)
+        await log.info(risotto_context,
+                       _(f'gen schema for "{servermodel_name}" with application services "{as_names_str}"'))
+        eolobj.create_or_populate_from_xml('creole', paths)
+        for extra in extras:
+            eolobj.create_or_populate_from_xml(extra[0], extra[1])
+        # FIXME extra
+        funcs_file = self.get_servermodel_cache(servermodel_id, 'funcs.py')
+        eolobj.space_visitor(funcs_file)
+        dest_dir = self.get_servermodel_cache(servermodel_id, 'dictionaries.xml')
+        eolobj.save(dest_dir)
+
+    def get_servermodel_cache(self,
+                              servermodel_id: int,
+                              subdir: Optional[str]=None) -> str:
+        if subdir:
+            return join(self.cache_root_path, str(servermodel_id), subdir)
+        return join(self.cache_root_path, str(servermodel_id))
+
+    async def servermodel_copy_templates(self,
+                                         servermodel_name: str,
+                                         servermodel_id: int,
+                                         dependencies: Dict,
+                                         generate_cache: Dict,
+                                         risotto_context: Context) -> None:
+        as_names = []
+        dest_dir = self.get_servermodel_cache(servermodel_id, 'templates')
+        if isdir(dest_dir):
+            rmtree(dest_dir)
+        makedirs(dest_dir)
+        for dependency in dependencies:
+            applicationservice_name, release_id = generate_cache['applicationservice'][dependency]
+            source_name, release_name = generate_cache['release_id'][release_id]
+            path = join(self.source_root_path,
+                        source_name,
+                        release_name,
+                        'applicationservice',
+                        applicationservice_name,
+                        'templates')
+            if isdir(path):
+                for template in listdir(path):
+                    template_path = join(dest_dir, template)
+                    if isfile(template_path):
+                        as_names_str = '", "'.join(as_names)
+                        raise Exception(_(f'duplicate "{template}" when copying template from "{applicationservice_name}" to "{dest_dir}" for servermodel "{servermodel_name}" (previous application services was "{as_names_str}"'))
+                    copyfile(join(path, template), template_path)
+                as_names.append(applicationservice_name)
+        as_names_str = '", "'.join(as_names)
+        await log.info(risotto_context,
+                       _(f'copy templates for "{servermodel_name}" with application services "{as_names_str}"'))
--- a/src/risotto/services/servermodel/servermodel.py
+++ b/src/risotto/services/servermodel/servermodel.py
@ -1,12 +1,10 @@
-from shutil import rmtree, copyfile
+from shutil import rmtree
 from os import listdir, makedirs
-from os.path import join, isdir, isfile
+from os.path import join, isdir
 from yaml import load, SafeLoader
 from traceback import print_exc
 from typing import Dict, List, Optional
-from rougail import CreoleObjSpace
-from rougail.config import dtdfilename
-from ...controller import Controller
+from .generator import Generator
 from ...register import register
 from ...utils import _
 from ...context import Context
@ -15,168 +13,59 @@ from ...error import ExecutionError
 from ...logger import log


-class Risotto(Controller):
+class Risotto(Generator):
    def __init__(self,
                 test: bool) -> None:
-        self.source_root_path = get_config().get('source').get('root_path')
-        self.cache_root_path = join(get_config().get('cache').get('root_path'), 'servermodel')
+        self.source_root_path = get_config()['source']['root_path']
+        self.cache_root_path = join(get_config()['cache']['root_path'], 'servermodel')
+        self.internal_source_name = get_config()['servermodel']['internal_source']
+        self.internal_distribution_name = get_config()['servermodel']['internal_distribution']
+        self.internal_release_name = get_config()['servermodel']['internal_release_name']
        if not isdir(self.cache_root_path):
            makedirs(join(self.cache_root_path))

    async def on_join(self,
                      risotto_context: Context) -> None:
-        internal_source = await self.call('v1.source.create',
+        internal_release = await self.call('v1.source.release.describe',
                                           risotto_context,
-                                          source_name='internal',
-                                          source_url='none')
-        internal_release = await self.call('v1.source.release.create',
-                                           risotto_context,
-                                           source_name='internal',
-                                           release_name='none',
-                                           release_distribution='last')
+                                           source_name=self.internal_source_name,
+                                           release_distribution=self.internal_distribution_name)
        self.internal_release_id = internal_release['release_id']

-    async def servermodel_gen_funcs(self,
-                                    servermodel_name: str,
-                                    servermodel_id: int,
-                                    dependencies: Dict,
-                                    release_cache: Dict,
-                                    risotto_context: Context) -> None:
-        as_names = []
-        dest_file = self.get_servermodel_cache(servermodel_id, 'funcs.py')
-        with open(dest_file, 'wb') as funcs:
-            funcs.write(b'from tiramisu import valid_network_netmask, valid_ip_netmask, valid_broadcast, valid_in_network, valid_not_equal as valid_differ, valid_not_equal, calc_value\n\n')
-            for applicationservice_id, applicationservice_infos in dependencies.items():
-                applicationservice_name, as_release_id = applicationservice_infos
-                path = join(self.source_root_path,
-                            release_cache[as_release_id]['source_name'],
-                            release_cache[as_release_id]['release_name'],
-                            'applicationservice',
-                            applicationservice_name,
-                            'funcs')
-                if isdir(path):
-                    as_names.append(applicationservice_name)
-                    for fil in listdir(path):
-                        if not fil.endswith('.py'):
-                            continue
-                        fil_path = join(path, fil)
-                        with open(fil_path, 'rb') as fh:
-                            funcs.write(f'# {fil_path}\n'.encode())
-                            funcs.write(fh.read())
-                            funcs.write(b'\n')
-
-        as_names_str = '", "'.join(as_names)
-        await log.info(risotto_context,
-                       _(f'gen funcs for "{servermodel_name}" with application services "{as_names_str}"'))
-        eolobj = CreoleObjSpace(dtdfilename)
-
-    async def servermodel_gen_schema(self,
-                                     servermodel_name: str,
-                                     servermodel_id: int,
-                                     dependencies: Dict,
-                                     release_cache: Dict,
-                                     risotto_context: Context) -> None:
-        paths = []
-        extras = []
-        as_names = set()
-        for applicationservice_id, applicationservice_infos in dependencies.items():
-            applicationservice_name, as_release_id = applicationservice_infos
-            # load creole dictionaries
-            path = join(self.source_root_path,
-                        release_cache[as_release_id]['source_name'],
-                        release_cache[as_release_id]['release_name'],
-                        'applicationservice',
-                        applicationservice_name,
-                        'dictionaries')
-            if isdir(path):
-                as_names.add(applicationservice_name)
-                paths.append(path)
-
-            # load extra dictionaries
-            path = join(self.source_root_path,
-                        release_cache[as_release_id]['source_name'],
-                        release_cache[as_release_id]['release_name'],
-                        'applicationservice',
-                        applicationservice_name,
-                        'extras')
-            if isdir(path):
-                for namespace in listdir(path):
-                    extra_dir = join(path, namespace)
-                    if not isdir(extra_dir):
-                        continue
-                    as_names.add(applicationservice_name)
-                    extras.append((namespace, [extra_dir]))
-        eolobj = CreoleObjSpace(dtdfilename)
-        as_names_str = '", "'.join(as_names)
-        await log.info(risotto_context,
-                       _(f'gen schema for "{servermodel_name}" with application services "{as_names_str}"'))
-        eolobj.create_or_populate_from_xml('creole', paths)
-        for extra in extras:
-            eolobj.create_or_populate_from_xml(extra[0], extra[1])
-        # FIXME extra
-        funcs_file = self.get_servermodel_cache(servermodel_id, 'funcs.py')
-        eolobj.space_visitor(funcs_file)
-        dest_dir = self.get_servermodel_cache(servermodel_id, 'dictionaries.xml')
-        eolobj.save(dest_dir)
-
-    def get_servermodel_cache(self,
-                              servermodel_id: int,
-                              subdir: Optional[str]=None) -> str:
-        if subdir:
-            return join(self.cache_root_path, str(servermodel_id), subdir)
-        return join(self.cache_root_path, str(servermodel_id))
-
-    async def servermodel_copy_templates(self,
-                                         servermodel_name: str,
-                                         servermodel_id: int,
-                                         dependencies: Dict,
-                                         release_cache: Dict,
-                                         risotto_context: Context) -> None:
-        as_names = []
-        dest_dir = self.get_servermodel_cache(servermodel_id, 'templates')
-        makedirs(dest_dir)
-        for applicationservice_id, applicationservice_infos in dependencies.items():
-            applicationservice_name, as_release_id = applicationservice_infos
-            path = join(self.source_root_path,
-                        release_cache[as_release_id]['source_name'],
-                        release_cache[as_release_id]['release_name'],
-                        'applicationservice',
-                        applicationservice_name,
-                        'templates')
-            if isdir(path):
-                for template in listdir(path):
-                    template_path = join(dest_dir, template)
-                    if isfile(template_path):
-                        as_names_str = '", "'.join(as_names)
-                        raise Exception(_(f'duplicate "{template}" when copying template from "{applicationservice_name}" to "{dest_dir}" for servermodel "{servermodel_name}" (previous application services was "{as_names_str}"'))
-                    copyfile(join(path, template), template_path)
-                as_names.append(applicationservice_name)
-        as_names_str = '", "'.join(as_names)
-        await log.info(risotto_context,
-                       _(f'copy templates for "{servermodel_name}" with application services "{as_names_str}"'))
-
    async def _servermodel_create(self,
                                  risotto_context: Context,
                                  servermodel_name: str,
                                  servermodel_description: str,
-                                  servermodel_parents_id: List[int],
+                                  servermodel_parents: List[Dict],
                                  dependencies: List[int],
                                  release_id: int,
-                                  release_cache: Dict=None) -> Dict:
-        servermodel_update = """INSERT INTO Servermodel(ServermodelName, ServermodelDescription, ServermodelParentsId, ServermodelReleaseId, ServermodelApplicationServiceId)
+                                  generate_cache: Dict=None) -> Dict:
+        if generate_cache is None:
+            generate_cache = {'applicationservice': {},
+                              'release_id': {}}
+        servermodel_insert = """INSERT INTO Servermodel(ServermodelName, ServermodelDescription, ServermodelParentsId, ServermodelReleaseId, ServermodelApplicationServiceId)
        VALUES ($1,$2,$3,$4,$5)
        RETURNING ServermodelId
        """
        as_name = f"local_{servermodel_name}"
        as_description = f'local application service for {servermodel_name}'
+        servermodel_parents_id = []
+        for servermodel_parent in servermodel_parents:
+            servermodel_parents_id.append(servermodel_parent['servermodel_id'])
+            dependencies.append(servermodel_parent['servermodel_applicationservice_id'])
        applicationservice = await self.call('v1.applicationservice.create',
                                             risotto_context,
                                             applicationservice_name=as_name,
                                             applicationservice_description=as_description,
-                                             applicationservice_dependencies=dependencies,
-                                             release_id=self.internal_release_id)
+                                             applicationservice_dependencies=dependencies)
        applicationservice_id = applicationservice['applicationservice_id']
-        servermodel_id = await risotto_context.connection.fetchval(servermodel_update,
+        generate_cache['applicationservice'][applicationservice_id] = (as_name,
+                                                                       self.internal_release_id)
+        if self.internal_release_id not in generate_cache['release_id']:
+            generate_cache['release_id'][self.internal_release_id] = (self.internal_source_name,
+                                                                      self.internal_release_name)
+
+        servermodel_id = await risotto_context.connection.fetchval(servermodel_insert,
                                                                   servermodel_name,
                                                                   servermodel_description,
                                                                   servermodel_parents_id,
@ -186,42 +75,24 @@ class Risotto(Controller):
        if isdir(dest_dir):
            rmtree(dest_dir)
        makedirs(dest_dir)
-        # get all dependencies for this application service
-        dependencies = await self.get_applicationservices(risotto_context,
-                                                          applicationservice_id)
-        # build cache to have all release informations
-        if release_cache is None:
-            release_cache = {}
-        for applicationservice_id, applicationservice_infos in dependencies.items():
-            applicationservice_name, as_release_id = applicationservice_infos
-            if as_release_id not in release_cache:
-                release_cache[as_release_id] = await self.call('v1.source.release.get_by_id',
-                                                               risotto_context,
-                                                               release_id=as_release_id)
-
-        await self.servermodel_gen_funcs(servermodel_name,
+        dependencies = applicationservice['applicationservice_dependencies']
+        # for as_release_id in dependencies.values():
+        #     applicationservice_name, as_release_id = applicationservice_infos
+        #     if as_release_id not in release_cache:
+        #         release_cache[as_release_id] = await self.call('v1.source.release.get_by_id',
+        #                                                        risotto_context,
+        #                                                        release_id=as_release_id)
+        await self.generate(risotto_context,
+                            servermodel_name,
                            servermodel_id,
                            dependencies,
-                                         release_cache,
-                                         risotto_context)
-        await self.servermodel_gen_schema(servermodel_name,
-                                          servermodel_id,
-                                          dependencies,
-                                          release_cache,
-                                          risotto_context)
-        await self.servermodel_copy_templates(servermodel_name,
-                                              servermodel_id,
-                                              dependencies,
-                                              release_cache,
-                                              risotto_context)
+                            generate_cache)
        sm_dict = {'servermodel_name': servermodel_name,
                   'servermodel_description': servermodel_description,
                   'servermodel_parents_id': servermodel_parents_id,
+                   'servermodel_applicationservice_id': applicationservice_id,
                   'release_id': release_id,
                   'servermodel_id': servermodel_id}
-        await self.publish('v1.servermodel.created',
-                           risotto_context,
-                           **sm_dict)
        return sm_dict

    def parse_parents(self,
@ -236,28 +107,48 @@ class Risotto(Controller):
            self.parse_parents(servermodels, servermodels[parent], parents)
        return parents

-    async def get_servermodel_id_by_name(self,
+    @register('v1.applicationservice.updated')
+    async def applicationservice_updated(self,
                                         risotto_context: Context,
-                                         servermodel_name: str,
-                                         release_id: int):
-        sql = 'SELECT ServermodelId as servermodel_id FROM Servermodel WHERE ServermodelName = $1 AND ServermodelReleaseId = $2',
-        return await risotto_context.connection.fetchval(sql,
+                                         applicationservice_id):
+        # FIXME applicationservices qui depend de ce services => updated
+        sql = '''
+        SELECT ServermodelId as servermodel_id, ServermodelName as servermodel_name, ServermodelDescription as servermodel_description, ServermodelParentsId as servermodel_parents_id, ServermodelReleaseId as release_id, ServermodelApplicationServiceId as servermodel_applicationservice_id
+        FROM Servermodel
+        WHERE ServermodelApplicationServiceId = $1
+        '''
+        servermodel = await risotto_context.connection.fetchrow(sql,
+                                                                applicationservice_id)
+        if servermodel is not None:
+            servermodel_name = servermodel['servermodel_name']
+            servermodel_id = servermodel['servermodel_id']
+            release_id = servermodel['release_id']
+            applicationservice = await self.call('v1.applicationservice.get_by_id',
+                                                 risotto_context,
+                                                 applicationservice_id=applicationservice_id)
+            dependencies = applicationservice['applicationservice_dependencies']
+            await self.generate(risotto_context,
                                servermodel_name,
-                                                         release_id)['servermodel_id']
+                                servermodel_id,
+                                dependencies,
+                                None)
+            await self.publish('v1.servermodel.updated',
+                               risotto_context,
+                               **servermodel)

    @register('v1.servermodel.dataset.updated')
-    async def servermodel_update(self,
+    async def servermodel_dataset_updated(self,
                                          risotto_context: Context,
                                          source_name: str,
                                          release_distribution: int):
-        source = await self.call('v1.source.describe',
+        release = await self.call('v1.source.release.describe',
                                  risotto_context,
-                                 source_name=source_name)
-        release = await self.call('v1.source.release.get_by_distribution',
-                                  risotto_context,
-                                  source_id=source['source_id'],
+                                  source_name=source_name,
                                  release_distribution=release_distribution)
        release_id = release['release_id']
+        generate_cache = {'applicationservice': {},
+                          'release_id': {release['release_id']: (release['source_name'],
+                                                                 release['release_name'])}}
        servermodel_path = join(self.source_root_path,
                                source_name,
                                release['release_name'],
@ -278,21 +169,19 @@ class Risotto(Controller):
            servermodels[servermodel_description['name']] = servermodel_description
            servermodels[servermodel_description['name']]['done'] = False

-        release_cache = {release['release_id']: release}
        for servermodel in servermodels.values():
            if not servermodel['done']:
                # parent needs to create before child, so retrieve all parents
                parents = self.parse_parents(servermodels,
                                             servermodel)
                parents.reverse()
-                servermodelparent_id = []
+                servermodel_parent = []
                for new_servermodel in parents:
                    if not servermodels[new_servermodel]['done']:
                        servermodel_description = servermodels[new_servermodel]
                        parent = servermodel_description['parent']
-                        if not servermodelparent_id and parent is not None:
-                            # parent is a str, so get ID
-                            servermodelparent_id = [await self.get_servermodel_id_by_name(risotto_context,
+                        if not servermodel_parent and parent is not None:
+                            servermodel_parent = [await self._servermodel_describe(risotto_context,
                                                                                   parent,
                                                                                   release_id)]
                        # link application service with this servermodel
@ -301,7 +190,8 @@ class Risotto(Controller):
                            applicationservice = await self.call('v1.applicationservice.describe',
                                                                 risotto_context,
                                                                 applicationservice_name=depend,
-                                                                 release_id=release_id)
+                                                                 source_name=source_name,
+                                                                 release_distribution=release_distribution)
                            dependencies.append(applicationservice['applicationservice_id'])
                        sm_name = servermodel_description['name']
                        sm_description = servermodel_description['description']
@ -309,16 +199,18 @@ class Risotto(Controller):
                            servermodel_ob = await self._servermodel_create(risotto_context,
                                                                            sm_name,
                                                                            sm_description,
-                                                                            servermodelparent_id,
+                                                                            servermodel_parent,
                                                                            dependencies,
                                                                            release_id,
-                                                                            release_cache)
-                            servermodel_id = servermodel_ob['servermodel_id']
+                                                                            generate_cache)
+                            await self.publish('v1.servermodel.created',
+                                               risotto_context,
+                                               **servermodel_ob)
                        except Exception as err:
                            if get_config().get('global').get('debug'):
                                print_exc()
                            raise ExecutionError(_(f"Error while injecting servermodel {sm_name} in database: {err}"))
-                        servermodelparent_id = [servermodel_id]
+                        servermodel_parent = [servermodel_ob]
                        servermodel_description['done'] = True
        return {'retcode': 0, 'returns': _('Servermodels successfully loaded')}

@ -327,7 +219,7 @@ class Risotto(Controller):
                               risotto_context: Context,
                               source_id: int):
        sql = '''
-        SELECT ServermodelId as servermodel_id, ServermodelName as servermodel_name, ServermodelDescription as servermodel_description, ServermodelParentsId as servermodel_parents_id, ServermodelReleaseId as release_id
+        SELECT ServermodelId as servermodel_id, ServermodelName as servermodel_name, ServermodelDescription as servermodel_description, ServermodelParentsId as servermodel_parents_id, ServermodelReleaseId as release_id, ServermodelApplicationServiceId as servermodel_applicationservice_id
        FROM Servermodel
        '''
        servermodels = await risotto_context.connection.fetch(sql)
@ -343,82 +235,48 @@ class Risotto(Controller):
                                  risotto_context,
                                  source_name=source_name,
                                  release_distribution=release_distribution)
+        return await self._servermodel_describe(risotto_context,
+                                                servermodel_name,
+                                                release['release_id'])
+
+    async def _servermodel_describe(self,
+                                    risotto_context,
+                                    servermodel_name,
+                                    release_id):
        sql = '''
-        SELECT ServermodelId as servermodel_id, ServermodelName as servermodel_name, ServermodelDescription as servermodel_description, ServermodelParentsId as servermodel_parents_id, ServermodelReleaseId as release_id
+        SELECT ServermodelId as servermodel_id, ServermodelName as servermodel_name, ServermodelDescription as servermodel_description, ServermodelParentsId as servermodel_parents_id, ServermodelReleaseId as release_id, ServermodelApplicationServiceId as servermodel_applicationservice_id
        FROM Servermodel
        WHERE ServermodelName=$1 AND ServermodelReleaseId=$2
        '''
        servermodel = await risotto_context.connection.fetchrow(sql,
                                                                servermodel_name,
-                                                                release['release_id'])
+                                                                release_id)
        if not servermodel:
-            raise Exception(_(f'{servermodel_id} is not a valid ID for a servermodel'))
+            raise Exception(_(f'"{servermodel_name}" is not a valid name for a servermodel in source "{source_name}" and release "{release_distribution}"'))
        return dict(servermodel)

-    @register('v1.servermodel.get_by_id')
-    async def servermodel_get_by_id(self,
+    @register('v1.servermodel.create', notification='v1.servermodel.created')
+    async def create_servermodel(self,
                                 risotto_context: Context,
-                                    servermodel_id: int) -> Dict:
-        sql = '''
-        SELECT ServermodelId as servermodel_id, ServermodelName as servermodel_name, ServermodelDescription as servermodel_description, ServermodelParentsId as servermodel_parents_id, ServermodelReleaseId as release_id
-        FROM Servermodel
-        WHERE ServermodelId=$1
-        '''
-        servermodel = await risotto_context.connection.fetchrow(sql,
-                                                                servermodel_id)
-        if not servermodel:
-            raise Exception(_(f'{servermodel_id} is not a valid ID for a servermodel'))
-        return dict(servermodel)
-
-    async def _parse_depends(self,
-                             risotto_context: Context,
-                             applicationservice_id: int,
-                             or_depends: list,
-                             ids: list) -> None:
-        applicationservice = await self.call('v1.applicationservice.get_by_id',
+                                 servermodel_name: str,
+                                 servermodel_description: str,
+                                 servermodel_parents_name: List[int],
+                                 servermodel_parents_source_name: str,
+                                 servermodel_parents_release_distribution: str) -> Dict:
+        release = await self.call('v1.source.release.describe',
                                  risotto_context,
-                                             applicationservice_id=applicationservice_id)
-        ids[applicationservice_id] = (applicationservice['applicationservice_name'],
-                                      applicationservice['applicationservice_release_id'])
-        for depend in applicationservice['applicationservice_dependencies']:
-            if isinstance(depend, dict):
-                or_depends.append(depend['or'])
-            elif depend not in ids:
-                await self._parse_depends(risotto_context,
-                                          depend,
-                                          or_depends,
-                                          ids)
-
-    async def _parse_or_depends(self,
-                                risotto_context: Context,
-                                or_depends: list,
-                                ids: list) -> None:
-        new_or_depends = []
-        set_ids = set(ids)
-        for or_depend in or_depends:
-            if not set(or_depend) & set_ids:
-                applicationservice_id= or_depend[0]
-                await self._parse_depends(risotto_context,
-                                          applicationservice_id,
-                                          new_or_depends,
-                                          ids)
-        if new_or_depends:
-            await self._parse_or_depends(risotto_context,
-                                         new_or_depends,
-                                         ids)
-
-    async def get_applicationservices(self,
-                                      risotto_context: Context,
-                                      applicationservice_id: int) -> list:
-        """Return consolidated dependencies or raise.
-        """
-        or_depends = []
-        ids = {}
-        await self._parse_depends(risotto_context,
-                                  applicationservice_id,
-                                  or_depends,
-                                  ids)
-        await self._parse_or_depends(risotto_context,
-                                     or_depends,
-                                     ids)
-        return ids
+                                  source_name=servermodel_parents_source_name,
+                                  release_distribution=servermodel_parents_release_distribution)
+        release_id = release['release_id']
+        servermodel_parents = []
+        for servermodel_parent_name in servermodel_parents_name:
+            servermodel_parents.append(await self._servermodel_describe(risotto_context,
+                                                                        servermodel_parent_name,
+                                                                        release_id))
+        return await self._servermodel_create(risotto_context,
+                                              servermodel_name,
+                                              servermodel_description,
+                                              servermodel_parents,
+                                              [],
+                                              self.internal_release_id,
+                                              None)
--- a/src/risotto/services/session/session.py
+++ b/src/risotto/services/session/session.py
@ -12,12 +12,15 @@ from .storage import storage_server, storage_servermodel
 from ...controller import Controller
 from ...register import register
 from ...dispatcher import dispatcher
+from ...config import get_config


 class Risotto(Controller):
    def __init__(self,
                 test):
        self.modify_storage = Storage(engine='dictionary')
+        self.internal_source_name = get_config()['servermodel']['internal_source']
+        self.internal_distribution_name = get_config()['servermodel']['internal_distribution']

    def get_storage(self,
                    type: str):
@ -110,17 +113,15 @@ class Risotto(Controller):
    @register('v1.session.servermodel.start')
    async def start_session_servermodel(self,
                                        risotto_context: Context,
-                                        servermodel_name: str,
-                                        source_name: str,
-                                        release_distribution: str) -> Dict:
+                                        servermodel_name: str) -> Dict:
        """ start a new config session for a server or a servermodel
        """
        config_module = dispatcher.get_service('config')
        servermodel = await self.call('v1.servermodel.describe',
                                      risotto_context,
                                      servermodel_name=servermodel_name,
-                                      source_name=source_name,
-                                      release_distribution=release_distribution)
+                                      source_name=self.internal_source_name,
+                                      release_distribution=self.internal_distribution_name)
        if not servermodel or servermodel['servermodel_id'] not in config_module.servermodel:
            raise Exception(_(f'cannot find servermodel with name {servermodel_name}'))
        id = servermodel['servermodel_id']
@ -293,7 +294,7 @@ class Risotto(Controller):
            modif_config = session['config']
            await config.value.importation(await modif_config.value.exportation())
            await config.permissive.importation(await modif_config.permissive.exportation())
-        storage.del_session(session_id)
+        await storage.del_session(session_id)
        return self.format_session(session_id, session)

    @register_http('v1', '/config/server/{session_id}')
--- a/src/risotto/services/session/storage.py
+++ b/src/risotto/services/session/storage.py
@ -103,8 +103,21 @@ class Storage(object):
            raise NotAllowedError()
        return session

-    def del_session(self,
+    async def del_session(self,
                          id: int):
+        config = self.sessions[id]['meta']
+        while True:
+            try:
+                children = list(await config.config.list())
+                if not children:
+                    # it's an empty metaconfig
+                    break
+                config = children[0]
+                await config.session.reset()
+            except:
+                # it's a config, so no "list" method
+                break
+        await self.sessions[id]['meta'].session.reset()
        del self.sessions[id]


--- a/src/risotto/services/source/source.py
+++ b/src/risotto/services/source/source.py
@ -122,7 +122,7 @@ class Risotto(Controller):
        return [dict(r) for r in result]

    @register('v1.source.release.describe')
-    async def release_list(self,
+    async def release_describe(self,
                               risotto_context,
                               source_name: str,
                               release_distribution: str) -> Dict:
@ -148,18 +148,3 @@ class Risotto(Controller):
        if not result:
            raise Exception(_(f'unknown release id {release_id}'))
        return dict(result)
-
-    @register('v1.source.release.get_by_distribution')
-    async def release_get_by_distribution(self,
-                                          risotto_context: Context,
-                                          source_id: int,
-                                          release_distribution: str) -> Dict:
-        release_query = """SELECT ReleaseId as release_id, SourceName as source_name, SourceURL as source_url, ReleaseName as release_name, ReleaseDistribution as release_distribution
-        FROM Release, Source
-        WHERE Release.ReleaseSourceId = $1 AND Release.ReleaseDistribution = $2 AND Source.SourceId = Release.ReleaseSourceId"""
-        result = await risotto_context.connection.fetchrow(release_query,
-                                                           source_id,
-                                                           release_distribution)
-        if not result:
-            raise Exception(_(f'unknown distribution {release_distribution} with source {source_id}'))
-        return dict(result)
--- a/src/risotto/services/template/template.py
+++ b/src/risotto/services/template/template.py
@ -21,17 +21,21 @@ class Risotto(Controller):
    async def template_get(self,
                           risotto_context,
                           server_name: str) -> Dict:
+        # get informations for server
        server = await self.call('v1.server.describe',
                                 risotto_context,
                                 server_name=server_name)
        server_id = server['server_id']
        servermodel_id = server['server_servermodel_id']
+        # verify if server has deployed configuration
        config_module = dispatcher.get_service('config')
        server = config_module.server[server_id]
        export = await server['server'].value.exportation()
        if not export[0]:
            raise Exception(_(f'configuration for server "{server_name}" is empty, you should deploy it first'))
-        config = meta = await server['server'].config.deepcopy(storage=self.storage)
+        # copy deployed configuration
+        async with await server['server'].config.deepcopy(storage=self.storage) as config:
+            meta = config
            while True:
                try:
                    children = list(await config.config.list())
@ -56,6 +60,7 @@ class Risotto(Controller):
                           templates_dir,
                           tmp_dir,
                           configurations_dir)
-
+            del meta, config
+            # FIXME del session !
        return {'server_name': server_name,
                'template_dir': configurations_dir}
--- a/src/risotto/services/uri/uri.py
+++ b/src/risotto/services/uri/uri.py
@ -11,7 +11,9 @@ class Risotto(Controller):
                      risotto_context):
        for uri in ['v1.applicationservice.create',
                    'v1.applicationservice.dataset.updated',
+                    'v1.applicationservice.dependency.add',
                    'v1.server.create',
+                    'v1.servermodel.create',
                    'v1.servermodel.dataset.updated',
                    'v1.session.server.start',
                    'v1.source.create',
@ -33,7 +35,6 @@ class Risotto(Controller):
            except:
                pass
        for uri in ['v1.applicationservice.describe',
-                    'v1.applicationservice.get_by_id',
                    'v1.server.describe',
                    'v1.server.list',
                    'v1.servermodel.list',
@ -52,8 +53,6 @@ class Risotto(Controller):
                    'v1.session.server.validate',
                    'v1.source.describe',
                    'v1.source.list',
-                    'v1.source.release.get_by_distribution',
-                    'v1.source.release.get_by_id',
                    'v1.source.release.list']:
            try:
                await self._uri_role_join(risotto_context,
@ -62,6 +61,7 @@ class Risotto(Controller):
            except:
                pass
        for uri in ['v1.server.describe',
+                    'v1.applicationservice.dependency.add',
                    'v1.config.configuration.server.get',
                    'v1.config.configuration.server.deploy',
                    'v1.session.server.start',
--- a/src/risotto/services/user/user.py
+++ b/src/risotto/services/user/user.py
@ -13,7 +13,6 @@ class Risotto(Controller):
        """ pre-load servermodel and server
        """
        user_login = get_config()['global']['admin_user']
-        user_password = get_config()['global']['admin_user_password']
        sql = '''
        SELECT UserId
        FROM RisottoUser
@ -23,7 +22,6 @@ class Risotto(Controller):
                                                     user_login) is None:
            await self._user_create(risotto_context,
                                    user_login,
-                                    user_password,
                                    user_login,
                                    user_login)
            await self._user_role_create(risotto_context,
@ -35,16 +33,14 @@ class Risotto(Controller):
    async def _user_create(self,
                           risotto_context: Context,
                           user_login: str,
-                           user_password: str,
                           user_name: str,
                           user_surname: str) -> Dict:
-        user_insert = """INSERT INTO RisottoUser(UserLogin, UserPassword, UserName, UserSurname)
-        VALUES ($1,crypt($2, gen_salt('bf')),$3,$4)
+        user_insert = """INSERT INTO RisottoUser(UserLogin, UserName, UserSurname)
+        VALUES ($1,$2,$3)
        RETURNING UserId
        """
        user_id = await risotto_context.connection.fetchval(user_insert,
                                                            user_login,
-                                                            user_password,
                                                            user_name,
                                                            user_surname)
        await self.call('v1.user.role.create',
@ -60,12 +56,10 @@ class Risotto(Controller):
    async def user_create(self,
                          risotto_context: Context,
                          user_login: str,
-                          user_password: str,
                          user_name: str,
                          user_surname: str) -> Dict:
        return await self._user_create(risotto_context,
                                       user_login,
-                                       user_password,
                                       user_name,
                                       user_surname)
Author	SHA1	Message	Date
Emmanuel Garette	4c775c21e4	add v1.applicationservice.dependency.add message	2020-02-23 16:53:29 +01:00
Emmanuel Garette	c7716da327	add applicationservice.dependency.add message	2020-02-21 16:16:50 +01:00
Emmanuel Garette	555ea2beb7	remove source.release.get_by_distribution message	2020-02-21 16:10:06 +01:00
Emmanuel Garette	7757912b55	do not ask release_id	2020-02-21 16:08:31 +01:00
Emmanuel Garette	251b521274	log on_join function	2020-01-31 11:34:27 +01:00
Emmanuel Garette	ab71686633	add v1.servermodel.create message	2020-01-31 11:23:41 +01:00
Emmanuel Garette	3b3cefa38a	add v1.servermodel.create message	2020-01-31 11:23:18 +01:00
Emmanuel Garette	6bdf21d1ac	tiramisu in postgres database	2020-01-30 16:22:06 +01:00