Status: | Merged |
---|---|
Approved by: | Gavin Panella |
Approved revision: | 182 |
Merged at revision: | 181 |
Proposed branch: | lp:~allenap/gwacl/lint |
Merge into: | lp:gwacl |
Diff against target: |
318 lines (+40/-40) 11 files modified
example/storage/run.go (+8/-8) httperror.go (+1/-1) management_base.go (+4/-4) names.go (+2/-2) poller.go (+1/-1) poller_test.go (+1/-1) x509dispatcher.go (+1/-1) x509dispatcher_test.go (+4/-4) x509session_test.go (+1/-1) xmlobjects.go (+2/-2) xmlobjects_test.go (+15/-15) |
To merge this branch: | bzr merge lp:~allenap/gwacl/lint |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Gavin Panella | Approve | ||
Review via email: mp+174430@code.launchpad.net |
Commit message
Reformat code and remove trailing white-space.
Description of the change
To post a comment you must log in.
Revision history for this message
Gavin Panella (allenap) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'example/storage/run.go' | |||
2 | --- example/storage/run.go 2013-06-25 05:55:14 +0000 | |||
3 | +++ example/storage/run.go 2013-07-12 14:49:28 +0000 | |||
4 | @@ -140,31 +140,31 @@ | |||
5 | 140 | invocation parameters: | 140 | invocation parameters: |
6 | 141 | 141 | ||
7 | 142 | Show existing storage containers: | 142 | Show existing storage containers: |
9 | 143 | listcontainers | 143 | listcontainers |
10 | 144 | 144 | ||
11 | 145 | List files in a container: | 145 | List files in a container: |
12 | 146 | -container=<container> list | 146 | -container=<container> list |
13 | 147 | 147 | ||
14 | 148 | Set access on a container: | 148 | Set access on a container: |
16 | 149 | -container=<container> -acl <container|blob|private> containeracl | 149 | -container=<container> -acl <container|blob|private> containeracl |
17 | 150 | 150 | ||
18 | 151 | Get a file from a container (it's returned on stdout): | 151 | Get a file from a container (it's returned on stdout): |
21 | 152 | -container=<container> -filename=<filename> getblob | 152 | -container=<container> -filename=<filename> getblob |
22 | 153 | 153 | ||
23 | 154 | Upload a file to a block blob: | 154 | Upload a file to a block blob: |
25 | 155 | -container=<container> -filename=<filename> addblock | 155 | -container=<container> -filename=<filename> addblock |
26 | 156 | 156 | ||
27 | 157 | Delete a blob: | 157 | Delete a blob: |
29 | 158 | -container=<container> -filename=<filename> deleteblob | 158 | -container=<container> -filename=<filename> deleteblob |
30 | 159 | 159 | ||
31 | 160 | Create an empty page blob: | 160 | Create an empty page blob: |
32 | 161 | -container=<container> -blobname=<blobname> -size=<bytes> | 161 | -container=<container> -blobname=<blobname> -size=<bytes> |
34 | 162 | -blobtype="page" putblob | 162 | -blobtype="page" putblob |
35 | 163 | 163 | ||
36 | 164 | Upload a file to a page blob's page. The range parameters must be | 164 | Upload a file to a page blob's page. The range parameters must be |
37 | 165 | (modulo 512)-(modulo 512 -1), eg: -pagerange=0-511 | 165 | (modulo 512)-(modulo 512 -1), eg: -pagerange=0-511 |
38 | 166 | -container=<container> -blobname=<blobname> -pagerange=<N-N> | 166 | -container=<container> -blobname=<blobname> -pagerange=<N-N> |
40 | 167 | -filename=<local file> putpage | 167 | -filename=<local file> putpage |
41 | 168 | `) | 168 | `) |
42 | 169 | } | 169 | } |
43 | 170 | 170 | ||
44 | 171 | 171 | ||
45 | === modified file 'httperror.go' | |||
46 | --- httperror.go 2013-07-11 10:48:03 +0000 | |||
47 | +++ httperror.go 2013-07-12 14:49:28 +0000 | |||
48 | @@ -95,7 +95,7 @@ | |||
49 | 95 | // the given message plus the error string from the original error. | 95 | // the given message plus the error string from the original error. |
50 | 96 | // It preserves the value of the error types it knows about (currently only | 96 | // It preserves the value of the error types it knows about (currently only |
51 | 97 | // ServerError). | 97 | // ServerError). |
53 | 98 | // | 98 | // |
54 | 99 | // The main purpose of this method is to offer a unified way to | 99 | // The main purpose of this method is to offer a unified way to |
55 | 100 | // extend the information present in errors while still not losing the | 100 | // extend the information present in errors while still not losing the |
56 | 101 | // additioning information present on specific errors gwacl knows out to extend | 101 | // additioning information present on specific errors gwacl knows out to extend |
57 | 102 | 102 | ||
58 | === modified file 'management_base.go' | |||
59 | --- management_base.go 2013-07-12 04:45:34 +0000 | |||
60 | +++ management_base.go 2013-07-12 14:49:28 +0000 | |||
61 | @@ -107,7 +107,7 @@ | |||
62 | 107 | } | 107 | } |
63 | 108 | 108 | ||
64 | 109 | // ListHostedServices loads a list of HostedServiceDescriptor objects from the | 109 | // ListHostedServices loads a list of HostedServiceDescriptor objects from the |
66 | 110 | // Azure management API. | 110 | // Azure management API. |
67 | 111 | // HostedServiceDescriptor objects contains a small subset of the fields present in | 111 | // HostedServiceDescriptor objects contains a small subset of the fields present in |
68 | 112 | // HostedService objects. | 112 | // HostedService objects. |
69 | 113 | // See http://msdn.microsoft.com/en-us/library/windowsazure/ee460781.aspx | 113 | // See http://msdn.microsoft.com/en-us/library/windowsazure/ee460781.aspx |
70 | @@ -182,7 +182,7 @@ | |||
71 | 182 | // DeleteHostedService deletes the named hosted service. | 182 | // DeleteHostedService deletes the named hosted service. |
72 | 183 | // See http://msdn.microsoft.com/en-us/library/windowsazure/gg441305.aspx | 183 | // See http://msdn.microsoft.com/en-us/library/windowsazure/gg441305.aspx |
73 | 184 | func (api *ManagementAPI) DeleteHostedService(serviceName string) error { | 184 | func (api *ManagementAPI) DeleteHostedService(serviceName string) error { |
75 | 185 | response, err := api.session.delete("services/hostedservices/" + serviceName, "2010-10-28") | 185 | response, err := api.session.delete("services/hostedservices/"+serviceName, "2010-10-28") |
76 | 186 | if err != nil { | 186 | if err != nil { |
77 | 187 | return err | 187 | return err |
78 | 188 | } | 188 | } |
79 | @@ -266,7 +266,7 @@ | |||
80 | 266 | // DeleteStorageAccount deletes a storage account. | 266 | // DeleteStorageAccount deletes a storage account. |
81 | 267 | // See http://msdn.microsoft.com/en-us/library/windowsazure/hh264517.aspx | 267 | // See http://msdn.microsoft.com/en-us/library/windowsazure/hh264517.aspx |
82 | 268 | func (api *ManagementAPI) DeleteStorageAccount(storageAccountName string) error { | 268 | func (api *ManagementAPI) DeleteStorageAccount(storageAccountName string) error { |
84 | 269 | response, err := api.session.delete("services/storageservices/" + storageAccountName, "2011-06-01") | 269 | response, err := api.session.delete("services/storageservices/"+storageAccountName, "2011-06-01") |
85 | 270 | if err != nil { | 270 | if err != nil { |
86 | 271 | return err | 271 | return err |
87 | 272 | } | 272 | } |
88 | @@ -303,7 +303,7 @@ | |||
89 | 303 | 303 | ||
90 | 304 | func (api *ManagementAPI) _DeleteDisk(diskName string) error { | 304 | func (api *ManagementAPI) _DeleteDisk(diskName string) error { |
91 | 305 | response, err := api.session.delete( | 305 | response, err := api.session.delete( |
93 | 306 | "services/disks/" + diskName, "2012-08-01") | 306 | "services/disks/"+diskName, "2012-08-01") |
94 | 307 | if err != nil { | 307 | if err != nil { |
95 | 308 | return err | 308 | return err |
96 | 309 | } | 309 | } |
97 | 310 | 310 | ||
98 | === modified file 'names.go' | |||
99 | --- names.go 2013-07-11 14:06:24 +0000 | |||
100 | +++ names.go 2013-07-12 14:49:28 +0000 | |||
101 | @@ -95,7 +95,7 @@ | |||
102 | 95 | // the same sequence! | 95 | // the same sequence! |
103 | 96 | func MakeRandomDiskName(prefix string) string { | 96 | func MakeRandomDiskName(prefix string) string { |
104 | 97 | // Azure documentation does not say what the maximum size of a disk name | 97 | // Azure documentation does not say what the maximum size of a disk name |
106 | 98 | // is. Testing indicate that 50 works. | 98 | // is. Testing indicate that 50 works. |
107 | 99 | return makeRandomIdentifier(prefix, 50) | 99 | return makeRandomIdentifier(prefix, 50) |
108 | 100 | } | 100 | } |
109 | 101 | 101 | ||
110 | @@ -110,7 +110,7 @@ | |||
111 | 110 | // the same sequence! | 110 | // the same sequence! |
112 | 111 | func MakeRandomRoleName(prefix string) string { | 111 | func MakeRandomRoleName(prefix string) string { |
113 | 112 | // Azure documentation does not say what the maximum size of a role name | 112 | // Azure documentation does not say what the maximum size of a role name |
115 | 113 | // is. Testing indicate that 50 works. | 113 | // is. Testing indicate that 50 works. |
116 | 114 | return makeRandomIdentifier(prefix, 50) | 114 | return makeRandomIdentifier(prefix, 50) |
117 | 115 | } | 115 | } |
118 | 116 | 116 | ||
119 | 117 | 117 | ||
120 | === modified file 'poller.go' | |||
121 | --- poller.go 2013-07-12 03:23:57 +0000 | |||
122 | +++ poller.go 2013-07-12 14:49:28 +0000 | |||
123 | @@ -11,7 +11,7 @@ | |||
124 | 11 | // Generic poller interface/methods. | 11 | // Generic poller interface/methods. |
125 | 12 | 12 | ||
126 | 13 | // A poller exposes two methods to query a remote server and decide when | 13 | // A poller exposes two methods to query a remote server and decide when |
128 | 14 | // the response given by the server means that the polling is finished. | 14 | // the response given by the server means that the polling is finished. |
129 | 15 | type poller interface { | 15 | type poller interface { |
130 | 16 | poll() (*x509Response, error) | 16 | poll() (*x509Response, error) |
131 | 17 | isDone(*x509Response, error) (bool, error) | 17 | isDone(*x509Response, error) (bool, error) |
132 | 18 | 18 | ||
133 | === modified file 'poller_test.go' | |||
134 | --- poller_test.go 2013-07-12 04:22:16 +0000 | |||
135 | +++ poller_test.go 2013-07-12 14:49:28 +0000 | |||
136 | @@ -184,7 +184,7 @@ | |||
137 | 184 | // it's probably worth it to thoroughly test performOperationPolling(). | 184 | // it's probably worth it to thoroughly test performOperationPolling(). |
138 | 185 | 185 | ||
139 | 186 | // Fake 2 responses in sequence: a 'InProgress' response and then a | 186 | // Fake 2 responses in sequence: a 'InProgress' response and then a |
141 | 187 | // 'Succeeded' response. | 187 | // 'Succeeded' response. |
142 | 188 | firstResponse := DispatcherResponse{ | 188 | firstResponse := DispatcherResponse{ |
143 | 189 | response: &x509Response{ | 189 | response: &x509Response{ |
144 | 190 | Body: []byte(fmt.Sprintf(operationXMLTemplate, "InProgress")), | 190 | Body: []byte(fmt.Sprintf(operationXMLTemplate, "InProgress")), |
145 | 191 | 191 | ||
146 | === modified file 'x509dispatcher.go' | |||
147 | --- x509dispatcher.go 2013-07-12 02:52:34 +0000 | |||
148 | +++ x509dispatcher.go 2013-07-12 14:49:28 +0000 | |||
149 | @@ -176,7 +176,7 @@ | |||
150 | 176 | return response, nil | 176 | return response, nil |
151 | 177 | } | 177 | } |
152 | 178 | 178 | ||
154 | 179 | // The maximum number of redirection-followings allowed. | 179 | // The maximum number of redirection-followings allowed. |
155 | 180 | var _CURL_MAX_REDIRECTS = 10 | 180 | var _CURL_MAX_REDIRECTS = 10 |
156 | 181 | 181 | ||
157 | 182 | // makeCurlRequest produces a curl.CURL representing the request. | 182 | // makeCurlRequest produces a curl.CURL representing the request. |
158 | 183 | 183 | ||
159 | === modified file 'x509dispatcher_test.go' | |||
160 | --- x509dispatcher_test.go 2013-07-12 04:25:31 +0000 | |||
161 | +++ x509dispatcher_test.go 2013-07-12 14:49:28 +0000 | |||
162 | @@ -79,7 +79,7 @@ | |||
163 | 79 | c.Assert(err, IsNil) | 79 | c.Assert(err, IsNil) |
164 | 80 | path := "/foo/bar" | 80 | path := "/foo/bar" |
165 | 81 | version := "test-version" | 81 | version := "test-version" |
167 | 82 | request := newX509RequestGET(server.URL + path, version) | 82 | request := newX509RequestGET(server.URL+path, version) |
168 | 83 | 83 | ||
169 | 84 | response, err := performX509CurlRequest(session, request) | 84 | response, err := performX509CurlRequest(session, request) |
170 | 85 | c.Assert(err, IsNil) | 85 | c.Assert(err, IsNil) |
171 | @@ -104,7 +104,7 @@ | |||
172 | 104 | c.Assert(err, IsNil) | 104 | c.Assert(err, IsNil) |
173 | 105 | path := "/foo/bar" | 105 | path := "/foo/bar" |
174 | 106 | version := "test-version" | 106 | version := "test-version" |
176 | 107 | request := newX509RequestGET(server.URL + path, version) | 107 | request := newX509RequestGET(server.URL+path, version) |
177 | 108 | 108 | ||
178 | 109 | _, err = performX509CurlRequest(session, request) | 109 | _, err = performX509CurlRequest(session, request) |
179 | 110 | c.Check(err, ErrorMatches, ".*Number of redirects hit maximum amount.*") | 110 | c.Check(err, ErrorMatches, ".*Number of redirects hit maximum amount.*") |
180 | @@ -168,7 +168,7 @@ | |||
181 | 168 | c.Assert(err, IsNil) | 168 | c.Assert(err, IsNil) |
182 | 169 | path := "/foo/bar" | 169 | path := "/foo/bar" |
183 | 170 | version := "test-version" | 170 | version := "test-version" |
185 | 171 | request := newX509RequestDELETE(server.URL + path, version) | 171 | request := newX509RequestDELETE(server.URL+path, version) |
186 | 172 | 172 | ||
187 | 173 | response, err := performX509CurlRequest(session, request) | 173 | response, err := performX509CurlRequest(session, request) |
188 | 174 | c.Assert(err, IsNil) | 174 | c.Assert(err, IsNil) |
189 | @@ -220,7 +220,7 @@ | |||
190 | 220 | session, err := newX509Session("subscriptionid", "cert.pem") | 220 | session, err := newX509Session("subscriptionid", "cert.pem") |
191 | 221 | c.Assert(err, IsNil) | 221 | c.Assert(err, IsNil) |
192 | 222 | path := "/foo/bar" | 222 | path := "/foo/bar" |
194 | 223 | request := newX509RequestGET(server.URL + path, "testversion") | 223 | request := newX509RequestGET(server.URL+path, "testversion") |
195 | 224 | 224 | ||
196 | 225 | response, err := performX509CurlRequest(session, request) | 225 | response, err := performX509CurlRequest(session, request) |
197 | 226 | c.Assert(err, IsNil) | 226 | c.Assert(err, IsNil) |
198 | 227 | 227 | ||
199 | === modified file 'x509session_test.go' | |||
200 | --- x509session_test.go 2013-07-12 04:22:16 +0000 | |||
201 | +++ x509session_test.go 2013-07-12 14:49:28 +0000 | |||
202 | @@ -193,7 +193,7 @@ | |||
203 | 193 | rigRecordingDispatcher(&recordedRequests) | 193 | rigRecordingDispatcher(&recordedRequests) |
204 | 194 | 194 | ||
205 | 195 | version := "test-version" | 195 | version := "test-version" |
207 | 196 | receivedResponse, err := session.get(uri,version) | 196 | receivedResponse, err := session.get(uri, version) |
208 | 197 | c.Assert(err, IsNil) | 197 | c.Assert(err, IsNil) |
209 | 198 | 198 | ||
210 | 199 | c.Assert(len(recordedRequests), Equals, 1) | 199 | c.Assert(len(recordedRequests), Equals, 1) |
211 | 200 | 200 | ||
212 | === modified file 'xmlobjects.go' | |||
213 | --- xmlobjects.go 2013-07-12 12:58:03 +0000 | |||
214 | +++ xmlobjects.go 2013-07-12 14:49:28 +0000 | |||
215 | @@ -157,7 +157,7 @@ | |||
216 | 157 | 157 | ||
217 | 158 | // GetLatestUbuntuImage returns the most recent released available OSImage, | 158 | // GetLatestUbuntuImage returns the most recent released available OSImage, |
218 | 159 | // for the given release name and location. The 'releaseName' parameter is | 159 | // for the given release name and location. The 'releaseName' parameter is |
220 | 160 | // the Ubuntu version number present in the 'ImageFamily' tag present in | 160 | // the Ubuntu version number present in the 'ImageFamily' tag present in |
221 | 161 | // Azure's representation of an OS Image (e.g. '12.04', '12.10'). | 161 | // Azure's representation of an OS Image (e.g. '12.04', '12.10'). |
222 | 162 | func (images *Images) GetLatestUbuntuImage(releaseName string, location string) (image *OSImage, err error) { | 162 | func (images *Images) GetLatestUbuntuImage(releaseName string, location string) (image *OSImage, err error) { |
223 | 163 | // The Less method defined above can panic if one of the published dates cannot be parsed, | 163 | // The Less method defined above can panic if one of the published dates cannot be parsed, |
224 | @@ -545,7 +545,7 @@ | |||
225 | 545 | return &operation | 545 | return &operation |
226 | 546 | } | 546 | } |
227 | 547 | 547 | ||
229 | 548 | // The Start Role operation starts a virtual machine. | 548 | // The Start Role operation starts a virtual machine. |
230 | 549 | // http://msdn.microsoft.com/en-us/library/windowsazure/jj157189.aspx | 549 | // http://msdn.microsoft.com/en-us/library/windowsazure/jj157189.aspx |
231 | 550 | var startRoleOperation = newRoleOperation("StartRoleOperation") | 550 | var startRoleOperation = newRoleOperation("StartRoleOperation") |
232 | 551 | 551 | ||
233 | 552 | 552 | ||
234 | === modified file 'xmlobjects_test.go' | |||
235 | --- xmlobjects_test.go 2013-07-11 03:41:33 +0000 | |||
236 | +++ xmlobjects_test.go 2013-07-12 14:49:28 +0000 | |||
237 | @@ -147,12 +147,12 @@ | |||
238 | 147 | <PersistentVMRole xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"> | 147 | <PersistentVMRole xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"> |
239 | 148 | <RoleName>%s</RoleName> | 148 | <RoleName>%s</RoleName> |
240 | 149 | <OsVersion>operating-system-version</OsVersion> | 149 | <OsVersion>operating-system-version</OsVersion> |
242 | 150 | <RoleType>PersistentVMRole</RoleType> | 150 | <RoleType>PersistentVMRole</RoleType> |
243 | 151 | <ConfigurationSets> | 151 | <ConfigurationSets> |
244 | 152 | <ConfigurationSet> | 152 | <ConfigurationSet> |
246 | 153 | <ConfigurationSetType>NetworkConfiguration</ConfigurationSetType> | 153 | <ConfigurationSetType>NetworkConfiguration</ConfigurationSetType> |
247 | 154 | <InputEndpoints> | 154 | <InputEndpoints> |
249 | 155 | <InputEndpoint> | 155 | <InputEndpoint> |
250 | 156 | <LoadBalancedEndpointSetName>name-of-load-balanced-endpoint-set</LoadBalancedEndpointSetName> | 156 | <LoadBalancedEndpointSetName>name-of-load-balanced-endpoint-set</LoadBalancedEndpointSetName> |
251 | 157 | <LocalPort>1</LocalPort> | 157 | <LocalPort>1</LocalPort> |
252 | 158 | <Name>name-of-input-endpoint</Name> | 158 | <Name>name-of-input-endpoint</Name> |
253 | @@ -160,12 +160,12 @@ | |||
254 | 160 | <LoadBalancerProbe> | 160 | <LoadBalancerProbe> |
255 | 161 | <Path>path-of-probe</Path> | 161 | <Path>path-of-probe</Path> |
256 | 162 | <Port>port-assigned-to-probe</Port> | 162 | <Port>port-assigned-to-probe</Port> |
258 | 163 | <Protocol>protocol-of-input-endpoint</Protocol> | 163 | <Protocol>protocol-of-input-endpoint</Protocol> |
259 | 164 | </LoadBalancerProbe> | 164 | </LoadBalancerProbe> |
261 | 165 | <Protocol>TCP|UDP</Protocol> | 165 | <Protocol>TCP|UDP</Protocol> |
262 | 166 | <Vip>virtual-ip-address-of-input-endpoint</Vip> | 166 | <Vip>virtual-ip-address-of-input-endpoint</Vip> |
263 | 167 | </InputEndpoint> | 167 | </InputEndpoint> |
265 | 168 | <InputEndpoint> | 168 | <InputEndpoint> |
266 | 169 | <LoadBalancedEndpointSetName>name-of-load-balanced-endpoint-set</LoadBalancedEndpointSetName> | 169 | <LoadBalancedEndpointSetName>name-of-load-balanced-endpoint-set</LoadBalancedEndpointSetName> |
267 | 170 | <LocalPort>2</LocalPort> | 170 | <LocalPort>2</LocalPort> |
268 | 171 | <Name>name-of-input-endpoint</Name> | 171 | <Name>name-of-input-endpoint</Name> |
269 | @@ -173,9 +173,9 @@ | |||
270 | 173 | <LoadBalancerProbe> | 173 | <LoadBalancerProbe> |
271 | 174 | <Path>path-of-probe</Path> | 174 | <Path>path-of-probe</Path> |
272 | 175 | <Port>port-assigned-to-probe</Port> | 175 | <Port>port-assigned-to-probe</Port> |
274 | 176 | <Protocol>protocol-of-input-endpoint</Protocol> | 176 | <Protocol>protocol-of-input-endpoint</Protocol> |
275 | 177 | </LoadBalancerProbe> | 177 | </LoadBalancerProbe> |
277 | 178 | <Protocol>TCP|UDP</Protocol> | 178 | <Protocol>TCP|UDP</Protocol> |
278 | 179 | <Vip>virtual-ip-address-of-input-endpoint</Vip> | 179 | <Vip>virtual-ip-address-of-input-endpoint</Vip> |
279 | 180 | </InputEndpoint> | 180 | </InputEndpoint> |
280 | 181 | </InputEndpoints> | 181 | </InputEndpoints> |
281 | @@ -187,22 +187,22 @@ | |||
282 | 187 | <AvailabilitySetName>name-of-availability-set</AvailabilitySetName> | 187 | <AvailabilitySetName>name-of-availability-set</AvailabilitySetName> |
283 | 188 | <DataVirtualHardDisks> | 188 | <DataVirtualHardDisks> |
284 | 189 | <DataVirtualHardDisk> | 189 | <DataVirtualHardDisk> |
286 | 190 | <HostCaching>host-caching-mode-of-data-disk</HostCaching> | 190 | <HostCaching>host-caching-mode-of-data-disk</HostCaching> |
287 | 191 | <DiskName>new-or-existing-disk-name</DiskName> | 191 | <DiskName>new-or-existing-disk-name</DiskName> |
288 | 192 | <Lun>logical-unit-number-of-data-disk</Lun> | 192 | <Lun>logical-unit-number-of-data-disk</Lun> |
290 | 193 | <LogicalDiskSizeInGB>size-of-data-disk</LogicalDiskSizeInGB> | 193 | <LogicalDiskSizeInGB>size-of-data-disk</LogicalDiskSizeInGB> |
291 | 194 | <MediaLink>path-to-vhd</MediaLink> | 194 | <MediaLink>path-to-vhd</MediaLink> |
292 | 195 | </DataVirtualHardDisk> | 195 | </DataVirtualHardDisk> |
293 | 196 | </DataVirtualHardDisks> | 196 | </DataVirtualHardDisks> |
294 | 197 | <OSVirtualHardDisk> | 197 | <OSVirtualHardDisk> |
297 | 198 | <HostCaching>host-caching-mode-of-os-disk</HostCaching> | 198 | <HostCaching>host-caching-mode-of-os-disk</HostCaching> |
298 | 199 | <DiskName>name-of-os-disk</DiskName> | 199 | <DiskName>name-of-os-disk</DiskName> |
299 | 200 | <MediaLink>path-to-vhd</MediaLink> | 200 | <MediaLink>path-to-vhd</MediaLink> |
300 | 201 | <SourceImageName>image-used-to-create-os-disk</SourceImageName> | 201 | <SourceImageName>image-used-to-create-os-disk</SourceImageName> |
301 | 202 | <OS>operating-system-on-os-disk</OS> | 202 | <OS>operating-system-on-os-disk</OS> |
303 | 203 | </OSVirtualHardDisk> | 203 | </OSVirtualHardDisk> |
304 | 204 | <RoleSize>size-of-instance</RoleSize> | 204 | <RoleSize>size-of-instance</RoleSize> |
306 | 205 | <DefaultWinRmCertificateThumbprint>winrm-cert-thumbprint</DefaultWinRmCertificateThumbprint> | 205 | <DefaultWinRmCertificateThumbprint>winrm-cert-thumbprint</DefaultWinRmCertificateThumbprint> |
307 | 206 | </PersistentVMRole> | 206 | </PersistentVMRole> |
308 | 207 | `, rolename) | 207 | `, rolename) |
309 | 208 | return template | 208 | return template |
310 | @@ -1099,7 +1099,7 @@ | |||
311 | 1099 | <CopyCompletionTime>copycompletiontime</CopyCompletionTime> | 1099 | <CopyCompletionTime>copycompletiontime</CopyCompletionTime> |
312 | 1100 | <CopyStatusDescription>copydesc</CopyStatusDescription> | 1100 | <CopyStatusDescription>copydesc</CopyStatusDescription> |
313 | 1101 | </Properties> | 1101 | </Properties> |
315 | 1102 | <Metadata> | 1102 | <Metadata> |
316 | 1103 | <MetaName1>metadataname1</MetaName1> | 1103 | <MetaName1>metadataname1</MetaName1> |
317 | 1104 | <MetaName2>metadataname2</MetaName2> | 1104 | <MetaName2>metadataname2</MetaName2> |
318 | 1105 | </Metadata> | 1105 | </Metadata> |