From 669d404f5c91a846236b3d10a0fe305876133170 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 5 Jun 2012 08:25:03 -0400 Subject: [PATCH] renamed disk_images to disk_image --- sfa/rspecs/elements/sliver.py | 2 +- sfa/rspecs/elements/versions/pgv2SliverType.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sfa/rspecs/elements/sliver.py b/sfa/rspecs/elements/sliver.py index 204b9296..5186d1f8 100644 --- a/sfa/rspecs/elements/sliver.py +++ b/sfa/rspecs/elements/sliver.py @@ -8,6 +8,6 @@ class Sliver(Element): 'name', 'type', 'tags', - 'disk_images', + 'disk_image', 'fw_rules', ] diff --git a/sfa/rspecs/elements/versions/pgv2SliverType.py b/sfa/rspecs/elements/versions/pgv2SliverType.py index b5d6da02..3c0e2584 100644 --- a/sfa/rspecs/elements/versions/pgv2SliverType.py +++ b/sfa/rspecs/elements/versions/pgv2SliverType.py @@ -17,7 +17,7 @@ class PGv2SliverType: sliver_elem.set('name', sliver['type']) if sliver.get('client_id'): sliver_elem.set('client_id', sliver['client_id']) - images = sliver.get('disk_images') + images = sliver.get('disk_image') if images and isinstance(images, list): PGv2DiskImage.add_images(sliver_elem, images) fw_rules = sliver.get('fw_rules') @@ -47,7 +47,7 @@ class PGv2SliverType: sliver['component_id'] = xml.attrib['component_id'] if 'name' in sliver_elem.attrib: sliver['type'] = sliver_elem.attrib['name'] - sliver['images'] = PGv2DiskImage.get_images(sliver_elem) + sliver['disk_image'] = PGv2DiskImage.get_images(sliver_elem) sliver['fw_rules'] = PLOSv1FWRule.get_rules(sliver_elem) slivers.append(sliver) return slivers -- 2.47.0