Merge "Add api-samples to multinic extension"

17 files changed, 170 insertions, 1 deletions

diff --git a/doc/api_samples/NMN/multinic-add-fixed-ip-req.json b/doc/api_samples/NMN/multinic-add-fixed-ip-req.json
new file mode 100644
index 000000000..860308403
--- /dev/null
+++ b/doc/api_samples/NMN/multinic-add-fixed-ip-req.json
@@ -0,0 +1,5 @@
+{
+    "addFixedIp":{
+        "networkId": 1
+        }
+}
diff --git a/doc/api_samples/NMN/multinic-add-fixed-ip-req.xml b/doc/api_samples/NMN/multinic-add-fixed-ip-req.xml
new file mode 100644
index 000000000..4c72212a7
--- /dev/null
+++ b/doc/api_samples/NMN/multinic-add-fixed-ip-req.xml
@@ -0,0 +1,3 @@
+<addFixedIp>
+    <networkId>1</networkId>
+</addFixedIp>
diff --git a/doc/api_samples/NMN/multinic-remove-fixed-ip-req.json b/doc/api_samples/NMN/multinic-remove-fixed-ip-req.json
new file mode 100644
index 000000000..0756d039e
--- /dev/null
+++ b/doc/api_samples/NMN/multinic-remove-fixed-ip-req.json
@@ -0,0 +1,5 @@
+{
+    "removeFixedIp":{
+        "address": "10.0.0.2"
+        }
+}
diff --git a/doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml b/doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml
new file mode 100644
index 000000000..4e6ccdd87
--- /dev/null
+++ b/doc/api_samples/NMN/multinic-remove-fixed-ip-req.xml
@@ -0,0 +1,3 @@
+<removeFixedIp>
+    <address>10.0.0.2</address>
+</removeFixedIp>
diff --git a/doc/api_samples/NMN/server-post-req.json b/doc/api_samples/NMN/server-post-req.json
new file mode 100644
index 000000000..d88eb4122
--- /dev/null
+++ b/doc/api_samples/NMN/server-post-req.json
@@ -0,0 +1,16 @@
+{
+    "server" : {
+        "name" : "new-server-test",
+        "imageRef" : "http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b",
+        "flavorRef" : "http://openstack.example.com/openstack/flavors/1",
+        "metadata" : {
+            "My Server Name" : "Apache1"
+        },
+        "personality" : [
+            {
+                "path" : "/etc/banner.txt",
+                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/NMN/server-post-req.xml b/doc/api_samples/NMN/server-post-req.xml
new file mode 100644
index 000000000..0a3c8bb53
--- /dev/null
+++ b/doc/api_samples/NMN/server-post-req.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" flavorRef="http://openstack.example.com/openstack/flavors/1" name="new-server-test">
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <personality>
+    <file path="/etc/banner.txt">
+        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
+        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
+        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
+        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
+        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
+        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
+        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
+        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
+        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
+    </file>
+  </personality>
+</server>
\ No newline at end of file
diff --git a/doc/api_samples/NMN/server-post-resp.json b/doc/api_samples/NMN/server-post-resp.json
new file mode 100644
index 000000000..09d9fb612
--- /dev/null
+++ b/doc/api_samples/NMN/server-post-resp.json
@@ -0,0 +1,16 @@
+{
+    "server": {
+        "adminPass": "xrDLoBeMD28B",
+        "id": "3f69b6bd-00a8-4636-96ee-650093624304",
+        "links": [
+            {
+                "href": "http://openstack.example.com/v2/openstack/servers/3f69b6bd-00a8-4636-96ee-650093624304",
+                "rel": "self"
+            },
+            {
+                "href": "http://openstack.example.com/openstack/servers/3f69b6bd-00a8-4636-96ee-650093624304",
+                "rel": "bookmark"
+            }
+        ]
+    }
+}
\ No newline at end of file
diff --git a/doc/api_samples/NMN/server-post-resp.xml b/doc/api_samples/NMN/server-post-resp.xml
new file mode 100644
index 000000000..7f84ac03d
--- /dev/null
+++ b/doc/api_samples/NMN/server-post-resp.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" adminPass="uF9wWxBh3mWL">
+  <metadata/>
+  <atom:link href="http://openstack.example.com/v2/openstack/servers/6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" rel="self"/>
+  <atom:link href="http://openstack.example.com/openstack/servers/6ed1d112-6c33-4c8b-9780-e2f978bf5ffd" rel="bookmark"/>
+</server>
\ No newline at end of file
diff --git a/nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.json.tpl b/nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.json.tpl
new file mode 100644
index 000000000..b9744ab2c
--- /dev/null
+++ b/nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.json.tpl
@@ -0,0 +1,5 @@
+{
+    "addFixedIp":{
+        "networkId": %(networkId)s
+        }
+}
diff --git a/nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl b/nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl
new file mode 100644
index 000000000..ad1112912
--- /dev/null
+++ b/nova/tests/integrated/api_samples/NMN/multinic-add-fixed-ip-req.xml.tpl
@@ -0,0 +1,3 @@
+<addFixedIp>
+    <networkId>%(networkId)s</networkId>
+</addFixedIp>
diff --git a/nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.json.tpl b/nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.json.tpl
new file mode 100644
index 000000000..7367e1242
--- /dev/null
+++ b/nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.json.tpl
@@ -0,0 +1,5 @@
+{
+    "removeFixedIp":{
+        "address": "%(ip)s"
+        }
+}
diff --git a/nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl b/nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl
new file mode 100644
index 000000000..10b722220
--- /dev/null
+++ b/nova/tests/integrated/api_samples/NMN/multinic-remove-fixed-ip-req.xml.tpl
@@ -0,0 +1,3 @@
+<removeFixedIp>
+    <address>%(ip)s</address>
+</removeFixedIp>
diff --git a/nova/tests/integrated/api_samples/NMN/server-post-req.json.tpl b/nova/tests/integrated/api_samples/NMN/server-post-req.json.tpl
new file mode 100644
index 000000000..d3916d1aa
--- /dev/null
+++ b/nova/tests/integrated/api_samples/NMN/server-post-req.json.tpl
@@ -0,0 +1,16 @@
+{
+    "server" : {
+        "name" : "new-server-test",
+        "imageRef" : "%(host)s/openstack/images/%(image_id)s",
+        "flavorRef" : "%(host)s/openstack/flavors/1",
+        "metadata" : {
+            "My Server Name" : "Apache1"
+        },
+        "personality" : [
+            {
+                "path" : "/etc/banner.txt",
+                "contents" : "ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBpdCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5kIGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVsc2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4gQnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRoZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlvdSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vyc2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6b25zLiINCg0KLVJpY2hhcmQgQmFjaA=="
+            }
+        ]
+    }
+}
diff --git a/nova/tests/integrated/api_samples/NMN/server-post-req.xml.tpl b/nova/tests/integrated/api_samples/NMN/server-post-req.xml.tpl
new file mode 100644
index 000000000..f92614984
--- /dev/null
+++ b/nova/tests/integrated/api_samples/NMN/server-post-req.xml.tpl
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<server xmlns="http://docs.openstack.org/compute/api/v1.1" imageRef="%(host)s/openstack/images/%(image_id)s" flavorRef="%(host)s/openstack/flavors/1" name="new-server-test">
+  <metadata>
+    <meta key="My Server Name">Apache1</meta>
+  </metadata>
+  <personality>
+    <file path="/etc/banner.txt">
+        ICAgICAgDQoiQSBjbG91ZCBkb2VzIG5vdCBrbm93IHdoeSBp
+        dCBtb3ZlcyBpbiBqdXN0IHN1Y2ggYSBkaXJlY3Rpb24gYW5k
+        IGF0IHN1Y2ggYSBzcGVlZC4uLkl0IGZlZWxzIGFuIGltcHVs
+        c2lvbi4uLnRoaXMgaXMgdGhlIHBsYWNlIHRvIGdvIG5vdy4g
+        QnV0IHRoZSBza3kga25vd3MgdGhlIHJlYXNvbnMgYW5kIHRo
+        ZSBwYXR0ZXJucyBiZWhpbmQgYWxsIGNsb3VkcywgYW5kIHlv
+        dSB3aWxsIGtub3csIHRvbywgd2hlbiB5b3UgbGlmdCB5b3Vy
+        c2VsZiBoaWdoIGVub3VnaCB0byBzZWUgYmV5b25kIGhvcml6
+        b25zLiINCg0KLVJpY2hhcmQgQmFjaA==
+    </file>
+  </personality>
+</server>
diff --git a/nova/tests/integrated/api_samples/NMN/server-post-resp.json.tpl b/nova/tests/integrated/api_samples/NMN/server-post-resp.json.tpl
new file mode 100644
index 000000000..d5f030c87
--- /dev/null
+++ b/nova/tests/integrated/api_samples/NMN/server-post-resp.json.tpl
@@ -0,0 +1,16 @@
+{
+    "server": {
+        "adminPass": "%(password)s",
+        "id": "%(id)s",
+        "links": [
+            {
+                "href": "%(host)s/v2/openstack/servers/%(uuid)s",
+                "rel": "self"
+            },
+            {
+                "href": "%(host)s/openstack/servers/%(uuid)s",
+                "rel": "bookmark"
+            }
+        ]
+    }
+}
diff --git a/nova/tests/integrated/api_samples/NMN/server-post-resp.xml.tpl b/nova/tests/integrated/api_samples/NMN/server-post-resp.xml.tpl
new file mode 100644
index 000000000..3bb13e69b
--- /dev/null
+++ b/nova/tests/integrated/api_samples/NMN/server-post-resp.xml.tpl
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="%(id)s" adminPass="%(password)s">
+  <metadata/>
+  <atom:link href="%(host)s/v2/openstack/servers/%(uuid)s" rel="self"/>
+  <atom:link href="%(host)s/openstack/servers/%(uuid)s" rel="bookmark"/>
+</server>
diff --git a/nova/tests/integrated/test_api_samples.py b/nova/tests/integrated/test_api_samples.py
index a7c216db1..f37b3ac5d 100644
--- a/nova/tests/integrated/test_api_samples.py
+++ b/nova/tests/integrated/test_api_samples.py
@@ -377,7 +377,6 @@ class ApiSamplesTrap(ApiSampleTestBase):
         # NOT be allowed to grow, and should shrink to zero (and be
         # removed) soon.
         do_not_approve_additions = []
-        do_not_approve_additions.append('NMN')
         do_not_approve_additions.append('os-config-drive')
         do_not_approve_additions.append('os-create-server-ext')
         do_not_approve_additions.append('os-flavor-access')
@@ -2743,6 +2742,30 @@ class FloatingIPPoolsSampleJsonTests(ApiSampleTestBase):
 
 
 class FloatingIPPoolsSampleXmlTests(FloatingIPPoolsSampleJsonTests):
+    ctype = 'xml'
+
+
+class MultinicSampleJsonTest(ServersSampleBase):
+    extension_name = "nova.api.openstack.compute.contrib.multinic.Multinic"
+
+    def setUp(self):
+        super(MultinicSampleJsonTest, self).setUp()
+        self.uuid = self._post_server()
+
+    def test_add_fixed_ip(self):
+        subs = {"networkId": 1}
+        response = self._do_post('servers/%s/action' % (self.uuid),
+                                 'multinic-add-fixed-ip-req', subs)
+        self.assertEqual(response.status, 202)
+
+    def test_remove_fixed_ip(self):
+        subs = {"ip": "10.0.0.2"}
+        response = self._do_post('servers/%s/action' % (self.uuid),
+                                 'multinic-remove-fixed-ip-req', subs)
+        self.assertEqual(response.status, 202)
+
+
+class MultinicSampleXmlTest(MultinicSampleJsonTest):
     ctype = "xml"