Merging lp:quantum, resolving conflict.

diff --cc extensions/novatenant.py
index 9d45f60cd0115094c7b5abaad04e55522e434356,f6ef1309862a735fe5bac8d391c57941a77fd856..4f083800e640fa8df3190af0e5c7fafa72f2a5d9
--- 1/extensions/novatenant.py
--- 2/extensions/novatenant.py
+++ b/extensions/novatenant.py
@@@ -99,26 -99,10 +99,27 @@@ class NovatenantsController(common.Quan
  
      #added for cisco's extension
      # pylint: disable-msg=E1101,W0613
 -    def get_host(self, request, tenant_id, id):
 +    def show(self, request, tenant_id, id):
 +        """ Returns novatenant details for the given novatenant id """
 +        return "novatenant is a dummy resource"
 +
 +    def create(self, request, tenant_id):
 +        """ Creates a new novatenant for a given tenant """
 +        return "novatenant is a dummy resource"
 +
 +    def update(self, request, tenant_id, id):
 +        """ Updates the name for the novatenant with the given id """
 +        return "novatenant is a dummy resource"
 +
 +    def delete(self, request, tenant_id, id):
 +        """ Destroys the Novatenant with the given id """
 +        return "novatenant is a dummy resource"
 +
 +    #added for cisco's extension
 +    def schedule_host(self, request, tenant_id, id):
          content_type = request.best_match_content_type()
          print "Content type:%s" % content_type
+ 
          try:
              req_params = \
                  self._parse_request_params(request,