Commit 4ccb205e authored by Lucas Carvalho's avatar Lucas Carvalho

Merge remote branch 'origin/master' into networkcache_signature

parents 4211c7c6 a3361773
0.11 (unreleased) 0.12 (2011-07-15)
================ ================
* No changes yet. * Include modifications that should have been included in 0.11.
0.11 (2011-07-15) 0.11 (2011-07-15)
================ ================
* Bug fix : slapconsole : shorthand methods request and supply now correctly * Bug fix : slapconsole : shorthand methods request and supply now correctly
return an object return an object. [Cedric de Saint Martin]
0.10 (2011-07-13) 0.10 (2011-07-13)
================= =================
......
...@@ -91,31 +91,14 @@ ...@@ -91,31 +91,14 @@
<div class="field forgotten_password">\n <div class="field forgotten_password">\n
<label>&nbsp;</label>\n <label>&nbsp;</label>\n
<div class="field nolabel validate widthAuto" title="">\n <div class="field nolabel validate widthAuto" title="">\n
\n <label>Join</label>\n
<label>\n <a href="ERP5Site_viewCredentialRequestForm">Join</a>\n
Join\n </div>\n
\n <div class="field nolabel cancel widthAuto" title="">\n
\n <label>Lost password?</label>\n
</label>\n <a href="ERP5Site_viewCredentialRecoveryLoginDialog">Lost password?</a>\n
<div class="input"><input class="nolabel validate widthAuto" src="" name="ERP5Site_viewCredentialRequestForm:method" value="Join" type="submit" /></div>\n
\n
\n
\n
</div>\n
</div>\n
<div class="field nolabel cancel widthAuto" title="">\n
\n
\n
<label>\n
Lost password?\n
\n
\n
</label>\n
<div class="input"><input class="nolabel cancel widthAuto" src="" name="ERP5Site_viewCredentialRecoveryLoginDialog:method" value="Lost password?" type="submit" /></div>\n
\n
\n
\n
</div>\n </div>\n
</div>\n
</fieldset>\n </fieldset>\n
<script type="text/javascript">setFocus()</script>\n <script type="text/javascript">setFocus()</script>\n
<p i18n:translate="" i18n:domain="ui">Having trouble logging in? Make sure to enable cookies in your web browser.</p>\n <p i18n:translate="" i18n:domain="ui">Having trouble logging in? Make sure to enable cookies in your web browser.</p>\n
......
297 298
\ No newline at end of file \ No newline at end of file
...@@ -7590,6 +7590,39 @@ class TestVifibSlapWebService(testVifibMixin): ...@@ -7590,6 +7590,39 @@ class TestVifibSlapWebService(testVifibMixin):
sequence_list.addSequenceString(sequence_string) sequence_list.addSequenceString(sequence_string)
sequence_list.play(self) sequence_list.play(self)
def stepArchiveSoftwareRelease(self, sequence, **kw):
"""
Submit the software release document.
"""
software_release_uid = sequence["software_release_uid"]
software_release = self.portal.portal_catalog.getResultValue(
uid=software_release_uid)
software_release.portal_workflow.doActionFor(software_release,
'archive_action')
def test_bug_archived_software_release_access(self):
"""Checks that Computer has access to archived Software Release"""
sequence_string = self.\
prepare_start_requested_computer_partition_sequence_string + \
"""
LoginTestVifibDeveloper
ArchiveSoftwareRelease
Tic
Logout
SlapLoginCurrentComputer
SoftwareInstanceStarted
Tic
SlapLogout
LoginDefaultUser
CheckComputerPartitionInstanceHostingSalePackingListStarted
Logout
"""
sequence_list = SequenceList()
sequence_list.addSequenceString(sequence_string)
sequence_list.play(self)
######################################## ########################################
# Other tests # Other tests
######################################## ########################################
......
...@@ -2,7 +2,7 @@ from setuptools import setup, find_packages ...@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
import glob import glob
import os import os
version = '0.12-dev' version = '0.12'
name = 'slapos.core' name = 'slapos.core'
long_description = open("README.txt").read() + "\n" + \ long_description = open("README.txt").read() + "\n" + \
open("CHANGES.txt").read() + "\n" open("CHANGES.txt").read() + "\n"
......
...@@ -137,10 +137,10 @@ def init(config): ...@@ -137,10 +137,10 @@ def init(config):
def shorthandRequest(software_release, partition_reference, def shorthandRequest(software_release, partition_reference,
partition_parameter_kw=None, software_type=None, filter_kw=None, partition_parameter_kw=None, software_type=None, filter_kw=None,
state=None): state=None):
slap.registerOpenOrder().request(software_release, partition_reference, return slap.registerOpenOrder().request(software_release, partition_reference,
partition_parameter_kw, software_type, filter_kw, state) partition_parameter_kw, software_type, filter_kw, state)
def shorthandSupply(software_release, computer_guid=None): def shorthandSupply(software_release, computer_guid=None):
slap.registerSupply().supply(software_release, computer_guid) return slap.registerSupply().supply(software_release, computer_guid)
local['request'] = shorthandRequest local['request'] = shorthandRequest
local['supply'] = shorthandSupply local['supply'] = shorthandSupply
......
...@@ -209,7 +209,11 @@ class Computer: ...@@ -209,7 +209,11 @@ class Computer:
if address_dict['addr'] not in computer_partition_address_list: if address_dict['addr'] not in computer_partition_address_list:
return address_dict return address_dict
return None # all addresses on interface are for partition, so lets add new one
computer_tap = Tap('compdummy')
computer_tap.createWithOwner('root', attach_to_tap=True)
self.bridge.addTap(computer_tap)
return self.bridge.addAddr()
def send(self, config): def send(self, config):
""" """
......
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