git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
753b291
)
SFA object constructor now requires a argument
author
Tony Mack
<tmack@cs.princeton.edu>
Thu, 13 Aug 2009 15:03:22 +0000
(15:03 +0000)
committer
Tony Mack
<tmack@cs.princeton.edu>
Thu, 13 Aug 2009 15:03:22 +0000
(15:03 +0000)
PLC/Methods/AddNode.py
patch
|
blob
|
history
PLC/Methods/AddPerson.py
patch
|
blob
|
history
PLC/Methods/AddPersonKey.py
patch
|
blob
|
history
PLC/Methods/AddSite.py
patch
|
blob
|
history
PLC/Methods/AddSlice.py
patch
|
blob
|
history
PLC/Methods/DeleteKey.py
patch
|
blob
|
history
PLC/Methods/DeleteNode.py
patch
|
blob
|
history
PLC/Methods/DeletePerson.py
patch
|
blob
|
history
PLC/Methods/DeleteSite.py
patch
|
blob
|
history
PLC/Methods/DeleteSlice.py
patch
|
blob
|
history
diff --git
a/PLC/Methods/AddNode.py
b/PLC/Methods/AddNode.py
index
cf9bdba
..
f9da543
100644
(file)
--- a/
PLC/Methods/AddNode.py
+++ b/
PLC/Methods/AddNode.py
@@
-88,7
+88,7
@@
class AddNode(Method):
self.message = "Node %s created" % node['node_id']
# sync with geni db
self.message = "Node %s created" % node['node_id']
# sync with geni db
- sfa = SFA()
+ sfa = SFA(
self.api
)
sfa.update_record(node, 'node', site['login_base'])
return node['node_id']
sfa.update_record(node, 'node', site['login_base'])
return node['node_id']
diff --git
a/PLC/Methods/AddPerson.py
b/PLC/Methods/AddPerson.py
index
99f634c
..
a8b4e2c
100644
(file)
--- a/
PLC/Methods/AddPerson.py
+++ b/
PLC/Methods/AddPerson.py
@@
-38,8
+38,8
@@
class AddPerson(Method):
person = Person(self.api, person_fields)
person.sync()
person = Person(self.api, person_fields)
person.sync()
- # Logging variables
- self.event_objects = {'Person': [person['person_id']]}
- self.message = 'Person %d added' % person['person_id']
+
# Logging variables
+
self.event_objects = {'Person': [person['person_id']]}
+ self.message = 'Person %d added' % person['person_id']
return person['person_id']
return person['person_id']
diff --git
a/PLC/Methods/AddPersonKey.py
b/PLC/Methods/AddPersonKey.py
index
3a06a34
..
335b403
100644
(file)
--- a/
PLC/Methods/AddPersonKey.py
+++ b/
PLC/Methods/AddPersonKey.py
@@
-60,7
+60,7
@@
class AddPersonKey(Method):
(key['key_id'], person['person_id'])
# sync with the geni db
(key['key_id'], person['person_id'])
# sync with the geni db
- sfa = SFA()
+ sfa = SFA(
self.api
)
sfa.update_record(person, 'person')
return key['key_id']
sfa.update_record(person, 'person')
return key['key_id']
diff --git
a/PLC/Methods/AddSite.py
b/PLC/Methods/AddSite.py
index
bda21ce
..
6b49001
100644
(file)
--- a/
PLC/Methods/AddSite.py
+++ b/
PLC/Methods/AddSite.py
@@
-41,7
+41,7
@@
class AddSite(Method):
self.event_objects = {'Site': [site['site_id']]}
self.message = 'Site %d created' % site['site_id']
self.event_objects = {'Site': [site['site_id']]}
self.message = 'Site %d created' % site['site_id']
- sfa = SFA()
+ sfa = SFA(
self.api
)
sfa.update_record(site, 'site', site['login_base'])
return site['site_id']
sfa.update_record(site, 'site', site['login_base'])
return site['site_id']
diff --git
a/PLC/Methods/AddSlice.py
b/PLC/Methods/AddSlice.py
index
78016b3
..
9644e6d
100644
(file)
--- a/
PLC/Methods/AddSlice.py
+++ b/
PLC/Methods/AddSlice.py
@@
-106,6
+106,6
@@
class AddSlice(Method):
self.event_objects = {'Slice': [slice['slice_id']]}
self.message = "Slice %d created" % slice['slice_id']
self.event_objects = {'Slice': [slice['slice_id']]}
self.message = "Slice %d created" % slice['slice_id']
- sfa = SFA()
+ sfa = SFA(
self.api
)
sfa.update_record(slice, 'slice', site['login_base'])
return slice['slice_id']
sfa.update_record(slice, 'slice', site['login_base'])
return slice['slice_id']
diff --git
a/PLC/Methods/DeleteKey.py
b/PLC/Methods/DeleteKey.py
index
a723aaa
..
e4203fc
100644
(file)
--- a/
PLC/Methods/DeleteKey.py
+++ b/
PLC/Methods/DeleteKey.py
@@
-41,8
+41,8
@@
class DeleteKey(Method):
key.delete()
key.delete()
- # Logging variables
- self.event_objects = {'Key': [key['key_id']]}
- self.message = 'Key %d deleted' % key['key_id']
+
# Logging variables
+
self.event_objects = {'Key': [key['key_id']]}
+
self.message = 'Key %d deleted' % key['key_id']
return 1
return 1
diff --git
a/PLC/Methods/DeleteNode.py
b/PLC/Methods/DeleteNode.py
index
c97f20a
..
e62f23c
100644
(file)
--- a/
PLC/Methods/DeleteNode.py
+++ b/
PLC/Methods/DeleteNode.py
@@
-55,7
+55,7
@@
class DeleteNode(Method):
self.event_objects = {'Node': [node_id], 'Site': [site_id] }
self.message = "Node %d deleted" % node['node_id']
self.event_objects = {'Node': [node_id], 'Site': [site_id] }
self.message = "Node %d deleted" % node['node_id']
- sfa = SFA()
+ sfa = SFA(
self.api
)
sfa.delete_record(node, 'node')
return 1
sfa.delete_record(node, 'node')
return 1
diff --git
a/PLC/Methods/DeletePerson.py
b/PLC/Methods/DeletePerson.py
index
738850c
..
399a7c1
100644
(file)
--- a/
PLC/Methods/DeletePerson.py
+++ b/
PLC/Methods/DeletePerson.py
@@
-51,7
+51,7
@@
class DeletePerson(Method):
self.event_objects = {'Person': [person['person_id']]}
self.message = 'Person %d deleted' % person['person_id']
self.event_objects = {'Person': [person['person_id']]}
self.message = 'Person %d deleted' % person['person_id']
- sfa = SFA()
+ sfa = SFA(
self.api
)
sfa.delete_record(person, 'person')
return 1
sfa.delete_record(person, 'person')
return 1
diff --git
a/PLC/Methods/DeleteSite.py
b/PLC/Methods/DeleteSite.py
index
f3196cc
..
b2adfdb
100644
(file)
--- a/
PLC/Methods/DeleteSite.py
+++ b/
PLC/Methods/DeleteSite.py
@@
-41,7
+41,7
@@
class DeleteSite(Method):
raise PLCInvalidArgument, "Not a local site"
# sync with sfa db
raise PLCInvalidArgument, "Not a local site"
# sync with sfa db
- sfa = SFA()
+ sfa = SFA(
self.api
)
sfa.delete_record(site, 'site')
site.delete()
sfa.delete_record(site, 'site')
site.delete()
diff --git
a/PLC/Methods/DeleteSlice.py
b/PLC/Methods/DeleteSlice.py
index
29840ee
..
d2d4be8
100644
(file)
--- a/
PLC/Methods/DeleteSlice.py
+++ b/
PLC/Methods/DeleteSlice.py
@@
-48,7
+48,7
@@
class DeleteSlice(Method):
slice.delete()
self.event_objects = {'Slice': [slice['slice_id']]}
slice.delete()
self.event_objects = {'Slice': [slice['slice_id']]}
- sfa = SFA()
+ sfa = SFA(
self.api
)
sfa.delete_record(slice, 'slice')
return 1
sfa.delete_record(slice, 'slice')
return 1