use "vserver" as the default value for the slice attribute "type"

diff --git a/sliver_vs.py b/sliver_vs.py
index f93a4f0..3c804e6 100644 (file)
--- a/sliver_vs.py
+++ b/sliver_vs.py
@@ -30,7 +30,7 @@ class Sliver_VS(accounts.Account, vserver.VServer):
     """This class wraps vserver.VServer to make its interface closer to what we need."""
 
     SHELL = '/bin/vsh'
     """This class wraps vserver.VServer to make its interface closer to what we need."""
 
     SHELL = '/bin/vsh'

-    TYPE = 'sliver.VServer'
+    TYPE = 'vserver'

 
     def __init__(self, rec):
         try:
 
     def __init__(self, rec):
         try:

diff --git a/sm.py b/sm.py
index 6a89158..fecfbf6 100644 (file)
--- a/sm.py
+++ b/sm.py
@@ -61,7 +61,7 @@ def GetSlivers_callback(data, fullupdate=True):
             keys = rec.pop('keys')
             rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
 
             keys = rec.pop('keys')
             rec.setdefault('keys', '\n'.join([key_struct['key'] for key_struct in keys]))
 

-            rec.setdefault('type', attr_dict.get('type', 'sliver.VServer'))
+            rec.setdefault('type', attr_dict.get('type', 'vserver'))

             rec.setdefault('vref', attr_dict.get('vref', 'default'))
             rec.setdefault('initscript', attr_dict.get('initscript', ''))
             rec.setdefault('delegations', [])  # XXX - delegation not yet supported
             rec.setdefault('vref', attr_dict.get('vref', 'default'))
             rec.setdefault('initscript', attr_dict.get('initscript', ''))
             rec.setdefault('delegations', [])  # XXX - delegation not yet supported