@@ -315,45 +315,13 @@ def test_detail_vs_ptr_error(self):
315315
316316 def test_create_options (self ):
317317 result = self .run_command (['vs' , 'create-options' ])
318- expected_json_result = [
319- [
320- {"datacenter" : "ams01" },
321- {"datacenter" : "dal05" }
322- ],
323- [
324- {"flavor" : "balanced" , "value" : ["B1_1X2X25" , "B1_1X2X100" ]},
325- {"flavor" : "balanced local - hdd" , "value" : ["BL1_1X2X100" ]},
326- {"flavor" : "balanced local - ssd" , "value" : ["BL2_1X2X100" ]},
327- {"flavor" : "compute" , "value" : ["C1_1X2X25" ]},
328- {"flavor" : "memory" , "value" : ["M1_1X2X100" ]},
329- {"flavor" : "GPU" , "value" : ["AC1_1X2X100" , "ACL1_1X2X100" ]},
330- {"flavor" : "transient" , "value" : ["B1_1X2X25_TRANSIENT" ]}
331- ],
332- [
333- {"cpu" : "standard" , "value" : [1 , 2 , 3 , 4 ]},
334- {"cpu" : "dedicated" , "value" : [1 ]},
335- {"cpu" : "dedicated host" , "value" : [4 , 56 ]}
336- ],
337- [
338- {"memory" : "standard" , "value" : [1024 , 2048 , 3072 , 4096 ]},
339- {"memory" : "dedicated host" , "value" : [8192 , 65536 ]}
340- ],
341- [
342- {"os" : "CENTOS" , "value" : "CENTOS_6_64" },
343- {"os" : "DEBIAN" , "value" : "DEBIAN_7_64" },
344- {"os" : "UBUNTU" , "value" : "UBUNTU_12_64" }
345- ],
346- [
347- {"disk" : "local disk(0)" , "value" : ["25" , "100" ]}
348- ],
349- [
350- {"network" : "nic" , "value" : ["10" , "100" , "1000" ]},
351- {"network" : "nic (dedicated host)" , "value" : ["1000" ]}
352- ]
353- ]
354- self .maxDiff = None
355318 self .assert_no_fail (result )
356- self .assertEqual (expected_json_result , json .loads (result .output ))
319+ self .assertIn ('datacenter' , result .output )
320+ self .assertIn ('flavor' , result .output )
321+ self .assertIn ('memory' , result .output )
322+ self .assertIn ('cpu' , result .output )
323+ self .assertIn ('OS' , result .output )
324+ self .assertIn ('network' , result .output )
357325
358326 @mock .patch ('SoftLayer.CLI.formatting.confirm' )
359327 def test_dns_sync_both (self , confirm_mock ):
0 commit comments