Commit ffa69964 authored by Marco Mariani's avatar Marco Mariani

Merge branch 'master' into cliff

Conflicts:
	slapos/format.py
parents 41e8cd1a 3b7705a5
...@@ -14,6 +14,7 @@ Major Improvements: ...@@ -14,6 +14,7 @@ Major Improvements:
* Dramatically speed up slapformat. [Cedric de Saint Martin] * Dramatically speed up slapformat. [Cedric de Saint Martin]
* Remove CONFIG_SITE env var from Buildout environment, fixing support of OpenSuse 12.x. [Cedric de Saint Martin] * Remove CONFIG_SITE env var from Buildout environment, fixing support of OpenSuse 12.x. [Cedric de Saint Martin]
* RootSoftwareInstance is now the default software type. [Cedric de Saint Martin] * RootSoftwareInstance is now the default software type. [Cedric de Saint Martin]
* Allow to use SlapOS Client for instances deployed in shared SlapOS Nodes. [Cedric de Saint Martin]
Other fixes: Other fixes:
...@@ -25,6 +26,7 @@ Other fixes: ...@@ -25,6 +26,7 @@ Other fixes:
* Slapgrid: Check if SR is upload-blacklisted only if we have upload informations. [Cedric de Saint Martin] * Slapgrid: Check if SR is upload-blacklisted only if we have upload informations. [Cedric de Saint Martin]
* Slapformat: Make sure everybody can read slapos configuration directory. [Cedric de Saint Martin] * Slapformat: Make sure everybody can read slapos configuration directory. [Cedric de Saint Martin]
* Slapformat: Fix support of slapproxy. [Marco Mariani] * Slapformat: Fix support of slapproxy. [Marco Mariani]
* Slapformat: slapos.xml backup: handle corrupted zip files. [Marco Mariani]
0.35.1 (2013-02-18) 0.35.1 (2013-02-18)
......
...@@ -66,7 +66,7 @@ if portal.portal_activities.countMessageWithTag(tag) > 0:\n ...@@ -66,7 +66,7 @@ if portal.portal_activities.countMessageWithTag(tag) > 0:\n
\n \n
def newOpenOrder(open_sale_order):\n def newOpenOrder(open_sale_order):\n
open_order_edit_kw = {\n open_order_edit_kw = {\n
\'effective_date\': now,\n \'effective_date\': DateTime(),\n
\'activate_kw\': activate_kw,\n \'activate_kw\': activate_kw,\n
}\n }\n
if open_sale_order is None:\n if open_sale_order is None:\n
......
...@@ -1259,6 +1259,7 @@ class TestHostingSubscription_requestUpdateOpenSaleOrder(testSlapOSMixin): ...@@ -1259,6 +1259,7 @@ class TestHostingSubscription_requestUpdateOpenSaleOrder(testSlapOSMixin):
portal_type='Open Sale Order Line') portal_type='Open Sale Order Line')
self.assertEqual(1, len(open_sale_order_line_list)) self.assertEqual(1, len(open_sale_order_line_list))
effective_date = open_sale_order.getEffectiveDate()
line = open_sale_order_line_list[0].getObject() line = open_sale_order_line_list[0].getObject()
self.assertEqual(subscription.getRelativeUrl(), line.getAggregate()) self.assertEqual(subscription.getRelativeUrl(), line.getAggregate())
...@@ -1279,9 +1280,12 @@ class TestHostingSubscription_requestUpdateOpenSaleOrder(testSlapOSMixin): ...@@ -1279,9 +1280,12 @@ class TestHostingSubscription_requestUpdateOpenSaleOrder(testSlapOSMixin):
new_open_sale_order = [x for x in open_sale_order_list \ new_open_sale_order = [x for x in open_sale_order_list \
if x.getValidationState() == 'validated'][0].getObject() if x.getValidationState() == 'validated'][0].getObject()
self.assertEqual('validated', new_open_sale_order.getValidationState()) self.assertEqual('validated', new_open_sale_order.getValidationState())
new_effective_date = new_open_sale_order.getEffectiveDate()
open_sale_order_line_list = new_open_sale_order.contentValues( open_sale_order_line_list = new_open_sale_order.contentValues(
portal_type='Open Sale Order Line') portal_type='Open Sale Order Line')
self.assertEqual(0, len(open_sale_order_line_list)) self.assertEqual(0, len(open_sale_order_line_list))
self.assertTrue(new_effective_date > effective_date,
"%s <= %s" % (new_effective_date, effective_date))
class TestSlapOSTriggerBuildAlarm(testSlapOSMixin): class TestSlapOSTriggerBuildAlarm(testSlapOSMixin):
@simulateByTitlewMark('SimulationMovement_buildSlapOS') @simulateByTitlewMark('SimulationMovement_buildSlapOS')
......
254 255
\ No newline at end of file \ No newline at end of file
...@@ -1519,7 +1519,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1519,7 +1519,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<unicode>created_at</unicode> <unicode>created_at</unicode>
<unicode>%(created_at)s</unicode> <unicode>%(created_at)s</unicode>
<unicode>text</unicode> <unicode>text</unicode>
<unicode>#access instance correctly stopped</unicode> <unicode>#access Instance correctly stopped</unicode>
<unicode>user</unicode> <unicode>user</unicode>
<unicode>%(instance_guid)s</unicode> <unicode>%(instance_guid)s</unicode>
</dictionary> </dictionary>
...@@ -1556,7 +1556,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin): ...@@ -1556,7 +1556,7 @@ class TestSlapOSSlapToolInstanceAccess(TestSlapOSSlapToolMixin):
<unicode>created_at</unicode> <unicode>created_at</unicode>
<unicode>%(created_at)s</unicode> <unicode>%(created_at)s</unicode>
<unicode>text</unicode> <unicode>text</unicode>
<unicode>#access instance correctly started</unicode> <unicode>#access Instance correctly started</unicode>
<unicode>user</unicode> <unicode>user</unicode>
<unicode>%(instance_guid)s</unicode> <unicode>%(instance_guid)s</unicode>
</dictionary> </dictionary>
...@@ -2167,6 +2167,84 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin): ...@@ -2167,6 +2167,84 @@ class TestSlapOSSlapToolPersonAccess(TestSlapOSSlapToolMixin):
if os.path.exists(self.instance_request_simulator): if os.path.exists(self.instance_request_simulator):
os.unlink(self.instance_request_simulator) os.unlink(self.instance_request_simulator)
def test_request_allocated_instance(self):
self.tic()
self.person.edit(
default_email_coordinate_text="%s@example.org" % self.person.getReference(),
career_role='member',
)
self._makeComplexComputer(person=self.person)
self.start_requested_software_instance.updateLocalRolesOnSecurityGroups()
self.tic()
self.login(self.person_reference)
response = self.portal_slap.requestComputerPartition(
software_release=self.start_requested_software_instance.getUrlString(),
software_type=self.start_requested_software_instance.getSourceReference(),
partition_reference=self.start_requested_software_instance.getTitle(),
partition_parameter_xml='<marshal><dictionary id="i2"/></marshal>',
filter_xml='<marshal><dictionary id="i2"/></marshal>',
state='<marshal><string>started</string></marshal>',
shared_xml='<marshal><bool>0</bool></marshal>',
)
self.assertEqual(type(response), str)
# check returned XML
xml_fp = StringIO.StringIO()
xml.dom.ext.PrettyPrint(xml.dom.ext.reader.Sax.FromXml(response),
stream=xml_fp)
xml_fp.seek(0)
got_xml = xml_fp.read()
expected_xml = """\
<?xml version='1.0' encoding='UTF-8'?>
<marshal>
<object id='i2' module='slapos.slap.slap' class='SoftwareInstance'>
<tuple/>
<dictionary id='i3'>
<string>_connection_dict</string>
<dictionary id='i4'/>
<string>_instance_guid</string>
<string>%(instance_guid)s</string>
<string>_parameter_dict</string>
<dictionary id='i5'/>
<string>_requested_state</string>
<string>%(state)s</string>
<string>ip_list</string>
<list id='i6'>
<tuple>
<string/>
<string>%(ip)s</string>
</tuple>
</list>
<string>slap_computer_id</string>
<string>%(computer_id)s</string>
<string>slap_computer_partition_id</string>
<string>%(partition_id)s</string>
<string>slap_software_release_url</string>
<string>%(url_string)s</string>
<string>slap_software_type</string>
<string>%(type)s</string>
<string>slave_instance_list</string>
<list id='i7'/>
<string>timestamp</string>
<string>%(timestamp)s</string>
</dictionary>
</object>
</marshal>
""" % dict(
instance_guid=self.start_requested_software_instance.getReference(),
state="started",
url_string=self.start_requested_software_instance.getUrlString(),
type=self.start_requested_software_instance.getSourceReference(),
timestamp=int(self.start_requested_software_instance.getModificationDate()),
computer_id=self.computer_id,
partition_id=self.start_requested_software_instance.getAggregateId(),
ip=self.start_requested_software_instance.getAggregateValue()\
.getDefaultNetworkAddressIpAddress(),
)
self.assertEqual(expected_xml, got_xml,
'\n'.join([q for q in difflib.unified_diff(expected_xml.split('\n'),
got_xml.split('\n'))]))
def assertSupplySimulator(self, args, kwargs): def assertSupplySimulator(self, args, kwargs):
stored = eval(open(self.computer_supply_simulator).read()) stored = eval(open(self.computer_supply_simulator).read())
# do the same translation magic as in workflow # do the same translation magic as in workflow
......
23 25
\ No newline at end of file \ No newline at end of file
...@@ -269,7 +269,7 @@ ...@@ -269,7 +269,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>Friends</string> </value> <value> <string>Friends (email)</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
......
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>certificate.crt</string> </value> <value> <string>computer.crt</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
......
...@@ -259,7 +259,7 @@ ...@@ -259,7 +259,7 @@
</item> </item>
<item> <item>
<key> <string>title</string> </key> <key> <string>title</string> </key>
<value> <string>key.key</string> </value> <value> <string>computer.key</string> </value>
</item> </item>
<item> <item>
<key> <string>unicode</string> </key> <key> <string>unicode</string> </key>
......
46 48
\ No newline at end of file \ No newline at end of file
...@@ -654,7 +654,6 @@ class SlapTool(BaseTool): ...@@ -654,7 +654,6 @@ class SlapTool(BaseTool):
computer_partition_document.getRelativeUrl()) computer_partition_document.getRelativeUrl())
if software_instance is not None: if software_instance is not None:
slap_partition._instance_guid = software_instance.getReference()
# trick client side, that data has been synchronised already for given # trick client side, that data has been synchronised already for given
# document # document
slap_partition._synced = True slap_partition._synced = True
...@@ -677,6 +676,7 @@ class SlapTool(BaseTool): ...@@ -677,6 +676,7 @@ class SlapTool(BaseTool):
parameter_dict.pop('xml')) parameter_dict.pop('xml'))
slap_partition._connection_dict = self._instanceXmlToDict( slap_partition._connection_dict = self._instanceXmlToDict(
parameter_dict.pop('connection_xml')) parameter_dict.pop('connection_xml'))
slap_partition._instance_guid = parameter_dict.pop('instance_guid')
for slave_instance_dict in parameter_dict.get("slave_instance_list", []): for slave_instance_dict in parameter_dict.get("slave_instance_list", []):
if slave_instance_dict.has_key("connection_xml"): if slave_instance_dict.has_key("connection_xml"):
slave_instance_dict.update(self._instanceXmlToDict( slave_instance_dict.update(self._instanceXmlToDict(
...@@ -788,7 +788,6 @@ class SlapTool(BaseTool): ...@@ -788,7 +788,6 @@ class SlapTool(BaseTool):
computer_partition_document.getRelativeUrl()) computer_partition_document.getRelativeUrl())
if software_instance is not None: if software_instance is not None:
slap_partition._instance_guid = software_instance.getReference()
state = software_instance.getSlapState() state = software_instance.getSlapState()
if state == "stop_requested": if state == "stop_requested":
slap_partition._requested_state = 'stopped' slap_partition._requested_state = 'stopped'
...@@ -808,6 +807,7 @@ class SlapTool(BaseTool): ...@@ -808,6 +807,7 @@ class SlapTool(BaseTool):
parameter_dict.pop('xml')) parameter_dict.pop('xml'))
slap_partition._connection_dict = self._instanceXmlToDict( slap_partition._connection_dict = self._instanceXmlToDict(
parameter_dict.pop('connection_xml')) parameter_dict.pop('connection_xml'))
slap_partition._instance_guid = parameter_dict.pop('instance_guid')
for slave_instance_dict in parameter_dict.get("slave_instance_list", []): for slave_instance_dict in parameter_dict.get("slave_instance_list", []):
if slave_instance_dict.has_key("connection_xml"): if slave_instance_dict.has_key("connection_xml"):
slave_instance_dict.update(self._instanceXmlToDict( slave_instance_dict.update(self._instanceXmlToDict(
...@@ -975,8 +975,8 @@ class SlapTool(BaseTool): ...@@ -975,8 +975,8 @@ class SlapTool(BaseTool):
computer_partition_id) computer_partition_id)
user = self.getPortalObject().portal_membership.getAuthenticatedMember()\ user = self.getPortalObject().portal_membership.getAuthenticatedMember()\
.getUserName() .getUserName()
self._logAccess(user, instance.getReference(), self._logAccess(user, instance.getReference(),
'#access instance correctly started') '#access Instance correctly started')
@convertToREST @convertToREST
def _stoppedComputerPartition(self, computer_id, computer_partition_id): def _stoppedComputerPartition(self, computer_id, computer_partition_id):
...@@ -988,8 +988,8 @@ class SlapTool(BaseTool): ...@@ -988,8 +988,8 @@ class SlapTool(BaseTool):
computer_partition_id) computer_partition_id)
user = self.getPortalObject().portal_membership.getAuthenticatedMember()\ user = self.getPortalObject().portal_membership.getAuthenticatedMember()\
.getUserName() .getUserName()
self._logAccess(user, instance.getReference(), self._logAccess(user, instance.getReference(),
'#access instance correctly stopped') '#access Instance correctly stopped')
@convertToREST @convertToREST
def _destroyedComputerPartition(self, computer_id, computer_partition_id): def _destroyedComputerPartition(self, computer_id, computer_partition_id):
...@@ -1176,10 +1176,13 @@ class SlapTool(BaseTool): ...@@ -1176,10 +1176,13 @@ class SlapTool(BaseTool):
parameter_dict.pop('xml')) parameter_dict.pop('xml'))
connection_xml = self._instanceXmlToDict( connection_xml = self._instanceXmlToDict(
parameter_dict.pop('connection_xml')) parameter_dict.pop('connection_xml'))
instance_guid = parameter_dict.pop('instance_guid')
software_instance = SoftwareInstance(**parameter_dict) software_instance = SoftwareInstance(**parameter_dict)
software_instance._parameter_dict = xml software_instance._parameter_dict = xml
software_instance._connection_dict = connection_xml software_instance._connection_dict = connection_xml
software_instance._requested_state = state
software_instance._instance_guid = instance_guid
return xml_marshaller.xml_marshaller.dumps(software_instance) return xml_marshaller.xml_marshaller.dumps(software_instance)
#################################################### ####################################################
...@@ -1320,6 +1323,7 @@ class SlapTool(BaseTool): ...@@ -1320,6 +1323,7 @@ class SlapTool(BaseTool):
if (newtimestamp > timestamp): if (newtimestamp > timestamp):
timestamp = newtimestamp timestamp = newtimestamp
return { return {
'instance_guid': software_instance.getReference(),
'xml': software_instance.getTextContent(), 'xml': software_instance.getTextContent(),
'connection_xml': software_instance.getConnectionXml(), 'connection_xml': software_instance.getConnectionXml(),
'slap_computer_id': computer_partition.getParentValue().getReference(), 'slap_computer_id': computer_partition.getParentValue().getReference(),
......
...@@ -2,13 +2,13 @@ ...@@ -2,13 +2,13 @@
master_url = https://slap.vifib.com/ master_url = https://slap.vifib.com/
[slapconsole] [slapconsole]
# Put here retrieved certificate from vifib. # Put here retrieved certificate from SlapOS Master.
# Beware: put certificate from YOUR account, not the one from your node. # Beware: put certificate from YOUR account, not the one from your node.
# You (as identified person from vifib) will request an instance, node your node. # You (as identified person from SlapOS Master) will request an instance, node your node.
# Conclusion: node certificate != person certificate. # Conclusion: node certificate != person certificate.
cert_file = certificate file location coming from your slapos master account cert_file = certificate file location coming from your slapos master account
key_file = key file location coming from your slapos master account key_file = key file location coming from your slapos master account
# Below are softwares supported by Vifib # Below are softwares maintained by slapos.org and contributors
alias = alias =
apache_frontend http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg apache_frontend http://git.erp5.org/gitweb/slapos.git/blob_plain/HEAD:/software/apache-frontend/software.cfg
dokuwiki http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.158:/software/dokuwiki/software.cfg dokuwiki http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.158:/software/dokuwiki/software.cfg
...@@ -24,7 +24,7 @@ alias = ...@@ -24,7 +24,7 @@ alias =
mysql http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.65:/software/mysql-5.1/software.cfg mysql http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.65:/software/mysql-5.1/software.cfg
opengoo http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.158:/software/opengoo/software.cfg opengoo http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.158:/software/opengoo/software.cfg
postgresql http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.157:/software/postgres/software.cfg postgresql http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.157:/software/postgres/software.cfg
slaposwebrunner http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.143:/software/slaprunner/software.cfg slaposwebrunner http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.160:/software/slaprunner/software.cfg
wordpress http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.153:/software/wordpress/software.cfg wordpress http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.153:/software/wordpress/software.cfg
xwiki http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.46:/software/xwiki/software.cfg xwiki http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.46:/software/xwiki/software.cfg
zabbixagent http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.95:/software/zabbix-agent/software.cfg zabbixagent http://git.erp5.org/gitweb/slapos.git/blob_plain/refs/tags/slapos-0.162:/software/zabbix-agent/software.cfg
...@@ -82,6 +82,35 @@ class SlapDocument: ...@@ -82,6 +82,35 @@ class SlapDocument:
# cause failures when accessing _connection_helper property. # cause failures when accessing _connection_helper property.
self._connection_helper = connection_helper self._connection_helper = connection_helper
class SlapRequester(SlapDocument):
"""
Abstract class that allow to factor method for subclasses that use "request()"
"""
def _requestComputerPartition(self, request_dict):
try:
self._connection_helper.POST('/requestComputerPartition', request_dict)
except ResourceNotReady:
return ComputerPartition(
request_dict=request_dict,
connection_helper=self._connection_helper,
)
xml = self._connection_helper.response.read()
software_instance = xml_marshaller.loads(xml)
computer_partition = ComputerPartition(
software_instance.slap_computer_id.encode('UTF-8'),
software_instance.slap_computer_partition_id.encode('UTF-8'),
connection_helper=self._connection_helper,
)
# Hack to give all object attributes to the ComputerPartition instance
computer_partition.__dict__ = software_instance.__dict__.copy()
# XXX not generic enough.
if xml_marshaller.loads(request_dict['shared_xml']):
computer_partition._synced = True
computer_partition._connection_dict = software_instance._connection_dict
computer_partition._parameter_dict = software_instance._parameter_dict
return computer_partition
class SoftwareRelease(SlapDocument): class SoftwareRelease(SlapDocument):
""" """
Contains Software Release information Contains Software Release information
...@@ -186,7 +215,7 @@ class Supply(SlapDocument): ...@@ -186,7 +215,7 @@ class Supply(SlapDocument):
raise NotFoundError("Computer %s has not been found by SlapOS Master." raise NotFoundError("Computer %s has not been found by SlapOS Master."
% computer_guid) % computer_guid)
class OpenOrder(SlapDocument): class OpenOrder(SlapRequester):
zope.interface.implements(interface.IOpenOrder) zope.interface.implements(interface.IOpenOrder)
...@@ -212,26 +241,7 @@ class OpenOrder(SlapDocument): ...@@ -212,26 +241,7 @@ class OpenOrder(SlapDocument):
else: else:
# Let's enforce a default software type # Let's enforce a default software type
request_dict['software_type'] = DEFAULT_SOFTWARE_TYPE request_dict['software_type'] = DEFAULT_SOFTWARE_TYPE
try: return self._requestComputerPartition(request_dict)
self._connection_helper.POST('/requestComputerPartition', request_dict)
except ResourceNotReady:
return ComputerPartition(
request_dict=request_dict,
connection_helper=self._connection_helper,
)
else:
xml = self._connection_helper.response.read()
software_instance = xml_marshaller.loads(xml)
computer_partition = ComputerPartition(
software_instance.slap_computer_id.encode('UTF-8'),
software_instance.slap_computer_partition_id.encode('UTF-8'),
connection_helper=self._connection_helper,
)
if shared:
computer_partition._synced = True
computer_partition._connection_dict = software_instance._connection_dict
computer_partition._parameter_dict = software_instance._parameter_dict
return computer_partition
def requestComputer(self, computer_reference): def requestComputer(self, computer_reference):
""" """
...@@ -325,57 +335,6 @@ class Computer(SlapDocument): ...@@ -325,57 +335,6 @@ class Computer(SlapDocument):
xml = self._connection_helper.response.read() xml = self._connection_helper.response.read()
return xml_marshaller.loads(xml) return xml_marshaller.loads(xml)
def _syncComputerPartitionInformation(func):
"""
Synchronize computer partition object with server information
"""
def decorated(self, *args, **kw):
if getattr(self, '_synced', 0):
return func(self, *args, **kw)
if not self._computer_id:
# XXX Is it only in case of requesting instance?
raise ResourceNotReady("Instance is not ready yet.")
# XXX: This is a ugly way to keep backward compatibility,
# We should stablise slap library soon.
computer = self._connection_helper.getFullComputerInformation(self._computer_id)
found_computer_partition = None
for computer_partition in computer._computer_partition_list:
if computer_partition.getId() == self.getId():
found_computer_partition = computer_partition
break
if found_computer_partition is None:
raise NotFoundError("No information for partition %s" %
self.getId())
else:
for key, value in found_computer_partition.__dict__.items():
if isinstance(value, unicode):
# convert unicode to utf-8
setattr(self, key, value.encode('utf-8'))
if isinstance(value, dict):
new_dict = {}
for ink, inv in value.iteritems():
if isinstance(inv, (list, tuple)):
new_inv = []
for elt in inv:
if isinstance(elt, (list, tuple)):
new_inv.append([x.encode('utf-8') for x in elt])
elif isinstance(elt, dict):
new_inv.append(dict([(x.encode('utf-8'),
y and y.encode("utf-8")) for x,y in elt.iteritems()]))
else:
new_inv.append(elt.encode('utf-8'))
new_dict[ink.encode('utf-8')] = new_inv
elif inv is None:
new_dict[ink.encode('utf-8')] = None
else:
new_dict[ink.encode('utf-8')] = inv.encode('utf-8')
setattr(self, key, new_dict)
else:
setattr(self, key, value)
setattr(self, '_synced', True)
return func(self, *args, **kw)
return decorated
class ComputerPartition(SlapDocument): class ComputerPartition(SlapDocument):
...@@ -398,7 +357,6 @@ class ComputerPartition(SlapDocument): ...@@ -398,7 +357,6 @@ class ComputerPartition(SlapDocument):
def __getinitargs__(self): def __getinitargs__(self):
return (self._computer_id, self._partition_id, ) return (self._computer_id, self._partition_id, )
@_syncComputerPartitionInformation
def request(self, software_release, software_type, partition_reference, def request(self, software_release, software_type, partition_reference,
shared=False, partition_parameter_kw=None, filter_kw=None, shared=False, partition_parameter_kw=None, filter_kw=None,
state=None): state=None):
...@@ -418,7 +376,8 @@ class ComputerPartition(SlapDocument): ...@@ -418,7 +376,8 @@ class ComputerPartition(SlapDocument):
if software_type is None: if software_type is None:
software_type = DEFAULT_SOFTWARE_TYPE software_type = DEFAULT_SOFTWARE_TYPE
request_dict = { 'computer_id': self._computer_id, request_dict = {
'computer_id': self._computer_id,
'computer_partition_id': self._partition_id, 'computer_partition_id': self._partition_id,
'software_release': software_release, 'software_release': software_release,
'software_type': software_type, 'software_type': software_type,
...@@ -428,29 +387,8 @@ class ComputerPartition(SlapDocument): ...@@ -428,29 +387,8 @@ class ComputerPartition(SlapDocument):
partition_parameter_kw), partition_parameter_kw),
'filter_xml': xml_marshaller.dumps(filter_kw), 'filter_xml': xml_marshaller.dumps(filter_kw),
'state': xml_marshaller.dumps(state), 'state': xml_marshaller.dumps(state),
} }
try: return self._requestComputerPartition(request_dict)
self._connection_helper.POST('/requestComputerPartition', request_dict)
except ResourceNotReady:
return ComputerPartition(
request_dict=request_dict,
connection_helper=self._connection_helper,
)
else:
xml = self._connection_helper.response.read()
software_instance = xml_marshaller.loads(xml)
computer_partition = ComputerPartition(
software_instance.slap_computer_id.encode('UTF-8'),
software_instance.slap_computer_partition_id.encode('UTF-8'),
connection_helper=self._connection_helper,
)
if shared:
computer_partition._synced = True
computer_partition._connection_dict = getattr(software_instance,
'_connection_dict', None)
computer_partition._parameter_dict = getattr(software_instance,
'_parameter_dict', None)
return computer_partition
def building(self): def building(self):
self._connection_helper.POST('/buildingComputerPartition', { self._connection_helper.POST('/buildingComputerPartition', {
...@@ -510,29 +448,24 @@ class ComputerPartition(SlapDocument): ...@@ -510,29 +448,24 @@ class ComputerPartition(SlapDocument):
raise ResourceNotReady() raise ResourceNotReady()
return self._partition_id return self._partition_id
@_syncComputerPartitionInformation
def getInstanceGuid(self): def getInstanceGuid(self):
"""Sync if not synced, then returns instance_guid""" """Return instance_guid. Raise ResourceNotReady if it doesn't exist."""
if not getattr(self, '_instance_guid', None): if not getattr(self, '_instance_guid', None):
raise ResourceNotReady() raise ResourceNotReady()
return self._instance_guid return self._instance_guid
@_syncComputerPartitionInformation
def getState(self): def getState(self):
"""Sync if not synced, then returns _requested_state.""" """return _requested_state. Raise ResourceNotReady if it doesn't exist."""
if not getattr(self, '_requested_state', None): if not getattr(self, '_requested_state', None):
raise ResourceNotReady() raise ResourceNotReady()
return self._requested_state return self._requested_state
@_syncComputerPartitionInformation
def getInstanceParameterDict(self): def getInstanceParameterDict(self):
return getattr(self, '_parameter_dict', None) or {} return getattr(self, '_parameter_dict', None) or {}
@_syncComputerPartitionInformation
def getConnectionParameterDict(self): def getConnectionParameterDict(self):
return getattr(self, '_connection_dict', None) or {} return getattr(self, '_connection_dict', None) or {}
@_syncComputerPartitionInformation
def getSoftwareRelease(self): def getSoftwareRelease(self):
""" """
Returns the software release associate to the computer partition. Returns the software release associate to the computer partition.
...@@ -551,7 +484,6 @@ class ComputerPartition(SlapDocument): ...@@ -551,7 +484,6 @@ class ComputerPartition(SlapDocument):
'connection_xml': xml_marshaller.dumps(connection_dict), 'connection_xml': xml_marshaller.dumps(connection_dict),
'slave_reference': slave_reference}) 'slave_reference': slave_reference})
@_syncComputerPartitionInformation
def getInstanceParameter(self, key): def getInstanceParameter(self, key):
parameter_dict = getattr(self, '_parameter_dict', None) or {} parameter_dict = getattr(self, '_parameter_dict', None) or {}
if key in parameter_dict: if key in parameter_dict:
...@@ -559,7 +491,6 @@ class ComputerPartition(SlapDocument): ...@@ -559,7 +491,6 @@ class ComputerPartition(SlapDocument):
else: else:
raise NotFoundError("%s not found" % key) raise NotFoundError("%s not found" % key)
@_syncComputerPartitionInformation
def getConnectionParameter(self, key): def getConnectionParameter(self, key):
connection_dict = getattr(self, '_connection_dict', None) or {} connection_dict = getattr(self, '_connection_dict', None) or {}
if key in connection_dict: if key in connection_dict:
......
##############################################################################
#
# Copyright (c) 2013 Vifib SARL and Contributors. All Rights Reserved.
#
# WARNING: This program as such is intended to be used by professional
# programmers who take the whole responsibility of assessing all potential
# consequences resulting from its eventual inadequacies and bugs
# End users who are looking for a ready-to-use solution with commercial
# guarantees and support are strongly adviced to contract a Free Software
# Service Company
#
# This program is Free Software; you can redistribute it and/or
# modify it under the terms of the GNU General Public License
# as published by the Free Software Foundation; either version 3
# of the License, or (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#
##############################################################################
import os
import slapos.util
import tempfile
import unittest
class TestMkdirP(unittest.TestCase):
"""
Tests methods available in the slapos.util module.
"""
def test_mkdir_p_new_directory(self):
"""
Test that mkdir_p recursively creates a directory.
"""
root_directory = tempfile.mkdtemp()
wanted_directory = os.path.join(root_directory, 'foo', 'bar')
slapos.util.mkdir_p(wanted_directory)
self.assertTrue(os.path.isdir(wanted_directory))
def test_mkdir_already_existing(self):
"""
Check that mkdir_p doesn't raise if directory already exist.
"""
root_directory = tempfile.mkdtemp()
slapos.util.mkdir_p(root_directory)
self.assertTrue(os.path.isdir(root_directory))
if __name__ == '__main__':
unittest.main()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment