Use internal librecipe.

setup.py

@@ -34,7 +34,6 @@ setup(name=name,
         'lxml', # for full blown python interpreter
         'netaddr', # to manipulate on IP addresses
         'setuptools', # namespaces
-        'slapos.lib.recipe', # makes instantiation recipes simpler
         'slapos.slap', # uses internally
 #        'slapos.tool.cloudmgr', # needed for libclouds # disabled, as not available
         'xml_marshaller', # need to communication with slapgrid

slapos/recipe/erp5/__init__.py

@@ -24,7 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 import binascii
 import os
 import pkg_resources

slapos/recipe/erp5testnode/__init__.py

@@ -24,7 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 import os
 import pkg_resources
 import zc.buildout

slapos/recipe/helloworld.py

@@ -24,7 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 
 class Recipe(BaseSlapRecipe):
 

slapos/recipe/kvm/__init__.py

@@ -26,7 +26,7 @@
 ##############################################################################
 import os
 import sys
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 import subprocess
 import binascii
 import random

slapos/recipe/libcloud/__init__.py

-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 import os
 import sys
 import zc.buildout

slapos/recipe/libcloudrequest.py

-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 import zc.buildout
 class Recipe(BaseSlapRecipe):
   def _install(self):

slapos/recipe/nbdserver/__init__.py

@@ -26,7 +26,7 @@
 ##############################################################################
 import os
 import binascii
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 
 import pkg_resources
 

slapos/recipe/nosqltestbed/__init__.py

@@ -29,7 +29,7 @@ import os
 import urllib
 import urllib2
 import pkg_resources
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 
 class NoSQLTestBed(BaseSlapRecipe):
 

slapos/recipe/proactive/__init__.py

@@ -24,7 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 import os
 import pkg_resources
 

slapos/recipe/sheepdogtestbed/__init__.py

@@ -29,7 +29,7 @@ import os
 import urllib
 import urllib2
 import pkg_resources
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 
 class SheepDogTestBed(BaseSlapRecipe):
 

slapos/recipe/siptester/__init__.py

 import os
 import pkg_resources
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 
 class SipTesterRecipe(BaseSlapRecipe):
   def __init__(self, buildout, name, options):

slapos/recipe/slaprunner/__init__.py

@@ -24,7 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 import os
 import pkg_resources
 import sys

slapos/recipe/testnode/__init__.py

@@ -24,7 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 import os
 import pkg_resources
 import zc.buildout

slapos/recipe/xwiki/__init__.py

@@ -24,7 +24,7 @@
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #
 ##############################################################################
-from slapos.lib.recipe.BaseSlapRecipe import BaseSlapRecipe
+from slapos.recipe.librecipe import BaseSlapRecipe
 import os
 import shutil
 import pkg_resources