From fa69cc6bf8aec40c63c9742d0c0e80ccda3bceb2 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Mon, 9 Nov 2009 01:46:20 +0000 Subject: [PATCH] convert the hrn to a planetlab slice name --- sfacomponent/methods/delete_slice.py | 3 ++- sfacomponent/methods/reset_slice.py | 8 ++++---- sfacomponent/methods/start_slice.py | 3 ++- sfacomponent/methods/stop_slice.py | 3 ++- 4 files changed, 10 insertions(+), 7 deletions(-) diff --git a/sfacomponent/methods/delete_slice.py b/sfacomponent/methods/delete_slice.py index ce7be45c..95337e05 100644 --- a/sfacomponent/methods/delete_slice.py +++ b/sfacomponent/methods/delete_slice.py @@ -34,6 +34,7 @@ class delete_slice(Method): client_gid_str = client_gid.save_to_string(save_parents=True) self.api.auth.authenticateGid(client_gid_str, [cred, hrn], request_hash) self.api.auth.check(cred, 'deleteslice') - self.api.nodemanager.Destroy(hrn) + slicename = hrn_to_pl_slicename(hrn) + self.api.nodemanager.Destroy(slicename) return 1 diff --git a/sfacomponent/methods/reset_slice.py b/sfacomponent/methods/reset_slice.py index bc4431ce..4d1693df 100644 --- a/sfacomponent/methods/reset_slice.py +++ b/sfacomponent/methods/reset_slice.py @@ -34,10 +34,10 @@ class reset_slice(Method): client_gid_str = client_gid.save_to_string(save_parents=True) self.api.auth.authenticateGid(client_gid_str, [cred, hrn], request_hash) self.api.auth.check(cred, 'resetslice') + slicename = hrn_to_pl_slicename(hrn) + if not self.api.sliver_exists(slicename): + raise SliverDoesNotExist(slicename) - if not self.api.sliver_exists(hrn): - raise SliverDoesNotExist(hrn) - - self.api.nodemanager.ReCreate(hrn) + self.api.nodemanager.ReCreate(slicename) return 1 diff --git a/sfacomponent/methods/start_slice.py b/sfacomponent/methods/start_slice.py index c8997f86..6dba65c4 100644 --- a/sfacomponent/methods/start_slice.py +++ b/sfacomponent/methods/start_slice.py @@ -34,6 +34,7 @@ class start_slice(Method): client_gid_str = client_gid.save_to_string(save_parents=True) self.api.auth.authenticateGid(client_gid_str, [cred, hrn], request_hash) self.api.auth.check(cred, 'startslice') - self.api.nodemanager.Start(hrn) + slicename = hrn_to_pl_slicename(hrn) + self.api.nodemanager.Start(slicename) return 1 diff --git a/sfacomponent/methods/stop_slice.py b/sfacomponent/methods/stop_slice.py index a5be98a7..e4149b30 100644 --- a/sfacomponent/methods/stop_slice.py +++ b/sfacomponent/methods/stop_slice.py @@ -34,6 +34,7 @@ class stop_slice(Method): client_gid_str = client_gid.save_to_string(save_parents=True) self.api.auth.authenticateGid(client_gid_str, [cred, hrn], request_hash) self.api.auth.check(cred, 'stopslice') - self.api.nodemanager.Stop(hrn) + slicename = hrn_to_pl_slicename(hrn) + self.api.nodemanager.Stop(slicename) return 1 -- 2.47.0