Merge pull request #2 from fdelavega/master

Fix import issues

README.md

@@ -1,2 +1,19 @@
-# biz-umbrella-service
-BAE plugin for selling services secured with an API Umbrella proxy
+# Umbrella Service BAE plugin
+
+This repository includes an asset type extension for the FIWARE [Business API Ecosystem GE](https://github.com/FIWARE-TMForum/Business-API-Ecosystem).
+
+This BAE plugin supports the monetization of API services secured with an instance of [Apinf Umbrella](https://github.com/apinf/apinf-umbrella).
+
+This BAE plugin has been tested in BAE versions 7.4.0 and 7.6.0
+
+This plugin supports the following meta data to be included as part of BAE products:
+
+* **Required Headers**: Required headers field as included in the API Umbrella sub-path configuration.
+* **Authorization Method**: Whether user access to backend service is controlled using FIWARE IDM roles or API Umbrella native roles
+* **Acquisition Role**: Role to be granted to customers
+* **Access to sub-paths allowed**: If true, customers will be able to access to any sub-path of the monetized service
+* **Additional query strings allowed**: If true, customers will be able to call the service with different query strings as the included in the asset URL
+* **Admin API Key**: API key to be used by the BAE to access to the API Umbrella admin API
+* **Admin Auth Token**: Admin token to be used by the BAE to access to the Umbrella admin API
+
+This plugin supports accounting based on *Api call* units.

keystone_client.py

@@ -17,19 +17,6 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-
-from __future__ import unicode_literals
-
-import requests
-from urlparse import urlparse
-
-from django.core.exceptions import PermissionDenied
-
-from wstore.asset_manager.resource_plugins.plugin_error import PluginError
-
-from settings import KEYSTONE_HOST, KEYSTONE_PASSWORD, KEYSTONE_USER
-
-
 from __future__ import unicode_literals
 
 import requests

settings.py

@@ -19,6 +19,9 @@
 
 from __future__ import unicode_literals
 
+from os import environ
+
+
 UNITS = [{
     'name': 'Api call',
     'description': 'The final price is calculated based on the number of calls made to the API'