From 4385b0dd7a2aa92f89b545fbc436770509873980 Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Wed, 13 Mar 2013 17:49:40 +0400 Subject: [PATCH] Add part of service id to unit name Change-Id: Ia0f3953fea28c2cee15dc99595347cfdd3ec4430 --- portas/portas/api/v1/active_directories.py | 2 +- portas/portas/api/v1/webservers.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/portas/portas/api/v1/active_directories.py b/portas/portas/api/v1/active_directories.py index fa034dd..2b57a67 100644 --- a/portas/portas/api/v1/active_directories.py +++ b/portas/portas/api/v1/active_directories.py @@ -33,7 +33,7 @@ class Controller(object): for unit in active_directory['units']: unit_count += 1 unit['id'] = uuidutils.generate_uuid() - unit['name'] = 'dc{0}'.format(unit_count) + unit['name'] = 'dc{0}{1}'.format(unit_count, active_directory['id'][:4]) draft = prepare_draft(draft) draft['services']['activeDirectories'].append(active_directory) diff --git a/portas/portas/api/v1/webservers.py b/portas/portas/api/v1/webservers.py index 2e758e7..d1af6bc 100644 --- a/portas/portas/api/v1/webservers.py +++ b/portas/portas/api/v1/webservers.py @@ -33,7 +33,7 @@ class Controller(object): for unit in webServer['units']: unit_count += 1 unit['id'] = uuidutils.generate_uuid() - unit['name'] = 'iis{0}'.format(unit_count) + unit['name'] = 'iis{0}{1}'.format(unit_count, webServer['id'][:3]) draft = prepare_draft(draft) draft['services']['webServers'].append(webServer)