From 74a0cedd754af6f2c2b458b9c7e45183f439592c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com> Date: Fri, 21 Sep 2012 10:57:57 +0200 Subject: [PATCH] Factor code --- slapos/proxy/views.py | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) diff --git a/slapos/proxy/views.py b/slapos/proxy/views.py index fb68a53da..e4b928b5d 100644 --- a/slapos/proxy/views.py +++ b/slapos/proxy/views.py @@ -127,21 +127,8 @@ def after_request(response): @app.route('/getComputerInformation', methods=['GET']) def getComputerInformation(): - computer_id = request.args['computer_id'] - if app.config['computer_id'] == computer_id: - slap_computer = Computer(computer_id) - slap_computer._software_release_list = [] - for sr in execute_db('software', 'select * from %s'): - slap_computer._software_release_list.append(SoftwareRelease( - software_release=sr['url'], computer_guid=computer_id)) - slap_computer._computer_partition_list = [] - for partition in execute_db('partition', 'SELECT * FROM %s'): - slap_computer._computer_partition_list.append(partitiondict2partition( - partition)) - return xml_marshaller.xml_marshaller.dumps(slap_computer) - else: - raise UnauthorizedError, "Only accept request for: %s" % \ - app.config['computer_id'] + # Kept only for backward compatiblity + return getFullComputerInformation() @app.route('/getFullComputerInformation', methods=['GET']) def getFullComputerInformation(): -- 2.30.9