git://git.onelab.eu
/
plstackapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
893a9d4
)
fix delete when hpc object has no cmi object id; add silent=true for originserver
author
Scott Baker
<smbaker@gmail.com>
Wed, 24 Sep 2014 05:53:51 +0000
(22:53 -0700)
committer
Scott Baker
<smbaker@gmail.com>
Wed, 24 Sep 2014 05:53:51 +0000
(22:53 -0700)
planetstack/hpc_observer/steps/sync_cdnprefix.py
patch
|
blob
|
history
planetstack/hpc_observer/steps/sync_contentprovider.py
patch
|
blob
|
history
planetstack/hpc_observer/steps/sync_originserver.py
patch
|
blob
|
history
planetstack/hpc_observer/steps/sync_serviceprovider.py
patch
|
blob
|
history
diff --git
a/planetstack/hpc_observer/steps/sync_cdnprefix.py
b/planetstack/hpc_observer/steps/sync_cdnprefix.py
index
b773df9
..
b887e84
100644
(file)
--- a/
planetstack/hpc_observer/steps/sync_cdnprefix.py
+++ b/
planetstack/hpc_observer/steps/sync_cdnprefix.py
@@
-62,4
+62,5
@@
class SyncCDNPrefix(SyncStep, HpcLibrary):
cp.save()
def delete_record(self, m):
cp.save()
def delete_record(self, m):
- self.client.onev.Delete("CDNPrefix", m.cdn_prefix_id)
+ if m.cdn_prefix_id is not None:
+ self.client.onev.Delete("CDNPrefix", m.cdn_prefix_id)
diff --git
a/planetstack/hpc_observer/steps/sync_contentprovider.py
b/planetstack/hpc_observer/steps/sync_contentprovider.py
index
c7335d6
..
cebe186
100644
(file)
--- a/
planetstack/hpc_observer/steps/sync_contentprovider.py
+++ b/
planetstack/hpc_observer/steps/sync_contentprovider.py
@@
-62,5
+62,6
@@
class SyncContentProvider(SyncStep, HpcLibrary):
cp.save()
def delete_record(self, m):
cp.save()
def delete_record(self, m):
- self.client.onev.Delete("ContentProvider", m.content_provider_id)
+ if m.content_provider_id is not None:
+ self.client.onev.Delete("ContentProvider", m.content_provider_id)
diff --git
a/planetstack/hpc_observer/steps/sync_originserver.py
b/planetstack/hpc_observer/steps/sync_originserver.py
index
6fb6234
..
92ac0f4
100644
(file)
--- a/
planetstack/hpc_observer/steps/sync_originserver.py
+++ b/
planetstack/hpc_observer/steps/sync_originserver.py
@@
-69,7
+69,9
@@
class SyncOriginServer(SyncStep, HpcLibrary):
url = url[7:]
self.client.cob.UpdateContent(ors.origin_server_id, {"url": url})
url = url[7:]
self.client.cob.UpdateContent(ors.origin_server_id, {"url": url})
+ ors.silent = True
ors.save()
ors.save()
- def delete(self, m):
- self.client.onev.Delete("OriginServer", m.origin_server_id)
+ def delete_record(self, m):
+ if m.origin_server_id is not None:
+ self.client.onev.Delete("OriginServer", m.origin_server_id)
diff --git
a/planetstack/hpc_observer/steps/sync_serviceprovider.py
b/planetstack/hpc_observer/steps/sync_serviceprovider.py
index
19c6db3
..
78fd196
100644
(file)
--- a/
planetstack/hpc_observer/steps/sync_serviceprovider.py
+++ b/
planetstack/hpc_observer/steps/sync_serviceprovider.py
@@
-52,5
+52,5
@@
class SyncServiceProvider(SyncStep, HpcLibrary):
sp.save()
def delete_record(self, m):
sp.save()
def delete_record(self, m):
- print "XXX delete service provider", m
- self.client.onev.Delete("ServiceProvider", m.service_provider_id)
+ if m.service_provider_id is not None:
+
self.client.onev.Delete("ServiceProvider", m.service_provider_id)