Merge "Move os-flavor-manage to flavors"
This commit is contained in:
		@@ -408,15 +408,6 @@
 | 
			
		||||
      href="../wadls/compute-api/src/v2.1/wadl/os-flavor-extra-specs-v2.1.wadl"
 | 
			
		||||
      xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
 | 
			
		||||
  </section>
 | 
			
		||||
  <section xml:id="os-flavor-manage-v2.1">
 | 
			
		||||
    <title>Flavors manage (flavors, os-flavor-manage)</title>
 | 
			
		||||
    <para>
 | 
			
		||||
      Creates and deletes flavors.
 | 
			
		||||
    </para>
 | 
			
		||||
    <wadl:resources
 | 
			
		||||
      href="../wadls/compute-api/src/v2.1/wadl/os-flavor-manage-v2.1.wadl"
 | 
			
		||||
      xmlns:wadl="http://wadl.dev.java.net/2009/02"/>
 | 
			
		||||
  </section>
 | 
			
		||||
  <section xml:id="keypairs-v2.1">
 | 
			
		||||
    <title>Keypairs (keypairs)</title>
 | 
			
		||||
    <para>Generates, imports, and deletes SSH keys.</para>
 | 
			
		||||
 
 | 
			
		||||
@@ -18,9 +18,11 @@
 | 
			
		||||
                &tenant_idTemplateParameter;
 | 
			
		||||
                <resource id="flavors" path="flavors">
 | 
			
		||||
                    <method href="#listFlavors"/>
 | 
			
		||||
                    <method href="#createFlavor"/>
 | 
			
		||||
                    <resource id="flavor_id" path="{flavor_id}">
 | 
			
		||||
                         &flavor_idTemplateParameter;
 | 
			
		||||
                        <method href="#showFlavor"/>
 | 
			
		||||
                        <method href="#deleteFlavor"/>
 | 
			
		||||
                    </resource>
 | 
			
		||||
                    <resource id="detail" path="detail">
 | 
			
		||||
                        <method href="#listDetailFlavors"/>
 | 
			
		||||
@@ -85,4 +87,35 @@
 | 
			
		||||
            </representation>
 | 
			
		||||
        </response>
 | 
			
		||||
    </method>
 | 
			
		||||
    <method name="POST" id="createFlavor">
 | 
			
		||||
        <wadl:doc xml:lang="EN" title="Create flavor"
 | 
			
		||||
            xmlns="http://docbook.org/ns/docbook">
 | 
			
		||||
            <para role="shortdesc">Creates a flavor.</para>
 | 
			
		||||
        </wadl:doc>
 | 
			
		||||
        <request>
 | 
			
		||||
            <representation mediaType="application/json">
 | 
			
		||||
                <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook">
 | 
			
		||||
                    <xsdxt:code
 | 
			
		||||
                        href="../samples/flavors/flavor-create-request.json"
 | 
			
		||||
                    />
 | 
			
		||||
                </wadl:doc>
 | 
			
		||||
            </representation>
 | 
			
		||||
        </request>
 | 
			
		||||
        <response status="200">
 | 
			
		||||
            <representation mediaType="application/json">
 | 
			
		||||
                <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook">
 | 
			
		||||
                    <xsdxt:code
 | 
			
		||||
                        href="../samples/flavors/flavor-create-response.json"
 | 
			
		||||
                    />
 | 
			
		||||
                </wadl:doc>
 | 
			
		||||
            </representation>
 | 
			
		||||
        </response>
 | 
			
		||||
    </method>
 | 
			
		||||
    <method name="DELETE" id="deleteFlavor">
 | 
			
		||||
        <wadl:doc xml:lang="EN" title="Delete flavor"
 | 
			
		||||
            xmlns="http://docbook.org/ns/docbook">
 | 
			
		||||
            <para role="shortdesc">Deletes a flavor.</para>
 | 
			
		||||
        </wadl:doc>
 | 
			
		||||
        <response status="202"/>
 | 
			
		||||
    </method>
 | 
			
		||||
</application>
 | 
			
		||||
 
 | 
			
		||||
