X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=sfa%2Frspecs%2Fversions%2Fpgv2.py;h=b57cd9bbfe019f3dbf818720aab7c43309dad856;hb=a155a11fbee6ba887f6bb2d77982b7d6232ea54a;hp=8da0119b5d5bdba34c5439b2e30e633961cbbd64;hpb=5bb8f044e0085d73ec79abb1822421db3fc50101;p=sfa.git
diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py
index 8da0119b..b57cd9bb 100644
--- a/sfa/rspecs/versions/pgv2.py
+++ b/sfa/rspecs/versions/pgv2.py
@@ -1,11 +1,12 @@
from lxml import etree
from copy import deepcopy
from StringIO import StringIO
-from sfa.util.xrn import *
+from sfa.util.xrn import urn_to_sliver_id
from sfa.util.plxrn import hostname_to_urn, xrn_to_hostname
from sfa.rspecs.rspec_version import BaseVersion
from sfa.rspecs.rspec_elements import RSpecElement, RSpecElements
-
+from sfa.rspecs.elements.versions.pgv2Link import PGv2Link
+
class PGv2(BaseVersion):
type = 'ProtoGENI'
content_type = 'ad'
@@ -17,11 +18,7 @@ class PGv2(BaseVersion):
'planetlab': "http://www.planet-lab.org/resources/sfa/ext/planetlab/1",
}
namespaces = dict(extensions.items() + [('default', namespace)])
- elements = [
- RSpecElement(RSpecElements.NETWORK, 'network', '//default:node[@component_manager_id][1]'),
- RSpecElement(RSpecElements.NODE, 'node', '//default:node | //node'),
- RSpecElement(RSpecElements.SLIVER, 'sliver', '//default:node/default:sliver_type | //node/sliver_type'),
- ]
+ elements = []
def get_network(self):
network = None
@@ -95,6 +92,18 @@ class PGv2(BaseVersion):
return slice_attributes
+ def get_links(self, network=None):
+ return PGv2Link.get_links(self.xml)
+
+ def get_link_requests(self):
+ return PGv2Link.get_link_requests(self.xml)
+
+ def add_links(self, links):
+ PGv2Link.add_links(self.xml.root, links)
+
+ def add_link_requests(self, link_tuples, append=False):
+ PGv2Link.add_link_requests(self.xml.root, link_tuples, append)
+
def attributes_list(self, elem):
opts = []
if elem is not None:
@@ -129,7 +138,7 @@ class PGv2(BaseVersion):
node_type_tag = etree.SubElement(node_tag, 'hardware_type', name='plab-pc')
node_type_tag = etree.SubElement(node_tag, 'hardware_type', name='pc')
available_tag = etree.SubElement(node_tag, 'available', now='true')
- sliver_type_tag = etree.SubElement(node_tag, 'sliver_type', name='plab-vnode')
+ sliver_type_tag = etree.SubElement(node_tag, 'sliver_type', name='plab-vserver')
pl_initscripts = node.get('pl_initscripts', {})
for pl_initscript in pl_initscripts.values():
@@ -149,7 +158,7 @@ class PGv2(BaseVersion):
# this is untested
self.xml.root.append(deepcopy(source_node_tag))
- def add_slivers(self, slivers, sliver_urn=None, no_dupes=False):
+ def add_slivers(self, slivers, sliver_urn=None, no_dupes=False, append=False):
# all nodes hould already be present in the rspec. Remove all
# nodes that done have slivers
@@ -164,19 +173,18 @@ class PGv2(BaseVersion):
for node in nodes:
urn = node.get('component_id')
hostname = xrn_to_hostname(urn)
- if hostname not in slivers_dict:
+ if hostname not in slivers_dict and not append:
parent = node.getparent()
parent.remove(node)
else:
sliver_info = slivers_dict[hostname]
- sliver_type_elements = node.xpath('./sliver_type', namespaces=self.namespaces)
+ sliver_type_elements = node.xpath('./default:sliver_type', namespaces=self.namespaces)
available_sliver_types = [element.attrib['name'] for element in sliver_type_elements]
- valid_sliver_types = ['emulab-openvz', 'raw-pc']
+ valid_sliver_types = ['emulab-openvz', 'raw-pc', 'plab-vserver', 'plab-vnode']
requested_sliver_type = None
for valid_sliver_type in valid_sliver_types:
- if valid_sliver_type in available_sliver_type:
+ if valid_sliver_type in available_sliver_types:
requested_sliver_type = valid_sliver_type
-
if requested_sliver_type:
# remove existing sliver_type tags,it needs to be recreated
sliver_elem = node.xpath('./default:sliver_type | ./sliver_type', namespaces=self.namespaces)
@@ -204,6 +212,7 @@ class PGv2(BaseVersion):
parent = node.getparent()
parent.remove(node)
+
def remove_slivers(self, slivers, network=None, no_dupes=False):
for sliver in slivers:
@@ -218,9 +227,6 @@ class PGv2(BaseVersion):
def add_interfaces(self, interfaces, no_dupes=False):
pass
- def add_links(self, links, no_dupes=False):
- pass
-
def merge(self, in_rspec):
"""
Merge contents for specified rspec with current rspec
@@ -244,19 +250,20 @@ class PGv2Ad(PGv2):
enabled = True
content_type = 'ad'
schema = 'http://www.protogeni.net/resources/rspec/2/ad.xsd'
- template = ''
+ template = ''
class PGv2Request(PGv2):
enabled = True
content_type = 'request'
schema = 'http://www.protogeni.net/resources/rspec/2/request.xsd'
- template = ''
+ template = ''
class PGv2Manifest(PGv2):
enabled = True
content_type = 'manifest'
schema = 'http://www.protogeni.net/resources/rspec/2/manifest.xsd'
- template = ''
+ template = ''
+