svn commit: r1081852 - /incubator/libcloud/trunk/libcloud/pricing.py

[to...@apache.org]

Author: tomaz
Date: Tue Mar 15 16:56:08 2011
New Revision: 1081852

URL: http://svn.apache.org/viewvc?rev=1081852&view=rev
Log:
Move path stuff into a separate function.

Modified:
    incubator/libcloud/trunk/libcloud/pricing.py

Modified: incubator/libcloud/trunk/libcloud/pricing.py
URL: http://svn.apache.org/viewvc/incubator/libcloud/trunk/libcloud/pricing.py?rev=1081852&r1=1081851&r2=1081852&view=diff
==============================================================================
--- incubator/libcloud/trunk/libcloud/pricing.py (original)
+++ incubator/libcloud/trunk/libcloud/pricing.py Tue Mar 15 16:56:08 2011
@@ -31,6 +31,12 @@ PRICING_DATA = {
     'storage': {}
 }
 
+def get_pricing_file_path(file_path=None):
+    pricing_directory = os.path.dirname(os.path.abspath(__file__))
+    pricing_file_path = pjoin(pricing_directory, PRICING_FILE_PATH)
+
+    return pricing_file_path
+
 def get_pricing(driver_type, driver_name, pricing_file_path=None):
     """
     Return pricing for the provided driver.
@@ -47,14 +53,11 @@ def get_pricing(driver_type, driver_name
     if not driver_type in [ 'compute', 'storage' ]:
         raise AttributeError('Invalid driver type: %s', driver_type)
 
-    driver_name = driver_name.lower().replace('nodedriver', '')
-
     if driver_name in PRICING_DATA[driver_type]:
         return PRICING_DATA[driver_type][driver_name]
 
     if not pricing_file_path:
-        pricing_directory = os.path.dirname(os.path.abspath(__file__))
-        pricing_file_path = pjoin(pricing_directory, PRICING_FILE_PATH)
+        pricing_file_path = get_pricing_file_path(file_path=pricing_file_path)
 
     with open(pricing_file_path) as fp:
         content = fp.read()