From 4885dc0ed41fd1ee1ae82d0f7d407870457851e0 Mon Sep 17 00:00:00 2001 From: Cathy Zhang Date: Thu, 9 Jan 2020 16:32:41 +0800 Subject: [PATCH] src: Update test_valid_vm_config_net with new option for virtio-net There are two new options num_queues and queue_size defined for virtio-net, add them in test_valid_vm_config_net which is used to validate that both the CLI and the OpenAPI will generate the same configuration. Signed-off-by: Cathy Zhang --- src/main.rs | 64 ++++++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 58 insertions(+), 6 deletions(-) diff --git a/src/main.rs b/src/main.rs index cb32d3939..f1c1de52d 100755 --- a/src/main.rs +++ b/src/main.rs @@ -710,11 +710,63 @@ mod unit_tests { vec![ "cloud-hypervisor", "--net", - "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8,iommu=on", + "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8,num_queues=4", ], r#"{ "net": [ - {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8", "iommu": true} + {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8", "num_queues": 4} + ] + }"#, + true, + ), + ( + vec![ + "cloud-hypervisor", + "--net", + "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8,num_queues=4,queue_size=128", + ], + r#"{ + "net": [ + {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8", "num_queues": 4, "queue_size": 128} + ] + }"#, + true, + ), + ( + vec![ + "cloud-hypervisor", + "--net", + "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8,num_queues=2,queue_size=256", + ], + r#"{ + "net": [ + {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8"} + ] + }"#, + true, + ), + ( + vec![ + "cloud-hypervisor", + "--net", + "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8", + ], + r#"{ + "net": [ + {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8", "num_queues": 2, "queue_size": 256} + ] + }"#, + true, + ), + ( + vec![ + "cloud-hypervisor", + "--net", + "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8,num_queues=2,queue_size=256,iommu=on", + ], + r#"{ + "net": [ + {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8", "num_queues": 2, "queue_size": 256, "iommu": true} ] }"#, false, @@ -723,11 +775,11 @@ mod unit_tests { vec![ "cloud-hypervisor", "--net", - "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8,iommu=on", + "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8,num_queues=2,queue_size=256,iommu=on", ], r#"{ "net": [ - {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8", "iommu": true} + {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8", "num_queues": 2, "queue_size": 256, "iommu": true} ], "iommu": true }"#, @@ -737,11 +789,11 @@ mod unit_tests { vec![ "cloud-hypervisor", "--net", - "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8,iommu=off", + "mac=12:34:56:78:90:ab,tap=tap0,ip=1.2.3.4,mask=5.6.7.8,num_queues=2,queue_size=256,iommu=off", ], r#"{ "net": [ - {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8", "iommu": false} + {"mac": "12:34:56:78:90:ab", "tap": "tap0", "ip": "1.2.3.4", "mask": "5.6.7.8", "num_queues": 2, "queue_size": 256, "iommu": false} ] }"#, true,