From 55128d1c5d2ffda769f7b939dfc7dc6af3bf2e97 Mon Sep 17 00:00:00 2001 From: Scott Moser Date: Fri, 1 Jun 2012 17:24:12 -0400 Subject: separate Metadata logic away from the web service The changes here are coming as a result of starting on blueprint config-drive-v2 [1]. I wanted to separate out the "Metadata" from the "Metadata Server". Thus, the creation of nova/api/metadata/base.py. The InstanceMetadata in base.py contains most of the logic for presenting metadata. As a result, the Metadata webservice in handler.py greatly simplified. This should make it easier to render duplicate data to a config drive. Additional changes here: * a few more tests * removal of the separate 'Versions' handler. Its now replaced by the single handler. Change-Id: I35fcfd8d7f247763954afc0a9f752f629b243e9b --- etc/nova/api-paste.ini | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'etc') diff --git a/etc/nova/api-paste.ini b/etc/nova/api-paste.ini index be2b37846..a621b759f 100644 --- a/etc/nova/api-paste.ini +++ b/etc/nova/api-paste.ini @@ -3,27 +3,11 @@ ############ [composite:metadata] use = egg:Paste#urlmap -/: metaversions -/latest: meta -/1.0: meta -/2007-01-19: meta -/2007-03-01: meta -/2007-08-29: meta -/2007-10-10: meta -/2007-12-15: meta -/2008-02-01: meta -/2008-09-01: meta -/2009-04-04: meta - -[pipeline:metaversions] -pipeline = ec2faultwrap logrequest metaverapp +/: meta [pipeline:meta] pipeline = ec2faultwrap logrequest metaapp -[app:metaverapp] -paste.app_factory = nova.api.metadata.handler:Versions.factory - [app:metaapp] paste.app_factory = nova.api.metadata.handler:MetadataRequestHandler.factory -- cgit