deltacloud-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Michal Fojtik <mfoj...@redhat.com>
Subject Re: [PATCH] Update CIMI fixtures for server tests (fixes failing build http://travis-ci.org/#!/mifo/deltacloud/jobs/2393329)
Date Mon, 10 Sep 2012 13:02:31 GMT
On Sep 10, 2012, at 11:51 AM, marios@redhat.com wrote:

ACK.

  -- Michal

> From: marios <marios@redhat.com>
> 
> 
> Signed-off-by: marios <marios@redhat.com>
> ---
> server/tests/cimi/spec/cimi/data/machine.json      | 25 ++++------------------
> server/tests/cimi/spec/cimi/data/machine.xml       | 22 ++++---------------
> .../cimi/spec/cimi/data/machine_configuration.json |  6 +++---
> .../cimi/spec/cimi/data/machine_configuration.xml  |  4 ++--
> 4 files changed, 13 insertions(+), 44 deletions(-)
> 
> diff --git a/server/tests/cimi/spec/cimi/data/machine.json b/server/tests/cimi/spec/cimi/data/machine.json
> index 728ff5c..0c1bdbd 100644
> --- a/server/tests/cimi/spec/cimi/data/machine.json
> +++ b/server/tests/cimi/spec/cimi/data/machine.json
> @@ -5,27 +5,10 @@
>   "properties": { "owner_id": "mockuser" },
>   "state": "STARTED",
>   "cpu": "4",
> -  "memory": { "quantity": "1", "units": "gibibyte" },
> -  "disks" : [
> -    { "capacity": { "quantity": "1", "units": "terabyte" } }
> -  ],
> -  "volumes": [{
> -    "href": "http://cimi.example.org/volumes/1",
> -    "attachmentPoint": "/dev/sda",
> -    "protocol": "nfs"
> -  }],
> -  "networkInterfaces": [{
> -    "vsp": { "href": "http://cimi.example.org/vsps/2" },
> -    "hostname": "machine1.cimi.example.org",
> -    "macAddress": "00:11:22:33:44:56",
> -    "state": "UP",
> -    "protocol": "TCP",
> -    "allocation": "static",
> -    "address": "192.168.0.18",
> -    "defaultGateway": "192.168.0.1",
> -    "dns": "192.168.0.1",
> -    "maxTransmissionUnit": "1500"
> -  }],
> +  "memory":12582912,
> +  "disks":{"href":"http://cimi.example.org/cimi/machines/1/disks"},
> +  "volumes":{"href":"http://cimi.example.org/cimi/machines/1/volumes"},
> +  "networkInterfaces":{"href":"http://cimi.example.org/cimi/machines/1/network_interfaces"},
>   "meters": [
>     { "href": "http://cimi.example.org/meters/1" }
>   ],
> diff --git a/server/tests/cimi/spec/cimi/data/machine.xml b/server/tests/cimi/spec/cimi/data/machine.xml
> index 37b6582..e536013 100644
> --- a/server/tests/cimi/spec/cimi/data/machine.xml
> +++ b/server/tests/cimi/spec/cimi/data/machine.xml
> @@ -5,25 +5,11 @@
>   <created>2011-11-21</created>
>   <property name="owner_id">mockuser</property>
>   <cpu>4</cpu>
> -  <memory quantity="1" units="gibibyte"/>
> +  <memory>12582912</memory>
> +  <disks href="http://cimi.example.org/cimi/machines/1/disks" />
> +  <volumes href="http://cimi.example.org/cimi/machines/1/volumes" />
> +  <networkInterfaces href="http://cimi.example.org/cimi/machines/1/network_interfaces"
/>
>   <state>STARTED</state>
> -  <disk>
> -    <capacity quantity="1" units="terabyte"/>
> -  </disk>
> -  <volume href="http://cimi.example.org/volumes/1"
> -          attachmentPoint="/dev/sda" protocol="nfs" />
> -  <networkInterface>
> -    <vsp href="http://cimi.example.org/vsps/2"/>
> -    <hostname>machine1.cimi.example.org</hostname>
> -    <macAddress>00:11:22:33:44:56</macAddress>
> -    <state>UP</state>
> -    <protocol>TCP</protocol>
> -    <allocation>static</allocation>
> -    <address>192.168.0.18</address>
> -    <defaultGateway>192.168.0.1</defaultGateway>
> -    <dns>192.168.0.1</dns>
> -    <maxTransmissionUnit>1500</maxTransmissionUnit>
> -  </networkInterface>
>   <meter href="http://cimi.example.org/meters/1"/>
>   <eventLog href="http://cimi.example.org/event_logs/1"/>
>   <operation rel="edit" href="http://cimi.example.org/machines/1/edit"/>
> diff --git a/server/tests/cimi/spec/cimi/data/machine_configuration.json b/server/tests/cimi/spec/cimi/data/machine_configuration.json
> index 40c77ad..3f28c22 100644
> --- a/server/tests/cimi/spec/cimi/data/machine_configuration.json
> +++ b/server/tests/cimi/spec/cimi/data/machine_configuration.json
> @@ -4,9 +4,9 @@
>   "description": "Example MachineConfiguration One",
>   "created": "2011-11-14",
>   "cpu": "2",
> -  "memory" : { "quantity": "1", "units": "gigabyte" },
> -  "disks" : [
> -    { "capacity": { "quantity": "1", "units": "terabyte" } }
> +  "memory":1048576,
> +  "disks": [
> +    {"capacity":1073741824}
>   ],
>   "properties": { "architecture": "i386" },
>   "operations": [
> diff --git a/server/tests/cimi/spec/cimi/data/machine_configuration.xml b/server/tests/cimi/spec/cimi/data/machine_configuration.xml
> index b3810a3..095d0aa 100644
> --- a/server/tests/cimi/spec/cimi/data/machine_configuration.xml
> +++ b/server/tests/cimi/spec/cimi/data/machine_configuration.xml
> @@ -5,9 +5,9 @@
>   <created>2011-11-14</created>
>   <property name="architecture">i386</property>
>   <cpu>2</cpu>
> -  <memory quantity="1" units="gigabyte"/>
> +  <memory>1048576</memory>
>   <disk>
> -    <capacity quantity="1" units="terabyte"/>
> +    <capacity>1073741824</capacity>
>   </disk>
>   <operation rel="edit" href="http://cimi.example.org/machine_configurations/1/edit"/>
>   <operation rel="delete" href="http://cimi.example.org/machine_configurations/1/delete"/>
> -- 
> 1.7.11.4
> 

Michal Fojtik
http://deltacloud.org
mfojtik@redhat.com




Mime
View raw message