Minor fixes not worthy of individual pulls

CrackerJackMack · CrackerJackMack · commit 5f911950e695 · 2013-12-17T13:49:04.000-06:00
diff --git a/SoftLayer/managers/cci.py b/SoftLayer/managers/cci.py
@@ -319,13 +319,10 @@ def _generate_create_dict(
                 {"device": "0", "diskImage": {"capacity": disks[0]}}
             ]
 
-            # disk 1 is reservered for swap
-            # XXX: enumerate(iterator, start=0) was added in 2.6. work around
-            # for 2.5 by adding 2 to the enumerated value
-            for dev_id, disk in enumerate(disks[1:]):
+            for dev_id, disk in enumerate(disks[1:], start=2):
                 data['blockDevices'].append(
                     {
-                        "device": str(dev_id + 2),
+                        "device": str(dev_id),
                         "diskImage": {"capacity": disk}
                     }
                 )
diff --git a/setup.py b/setup.py
@@ -65,7 +65,7 @@
         ],
     },
     package_data={
-        'SoftLayer': ['tests/fixtures/*'],
+        'SoftLayer': ['tests/fixtures/*.conf'],
     },
     test_suite='nose.collector',
     install_requires=requires,

Original file line number	Diff line number	Diff line change
`@@ -319,13 +319,10 @@ def _generate_create_dict(`
`319`	`319`	`{"device": "0", "diskImage": {"capacity": disks[0]}}`
`320`	`320`	`]`
`321`	`321`
`322`		`- # disk 1 is reservered for swap`
`323`		`- # XXX: enumerate(iterator, start=0) was added in 2.6. work around`
`324`		`- # for 2.5 by adding 2 to the enumerated value`
`325`		`- for dev_id, disk in enumerate(disks[1:]):`
	`322`	`+ for dev_id, disk in enumerate(disks[1:], start=2):`
`326`	`323`	`data['blockDevices'].append(`
`327`	`324`	`{`
`328`		`- "device": str(dev_id + 2),`
	`325`	`+ "device": str(dev_id),`
`329`	`326`	`"diskImage": {"capacity": disk}`
`330`	`327`	`}`
`331`	`328`	`)`