From 4dc0951d819aee2b32f3e3f95a75d38ce5cd9134 Mon Sep 17 00:00:00 2001 From: Mohamed Larabi Date: Mon, 2 Dec 2013 20:22:08 +0100 Subject: [PATCH] pgv2services fix --- sfa/rspecs/elements/versions/pgv2Services.py | 28 ++++++++++---------- 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/sfa/rspecs/elements/versions/pgv2Services.py b/sfa/rspecs/elements/versions/pgv2Services.py index cfe9ba2b..e0acc714 100644 --- a/sfa/rspecs/elements/versions/pgv2Services.py +++ b/sfa/rspecs/elements/versions/pgv2Services.py @@ -24,15 +24,15 @@ class PGv2Services: for obj in child: service_elem.add_instance(name, obj, fields) - # add ssh_users - if service['services_user']: - for ssh_user in service['services_user']: - ssh_user_elem = service_elem.add_element('{%s}services_user' % xml.namespaces['ssh-user'], - login=ssh_user['login'], - user_urn=ssh_user['user_urn']) - for key in ssh_user['keys']: - pkey_elem = ssh_user_elem.add_element('{%s}public_key' % xml.namespaces['ssh-user']) - pkey_elem.element.text=key +# # add ssh_users +# if service['services_user']: +# for ssh_user in service['services_user']: +# ssh_user_elem = service_elem.add_element('{%s}services_user' % xml.namespaces['ssh-user'], +# login=ssh_user['login'], +# user_urn=ssh_user['user_urn']) +# for key in ssh_user['keys']: +# pkey_elem = ssh_user_elem.add_element('{%s}public_key' % xml.namespaces['ssh-user']) +# pkey_elem.element.text=key @staticmethod def get_services(xml): @@ -49,11 +49,11 @@ class PGv2Services: login_elems = services_elem.xpath('./default:login | ./login') service['login'] = [login_elem.get_instance(Login) for login_elem in login_elems] - ssh_user_elems = services_elem.xpath('./ssh-user:service_user | ./service_user') - services_user = [] - for ssh_user_elem in ssh_user_elems: - services_user = ssh_user_elem.get_instance(None, fields=['login', 'user_urn']) - service['services_user'] = services_user +# ssh_user_elems = services_elem.xpath('./ssh-user:service_user | ./service_user') +# services_user = [] +# for ssh_user_elem in ssh_user_elems: +# services_user = ssh_user_elem.get_instance(None, fields=['login', 'user_urn']) +# service['services_user'] = services_user services.append(service) return services -- 2.43.0