git://git.onelab.eu
/
plcapi.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
- merge from PlanetLab Europe
[plcapi.git]
/
PLC
/
Test.py
diff --git
a/PLC/Test.py
b/PLC/Test.py
index
1610ed7
..
addbafc
100644
(file)
--- a/
PLC/Test.py
+++ b/
PLC/Test.py
@@
-5,7
+5,7
@@
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
# Mark Huang <mlhuang@cs.princeton.edu>
# Copyright (C) 2006 The Trustees of Princeton University
#
-# $Id: Test.py,v 1.
19 2007/01/09 16:23:47 mlhuang
Exp $
+# $Id: Test.py,v 1.
3 2007/09/12 17:52:27 tmack
Exp $
#
from pprint import pprint
#
from pprint import pprint
@@
-371,7
+371,8
@@
class Test:
# Update site
site_fields = random_site()
# Do not change login_base
# Update site
site_fields = random_site()
# Do not change login_base
- del site_fields['login_base']
+ if 'login_base' in site_fields:
+ del site_fields['login_base']
self.api.UpdateSite(site_id, site_fields)
if self.check:
self.api.UpdateSite(site_id, site_fields)
if self.check:
@@
-605,6
+606,8
@@
class Test:
for person_id in self.person_ids:
# Update user
person_fields = random_person()
for person_id in self.person_ids:
# Update user
person_fields = random_person()
+ # Keep them enabled
+ person_fields['enabled'] = True
self.api.UpdatePerson(person_id, person_fields)
if self.check:
self.api.UpdatePerson(person_id, person_fields)
if self.check:
@@
-1154,7
+1157,8
@@
class Test:
# Update configuration file
conf_file_fields = random_conf_file()
# Do not update dest so that it remains an override if set
# Update configuration file
conf_file_fields = random_conf_file()
# Do not update dest so that it remains an override if set
- del conf_file_fields['dest']
+ if 'dest' in conf_file_fields:
+ del conf_file_fields['dest']
self.api.UpdateConfFile(conf_file_id, conf_file_fields)
if self.check:
self.api.UpdateConfFile(conf_file_id, conf_file_fields)
if self.check:
@@
-1306,7
+1310,8
@@
class Test:
# Update slice
slice_fields = random_slice("unused")
# Cannot change slice name
# Update slice
slice_fields = random_slice("unused")
# Cannot change slice name
- del slice_fields['name']
+ if 'name' in slice_fields:
+ del slice_fields['name']
self.api.UpdateSlice(slice_id, slice_fields)
slice = self.api.GetSlices([slice_id])[0]
self.api.UpdateSlice(slice_id, slice_fields)
slice = self.api.GetSlices([slice_id])[0]