Merge "Include list of attached volumes with instance info"

This commit is contained in:
Jenkins
2013-05-15 18:41:27 +00:00
committed by Gerrit Code Review
32 changed files with 82 additions and 26 deletions

View File

@@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-02T02:11:56Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

View File

@@ -51,6 +51,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-02T02:11:56Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-02T02:11:55Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-02T02:11:58Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-01-30T13:38:49Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-01-30T13:26:52Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

View File

@@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:46:29Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:40:59Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

View File

@@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:46:29Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:40:59Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

View File

@@ -52,6 +52,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-11-15T19:27:04Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -53,7 +53,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-11-15T19:27:05Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

View File

@@ -52,6 +52,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T19:35:10Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -53,7 +53,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-05T07:34:10Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

View File

@@ -51,6 +51,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-09-25T13:36:09Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -66,6 +66,10 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:58:57Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
}

View File

@@ -15,6 +15,8 @@
OS-EXT-IPS-MAC:mac_addr="00:0c:29:e1:42:90"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/6be39927-53b2-4aee-8593-1c72b3673168" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/6be39927-53b2-4aee-8593-1c72b3673168" rel="bookmark"/>
<security_groups>

View File

@@ -67,7 +67,11 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-07T18:58:57Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
]
}

View File

@@ -15,6 +15,8 @@
<ip OS-EXT-IPS:type="fixed" version="4" addr="192.168.0.3" OS-EXT-IPS-MAC:mac_addr="00:0c:29:e1:42:90"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/b45edf9d-30f6-41e8-a00b-ef8962376586" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/b45edf9d-30f6-41e8-a00b-ef8962376586" rel="bookmark"/>
<security_groups>

View File

@@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-04T13:17:51Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -51,7 +51,8 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-02-04T13:21:44Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
]
}

View File

@@ -49,6 +49,10 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-19T20:32:42Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
}

View File

@@ -14,6 +14,8 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/b8b02dd4-b2bb-441d-b52a-ee5c89c832d2" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/b8b02dd4-b2bb-441d-b52a-ee5c89c832d2" rel="bookmark"/>
</server>

View File

@@ -50,7 +50,11 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-12-19T20:32:39Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
]
}

View File

@@ -15,6 +15,8 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/55db7849-8ec4-46dd-8897-492d82282f29" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/55db7849-8ec4-46dd-8897-492d82282f29" rel="bookmark"/>
</server>

View File

@@ -48,6 +48,7 @@
"status": "RESCUE",
"tenant_id": "openstack",
"updated": "2012-09-19T09:22:27Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -49,6 +49,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-09-19T09:22:28Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -50,6 +50,7 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-09-12T17:20:37Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": []
}
}

View File

@@ -49,6 +49,10 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-08-20T21:11:09Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
}

View File

@@ -14,6 +14,8 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/3f9f7d18-aaf3-4703-b368-ea9b4d609c95" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/3f9f7d18-aaf3-4703-b368-ea9b4d609c95" rel="bookmark"/>
</server>

View File

@@ -50,7 +50,11 @@
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2012-09-07T16:56:37Z",
"user_id": "fake"
"user_id": "fake",
"volumes_attached": [
{"id": "volume_id1"},
{"id": "volume_id2"}
]
}
]
}

View File

@@ -15,6 +15,8 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<volume_attached id="volume_id1"/>
<volume_attached id="volume_id2"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/7c3c0f79-343e-4b99-93bc-2ade47641e64" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/7c3c0f79-343e-4b99-93bc-2ade47641e64" rel="bookmark"/>
</server>