From f9472fac8ac642770012503b9ce2e333e47df376 Mon Sep 17 00:00:00 2001 From: Tony Mack Date: Wed, 11 Apr 2012 13:32:02 -0400 Subject: [PATCH] fix import path --- sfa/rspecs/version_manager.py | 2 +- sfa/rspecs/versions/pgv2.py | 4 ++-- sfa/rspecs/versions/sfav1.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/sfa/rspecs/version_manager.py b/sfa/rspecs/version_manager.py index 5d7358f5..aa2cec04 100644 --- a/sfa/rspecs/version_manager.py +++ b/sfa/rspecs/version_manager.py @@ -1,6 +1,6 @@ import os from sfa.util.faults import InvalidRSpec, UnsupportedRSpecVersion -from sfa.rspecs.baseversion import BaseVersion +from sfa.rspecs.version import RSpecVersion from sfa.util.sfalogging import logger class VersionManager: diff --git a/sfa/rspecs/versions/pgv2.py b/sfa/rspecs/versions/pgv2.py index 87ce2584..3565d4e6 100644 --- a/sfa/rspecs/versions/pgv2.py +++ b/sfa/rspecs/versions/pgv2.py @@ -2,12 +2,12 @@ from copy import deepcopy from StringIO import StringIO from sfa.util.xrn import Xrn, urn_to_sliver_id from sfa.util.plxrn import hostname_to_urn, xrn_to_hostname -from sfa.rspecs.baseversion import BaseVersion +from sfa.rspecs.version import RSpecVersion from sfa.rspecs.elements.versions.pgv2Link import PGv2Link from sfa.rspecs.elements.versions.pgv2Node import PGv2Node from sfa.rspecs.elements.versions.pgv2SliverType import PGv2SliverType -class PGv2(BaseVersion): +class PGv2(RSpecVersion): type = 'ProtoGENI' content_type = 'ad' version = '2' diff --git a/sfa/rspecs/versions/sfav1.py b/sfa/rspecs/versions/sfav1.py index ab022df3..6400489b 100644 --- a/sfa/rspecs/versions/sfav1.py +++ b/sfa/rspecs/versions/sfav1.py @@ -4,13 +4,13 @@ from lxml import etree from sfa.util.sfalogging import logger from sfa.util.xrn import hrn_to_urn, urn_to_hrn from sfa.util.plxrn import PlXrn -from sfa.rspecs.baseversion import BaseVersion +from sfa.rspecs.version import RSpecVersion from sfa.rspecs.elements.element import Element from sfa.rspecs.elements.versions.pgv2Link import PGv2Link from sfa.rspecs.elements.versions.sfav1Node import SFAv1Node from sfa.rspecs.elements.versions.sfav1Sliver import SFAv1Sliver -class SFAv1(BaseVersion): +class SFAv1(RSpecVersion): enabled = True type = 'SFA' content_type = '*' -- 2.47.0