From f2242f087769c36c20c443b92350cdded3a7d314 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Tue, 1 Mar 2011 14:07:54 -0500 Subject: [PATCH] in slice_status() make sure geni_urn is a urn and not hrn --- sfa/managers/aggregate_manager_pl.py | 4 ++-- sfa/managers/slice_manager_pl.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sfa/managers/aggregate_manager_pl.py b/sfa/managers/aggregate_manager_pl.py index f4a21b96..88f54ff9 100644 --- a/sfa/managers/aggregate_manager_pl.py +++ b/sfa/managers/aggregate_manager_pl.py @@ -6,7 +6,7 @@ import re from types import StringTypes from sfa.util.faults import * -from sfa.util.xrn import get_authority, hrn_to_urn, urn_to_hrn +from sfa.util.xrn import get_authority, hrn_to_urn, urn_to_hrn, Xrn from sfa.util.plxrn import slicename_to_hrn, hrn_to_pl_slicename from sfa.util.rspec import * from sfa.util.specdict import * @@ -108,7 +108,7 @@ def slice_status(api, slice_xrn, creds): api.logger.info(nodes) result = {} - result['geni_urn'] = slice_xrn + result['geni_urn'] = Xrn(slice_xrn, 'slice').get_urn() result['geni_status'] = 'unknown' result['pl_login'] = slice['name'] result['pl_expires'] = datetime.datetime.fromtimestamp(slice['expires']).ctime() diff --git a/sfa/managers/slice_manager_pl.py b/sfa/managers/slice_manager_pl.py index a58bc80e..0cee6523 100644 --- a/sfa/managers/slice_manager_pl.py +++ b/sfa/managers/slice_manager_pl.py @@ -51,7 +51,7 @@ def slice_status(api, slice_xrn, creds ): api.logger.info(nodes) result = {} - result['geni_urn'] = slice_xrn + result['geni_urn'] = Xrn(slice_xrn, 'slice').get_urn() result['geni_status'] = 'unknown' result['pl_login'] = slice['name'] result['pl_expires'] = datetime.datetime.fromtimestamp(slice['expires']).ctime() -- 2.45.2