updated order bare metal example

allmightyspiff · allmightyspiff · commit 088956fec026 · 2017-09-26T16:55:58.000-05:00
diff --git a/classes/softlayer_configuration_storage_group_array_type/index.xml b/classes/softlayer_configuration_storage_group_array_type/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/classes/softlayer_product_order/index.xml b/classes/softlayer_product_order/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/classes/softlayer_product_package/index.xml b/classes/softlayer_product_package/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/index.xml b/index.xml
@@ -146,8 +146,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/python/index.xml b/python/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/python/orderbaremetal/index.html b/python/orderbaremetal/index.html
@@ -210,8 +210,8 @@ <h3>Advanced Bare Metal Server Ordering<br> <small>Explains how to build a bare
                         {
                             'domain': u'cgallo.com',
                             'hostname': u'vmware-testing01',
-                            'primaryBackendNetworkComponent': {'networkVlanId': priv_vlan_id},
-                            'primaryNetworkComponent': {'networkVlanId': pub_vlan_id}
+                            'primaryBackendNetworkComponent': {'networkVlan': {'id' : int(priv_vlan_id)}},
+                            'primaryNetworkComponent': {'networkVlan': {'id' : int(priv_vlan_id)}}
                         }
                     ],
                     'location': location_id,
diff --git a/tags/bare-metal/index.xml b/tags/bare-metal/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/tags/create/index.xml b/tags/create/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/tags/filter/index.xml b/tags/filter/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/tags/hardware/index.xml b/tags/hardware/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/tags/objectfilter/index.xml b/tags/objectfilter/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/tags/order/index.xml b/tags/order/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/tags/packages/index.xml b/tags/packages/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/tags/pricing/index.xml b/tags/pricing/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/tags/raid/index.xml b/tags/raid/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,
diff --git a/tags/vlan/index.xml b/tags/vlan/index.xml
@@ -83,8 +83,8 @@ class ordering():
                         {
                             &#39;domain&#39;: u&#39;cgallo.com&#39;,
                             &#39;hostname&#39;: u&#39;vmware-testing01&#39;,
-                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlanId&#39;: priv_vlan_id},
-                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlanId&#39;: pub_vlan_id}
+                            &#39;primaryBackendNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}},
+                            &#39;primaryNetworkComponent&#39;: {&#39;networkVlan&#39;: {&#39;id&#39; : int(priv_vlan_id)}}
                         }
                     ],
                     &#39;location&#39;: location_id,

Original file line number	Diff line number	Diff line change
`@@ -83,8 +83,8 @@ class ordering():`
`83`	`83`	`{`
`84`	`84`	`'domain': u'cgallo.com',`
`85`	`85`	`'hostname': u'vmware-testing01',`
`86`		`- 'primaryBackendNetworkComponent': {'networkVlanId': priv_vlan_id},`
`87`		`- 'primaryNetworkComponent': {'networkVlanId': pub_vlan_id}`
	`86`	`+ 'primaryBackendNetworkComponent': {'networkVlan': {'id' : int(priv_vlan_id)}},`
	`87`	`+ 'primaryNetworkComponent': {'networkVlan': {'id' : int(priv_vlan_id)}}`
`88`	`88`	`}`
`89`	`89`	`],`
`90`	`90`	`'location': location_id,`
Original file line number	Diff line number	Diff line change
`@@ -146,8 +146,8 @@ class ordering():`
`146`	`146`	`{`
`147`	`147`	`'domain': u'cgallo.com',`
`148`	`148`	`'hostname': u'vmware-testing01',`
`149`		`- 'primaryBackendNetworkComponent': {'networkVlanId': priv_vlan_id},`
`150`		`- 'primaryNetworkComponent': {'networkVlanId': pub_vlan_id}`
	`149`	`+ 'primaryBackendNetworkComponent': {'networkVlan': {'id' : int(priv_vlan_id)}},`
	`150`	`+ 'primaryNetworkComponent': {'networkVlan': {'id' : int(priv_vlan_id)}}`
`151`	`151`	`}`
`152`	`152`	`],`
`153`	`153`	`'location': location_id,`
Original file line number	Diff line number	Diff line change
`@@ -210,8 +210,8 @@ <h3>Advanced Bare Metal Server Ordering<br> <small>Explains how to build a bare`
`210`	`210`	`{`
`211`	`211`	`'domain': u'cgallo.com',`
`212`	`212`	`'hostname': u'vmware-testing01',`
`213`		`- 'primaryBackendNetworkComponent': {'networkVlanId': priv_vlan_id},`
`214`		`- 'primaryNetworkComponent': {'networkVlanId': pub_vlan_id}`
	`213`	`+ 'primaryBackendNetworkComponent': {'networkVlan': {'id' : int(priv_vlan_id)}},`
	`214`	`+ 'primaryNetworkComponent': {'networkVlan': {'id' : int(priv_vlan_id)}}`
`215`	`215`	`}`
`216`	`216`	`],`
`217`	`217`	`'location': location_id,`