no longer need the geni_am wrapper

diff --git a/sfa/methods/CreateSliver.py b/sfa/methods/CreateSliver.py
index 93c6b19..e8f9b94 100644 (file)
--- a/sfa/methods/CreateSliver.py
+++ b/sfa/methods/CreateSliver.py
@@ -19,7 +19,7 @@ class CreateSliver(Method):
     @param rspec (string) rspec to allocate
     
     """
-    interfaces = ['aggregate', 'slicemgr', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
         Mixed(Parameter(str, "Credential string"),
@@ -41,7 +41,7 @@ class CreateSliver(Method):
         manager = self.api.get_interface_manager()
         
         # flter rspec through sfatables
-        if self.api.interface in ['aggregate', 'geni_am']:
+        if self.api.interface in ['aggregate']:
             chain_name = 'OUTGOING'
         elif self.api.interface in ['slicemgr']:
             chain_name = 'FORWARD-OUTGOING'

diff --git a/sfa/methods/ListResources.py b/sfa/methods/ListResources.py
index d8fdc9a..bf616c7 100644 (file)
--- a/sfa/methods/ListResources.py
+++ b/sfa/methods/ListResources.py
@@ -14,7 +14,7 @@ class ListResources(Method):
     @param options dictionary
     @return string
     """
-    interfaces = ['aggregate', 'slicemgr', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Mixed(Parameter(str, "Credential string"), 
               Parameter(type([str]), "List of credentials")),
@@ -41,7 +41,7 @@ class ListResources(Method):
         rspec = manager.get_rspec(self.api, valid_creds, options)
 
         # filter rspec through sfatables 
-        if self.api.interface in ['aggregate', 'geni_am']:
+        if self.api.interface in ['aggregate']:
             chain_name = 'OUTGOING'
         elif self.api.interface in ['slicemgr']: 
             chain_name = 'FORWARD-OUTGOING'

diff --git a/sfa/methods/RenewSliver.py b/sfa/methods/RenewSliver.py
index 7233d0f..efce45d 100644 (file)
--- a/sfa/methods/RenewSliver.py
+++ b/sfa/methods/RenewSliver.py
@@ -13,7 +13,7 @@ class RenewSliver(Method):
     @param expiration_time (string) requested time of expiration
     
     """
-    interfaces = ['aggregate', 'slicemgr', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
         Parameter(type([str]), "List of credentials"),

diff --git a/sfa/methods/Shutdown.py b/sfa/methods/Shutdown.py
index 60e2dd3..f8e3294 100644 (file)
--- a/sfa/methods/Shutdown.py
+++ b/sfa/methods/Shutdown.py
@@ -12,7 +12,7 @@ class Shutdown(Stop):
     @param slice_urn (string) URN of slice to renew
     @param credentials ([string]) of credentials    
     """
-    interfaces = ['aggregate', 'slicemgr', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
         Parameter(type([str]), "List of credentials"),

diff --git a/sfa/methods/SliverStatus.py b/sfa/methods/SliverStatus.py
index a6c8524..a23acb6 100644 (file)
--- a/sfa/methods/SliverStatus.py
+++ b/sfa/methods/SliverStatus.py
@@ -10,7 +10,7 @@ class SliverStatus(Method):
     @param slice_urn (string) URN of slice to allocate to
     
     """
-    interfaces = ['aggregate', 'slicemgr', 'component', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr', 'component']
     accepts = [
         Parameter(str, "Slice URN"),
         Mixed(Parameter(str, "Credential string"),

diff --git a/sfa/methods/UpdateSliver.py b/sfa/methods/UpdateSliver.py
index 4e23aa6..37252f2 100644 (file)
--- a/sfa/methods/UpdateSliver.py
+++ b/sfa/methods/UpdateSliver.py
@@ -17,7 +17,7 @@ class UpdateSliver(CreateSliver):
     @param rspec (string) rspec to allocate
     
     """
-    interfaces = ['aggregate', 'slicemgr', 'geni_am']
+    interfaces = ['aggregate', 'slicemgr']
     accepts = [
         Parameter(str, "Slice URN"),
         Mixed(Parameter(str, "Credential string"),