@@ -1,61 +0,0 @@
 | 
			
		||||
<?xml version="1.0" encoding="UTF-8"?>
 | 
			
		||||
<!-- (C) 2014-2016 OpenStack Foundation, All Rights Reserved -->
 | 
			
		||||
<!DOCTYPE application [
 | 
			
		||||
    <!ENTITY % common  SYSTEM "../common.ent">
 | 
			
		||||
    %common;
 | 
			
		||||
    <!ENTITY % common_project  SYSTEM "../../../../common_project.ent">
 | 
			
		||||
    %common_project;
 | 
			
		||||
]>
 | 
			
		||||
<application xmlns="http://wadl.dev.java.net/2009/02"
 | 
			
		||||
    xmlns:wadl="http://wadl.dev.java.net/2009/02"
 | 
			
		||||
    xmlns:xsd="http://docs.rackspacecloud.com/xsd/v1.0"
 | 
			
		||||
    xmlns:xsdxt="http://docs.rackspacecloud.com/xsd-ext/v1.0"
 | 
			
		||||
    xmlns:csapi="http://docs.openstack.org/identity/api/v3">
 | 
			
		||||
    <resources base="http://www.example.com" xml:id="os-flavor-manage-v2.1">
 | 
			
		||||
        <resource path="//v2.1">
 | 
			
		||||
            <resource id="tenant_id" path="{tenant_id}">
 | 
			
		||||
                &tenant_idTemplateParameter;
 | 
			
		||||
                <resource path="flavors" id="flavors">
 | 
			
		||||
                    <resource id="os-flavor-manage" path="os-flavor-manage">
 | 
			
		||||
                        <method href="#createFlavor"/>
 | 
			
		||||
                        <resource path="{flavor_id}" id="flavor_id">
 | 
			
		||||
                             &flavor_idTemplateParameter;
 | 
			
		||||
                            <method href="#deleteFlavor"/>
 | 
			
		||||
                        </resource>
 | 
			
		||||
                    </resource>
 | 
			
		||||
                </resource>
 | 
			
		||||
            </resource>
 | 
			
		||||
        </resource>
 | 
			
		||||
    </resources>
 | 
			
		||||
    <method name="POST" id="createFlavor">
 | 
			
		||||
        <wadl:doc xml:lang="EN" title="Create flavor"
 | 
			
		||||
            xmlns="http://docbook.org/ns/docbook">
 | 
			
		||||
            <para role="shortdesc">Creates a flavor.</para>
 | 
			
		||||
        </wadl:doc>
 | 
			
		||||
        <request>
 | 
			
		||||
            <representation mediaType="application/json">
 | 
			
		||||
                <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook">
 | 
			
		||||
                    <xsdxt:code
 | 
			
		||||
                        href="../samples/os-flavor-manage/flavor-create-request.json"
 | 
			
		||||
                    />
 | 
			
		||||
                </wadl:doc>
 | 
			
		||||
            </representation>
 | 
			
		||||
        </request>
 | 
			
		||||
        <response status="200">
 | 
			
		||||
            <representation mediaType="application/json">
 | 
			
		||||
                <wadl:doc xml:lang="EN" xmlns="http://docbook.org/ns/docbook">
 | 
			
		||||
                    <xsdxt:code
 | 
			
		||||
                        href="../samples/os-flavor-manage/flavor-create-response.json"
 | 
			
		||||
                    />
 | 
			
		||||
                </wadl:doc>
 | 
			
		||||
            </representation>
 | 
			
		||||
        </response>
 | 
			
		||||
    </method>
 | 
			
		||||
    <method name="DELETE" id="deleteFlavor">
 | 
			
		||||
        <wadl:doc xml:lang="EN" title="Delete flavor"
 | 
			
		||||
            xmlns="http://docbook.org/ns/docbook">
 | 
			
		||||
            <para role="shortdesc">Deletes a flavor.</para>
 | 
			
		||||
        </wadl:doc>
 | 
			
		||||
        <response status="202"/>
 | 
			
		||||
    </method>
 | 
			
		||||
</application>
 | 
			
		||||
		Reference in New Issue
	
	Block a user