diff --git a/lib/services/computeManagement/lib/computeManagementClient.js b/lib/services/computeManagement/lib/computeManagementClient.js index 611896d840..998af2b634 100644 --- a/lib/services/computeManagement/lib/computeManagementClient.js +++ b/lib/services/computeManagement/lib/computeManagementClient.js @@ -3657,7 +3657,7 @@ var DeploymentOperations = ( /** @lends DeploymentOperations */ function() { } var typeElement = js2xml.getElement(responseDoc, resourceExtensionParameterValuesElement, 'TYPE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); - if (typeElement && (typeElement === null || typeElement === undefined || typeElement.length === 0) === false) { + if (typeElement) { var typeInstance = typeElement; resourceExtensionParameterValueInstance.type = typeInstance; } @@ -3665,7 +3665,7 @@ var DeploymentOperations = ( /** @lends DeploymentOperations */ function() { } var stateElement = js2xml.getElement(responseDoc, resourceExtensionReferencesElement, 'STATE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); - if (stateElement && (stateElement === null || stateElement === undefined || stateElement.length === 0) === false) { + if (stateElement) { var stateInstance = stateElement; resourceExtensionReferenceInstance.state = stateInstance; } @@ -3700,7 +3700,7 @@ var DeploymentOperations = ( /** @lends DeploymentOperations */ function() { var diskNameElement = js2xml.getElement(responseDoc, dataVirtualHardDisksElement, 'DISKNAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskNameElement) { var diskNameInstance = diskNameElement; - dataVirtualHardDiskInstance.diskName = diskNameInstance; + dataVirtualHardDiskInstance.name = diskNameInstance; } var lunElement = js2xml.getElement(responseDoc, dataVirtualHardDisksElement, 'LUN', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); @@ -3743,13 +3743,13 @@ var DeploymentOperations = ( /** @lends DeploymentOperations */ function() { var diskLabelElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'DISKLABEL', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskLabelElement2) { var diskLabelInstance2 = diskLabelElement2; - oSVirtualHardDiskInstance.diskLabel = diskLabelInstance2; + oSVirtualHardDiskInstance.label = diskLabelInstance2; } var diskNameElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'DISKNAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskNameElement2) { var diskNameInstance2 = diskNameElement2; - oSVirtualHardDiskInstance.diskName = diskNameInstance2; + oSVirtualHardDiskInstance.name = diskNameInstance2; } var mediaLinkElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'MEDIALINK', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); @@ -4680,7 +4680,7 @@ var DeploymentOperations = ( /** @lends DeploymentOperations */ function() { } var typeElement = js2xml.getElement(responseDoc, resourceExtensionParameterValuesElement, 'TYPE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); - if (typeElement && (typeElement === null || typeElement === undefined || typeElement.length === 0) === false) { + if (typeElement) { var typeInstance = typeElement; resourceExtensionParameterValueInstance.type = typeInstance; } @@ -4688,7 +4688,7 @@ var DeploymentOperations = ( /** @lends DeploymentOperations */ function() { } var stateElement = js2xml.getElement(responseDoc, resourceExtensionReferencesElement, 'STATE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); - if (stateElement && (stateElement === null || stateElement === undefined || stateElement.length === 0) === false) { + if (stateElement) { var stateInstance = stateElement; resourceExtensionReferenceInstance.state = stateInstance; } @@ -4723,7 +4723,7 @@ var DeploymentOperations = ( /** @lends DeploymentOperations */ function() { var diskNameElement = js2xml.getElement(responseDoc, dataVirtualHardDisksElement, 'DISKNAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskNameElement) { var diskNameInstance = diskNameElement; - dataVirtualHardDiskInstance.diskName = diskNameInstance; + dataVirtualHardDiskInstance.name = diskNameInstance; } var lunElement = js2xml.getElement(responseDoc, dataVirtualHardDisksElement, 'LUN', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); @@ -4766,13 +4766,13 @@ var DeploymentOperations = ( /** @lends DeploymentOperations */ function() { var diskLabelElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'DISKLABEL', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskLabelElement2) { var diskLabelInstance2 = diskLabelElement2; - oSVirtualHardDiskInstance.diskLabel = diskLabelInstance2; + oSVirtualHardDiskInstance.label = diskLabelInstance2; } var diskNameElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'DISKNAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskNameElement2) { var diskNameInstance2 = diskNameElement2; - oSVirtualHardDiskInstance.diskName = diskNameInstance2; + oSVirtualHardDiskInstance.name = diskNameInstance2; } var mediaLinkElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'MEDIALINK', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); @@ -7978,7 +7978,7 @@ var HostedServiceOperations = ( /** @lends HostedServiceOperations */ function() } var typeElement = js2xml.getElement(responseDoc, resourceExtensionParameterValuesElement, 'TYPE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); - if (typeElement && (typeElement === null || typeElement === undefined || typeElement.length === 0) === false) { + if (typeElement) { var typeInstance = typeElement; resourceExtensionParameterValueInstance.type = typeInstance; } @@ -7986,7 +7986,7 @@ var HostedServiceOperations = ( /** @lends HostedServiceOperations */ function() } var stateElement = js2xml.getElement(responseDoc, resourceExtensionReferencesElement, 'STATE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); - if (stateElement && (stateElement === null || stateElement === undefined || stateElement.length === 0) === false) { + if (stateElement) { var stateInstance = stateElement; resourceExtensionReferenceInstance.state = stateInstance; } @@ -8021,7 +8021,7 @@ var HostedServiceOperations = ( /** @lends HostedServiceOperations */ function() var diskNameElement = js2xml.getElement(responseDoc, dataVirtualHardDisksElement, 'DISKNAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskNameElement) { var diskNameInstance = diskNameElement; - dataVirtualHardDiskInstance.diskName = diskNameInstance; + dataVirtualHardDiskInstance.name = diskNameInstance; } var lunElement = js2xml.getElement(responseDoc, dataVirtualHardDisksElement, 'LUN', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); @@ -8064,13 +8064,13 @@ var HostedServiceOperations = ( /** @lends HostedServiceOperations */ function() var diskLabelElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'DISKLABEL', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskLabelElement2) { var diskLabelInstance2 = diskLabelElement2; - oSVirtualHardDiskInstance.diskLabel = diskLabelInstance2; + oSVirtualHardDiskInstance.label = diskLabelInstance2; } var diskNameElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'DISKNAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskNameElement2) { var diskNameInstance2 = diskNameElement2; - oSVirtualHardDiskInstance.diskName = diskNameInstance2; + oSVirtualHardDiskInstance.name = diskNameInstance2; } var mediaLinkElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'MEDIALINK', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); @@ -10006,7 +10006,7 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * * @param {string} roleName The name of the role to add the data disk to. * - * @param {VirtualMachineDiskCreateDataDiskParameters} parameters Parameters + * @param {VirtualMachineDataDiskCreateParameters} parameters Parameters * supplied to the Create Virtual Machine Data Disk operation. * * @param {VirtualHardDiskHostCaching} parameters.hostCaching Required. @@ -10015,13 +10015,13 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * ReadOnly, ReadWrite. Warning: Setting this property impacts the * consistency of the disk. * - * @param {string} [parameters.diskLabel] Optional. Specifies the description - * of the data disk. When you attach a disk, either by directly referencing - * a media using the MediaLink element or specifying the target disk size, - * you can use the DiskLabel element to customize the name property of the + * @param {string} [parameters.label] Optional. Specifies the description of + * the data disk. When you attach a disk, either by directly referencing a + * media using the MediaLink element or specifying the target disk size, you + * can use the DiskLabel element to customize the name property of the * target data disk. * - * @param {string} [parameters.diskName] Optional. Specifies the name of the + * @param {string} [parameters.name] Optional. Specifies the name of the * disk. Windows Azure uses the specified disk to create the data disk for * the machine and populates this field with the disk name. * @@ -10100,15 +10100,15 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ js2xml.setElementValue(hostCachingElement, parameters.hostCaching ? parameters.hostCaching.toString() : 'None'); js2xml.addChildElement(dataVirtualHardDiskElement, hostCachingElement); - if (parameters.diskLabel) { + if (parameters.label) { var diskLabelElement = js2xml.createElement('DiskLabel', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskLabelElement, parameters.diskLabel); + js2xml.setElementValue(diskLabelElement, parameters.label); js2xml.addChildElement(dataVirtualHardDiskElement, diskLabelElement); } - if (parameters.diskName) { + if (parameters.name) { var diskNameElement = js2xml.createElement('DiskName', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskNameElement, parameters.diskName); + js2xml.setElementValue(diskNameElement, parameters.name); js2xml.addChildElement(dataVirtualHardDiskElement, diskNameElement); } @@ -10161,8 +10161,8 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * http://msdn.microsoft.com/en-us/library/windowsazure/jj157178.aspx for * more information) * - * @param {VirtualMachineDiskCreateDiskParameters} parameters Parameters - * supplied to the Create Virtual Machine Disk operation. + * @param {VirtualMachineDiskCreateParameters} parameters Parameters supplied + * to the Create Virtual Machine Disk operation. * * @param {string} [parameters.operatingSystemType] Required. The operating * system type of the disk. Possible values are: Linux, Windows. @@ -10429,7 +10429,7 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * http://msdn.microsoft.com/en-us/library/windowsazure/jj157200.aspx for * more information) * - * @param {string} diskName The name of the disk to delete. + * @param {string} name The name of the disk to delete. * * @param {boolean} deleteFromStorage Optional. Specifies that the source * blob for the disk should also be deleted from storage. @@ -10438,13 +10438,13 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * * @returns {Stream} The response stream. */ - VirtualMachineDiskOperations.prototype.deleteDisk = function(diskName, deleteFromStorage, callback) { + VirtualMachineDiskOperations.prototype.deleteDisk = function(name, deleteFromStorage, callback) { if (callback === null || callback === undefined) { throw new Error('callback cannot be null.'); } // Validate - if (diskName === null || diskName === undefined) { - return callback(new Error('diskName cannot be null.')); + if (name === null || name === undefined) { + return callback(new Error('name cannot be null.')); } if (deleteFromStorage === null || deleteFromStorage === undefined) { return callback(new Error('deleteFromStorage cannot be null.')); @@ -10453,7 +10453,7 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ // Tracing // Construct URL - var url2 = this.client.baseUri + '/' + this.client.credentials.subscriptionId + '/services/disks/' + diskName + '?'; + var url2 = this.client.baseUri + '/' + this.client.credentials.subscriptionId + '/services/disks/' + name + '?'; if (deleteFromStorage === true) { url2 = url2 + 'comp=media'; } @@ -10571,13 +10571,13 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ var diskLabelElement = js2xml.getElement(responseDoc, dataVirtualHardDiskElement, 'DISKLABEL', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskLabelElement) { var diskLabelInstance = diskLabelElement; - result.diskLabel = diskLabelInstance; + result.label = diskLabelInstance; } var diskNameElement = js2xml.getElement(responseDoc, dataVirtualHardDiskElement, 'DISKNAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskNameElement) { var diskNameInstance = diskNameElement; - result.diskName = diskNameInstance; + result.name = diskNameInstance; } var lunElement = js2xml.getElement(responseDoc, dataVirtualHardDiskElement, 'LUN', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); @@ -10613,25 +10613,25 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * http://msdn.microsoft.com/en-us/library/windowsazure/jj157178.aspx for * more information) * - * @param {string} diskName The name of the disk. + * @param {string} name The name of the disk. * * @param {function} callback * * @returns {Stream} The response stream. */ - VirtualMachineDiskOperations.prototype.getDisk = function(diskName, callback) { + VirtualMachineDiskOperations.prototype.getDisk = function(name, callback) { if (callback === null || callback === undefined) { throw new Error('callback cannot be null.'); } // Validate - if (diskName === null || diskName === undefined) { - return callback(new Error('diskName cannot be null.')); + if (name === null || name === undefined) { + return callback(new Error('name cannot be null.')); } // Tracing // Construct URL - var url2 = this.client.baseUri + '/' + this.client.credentials.subscriptionId + '/services/disks/' + diskName; + var url2 = this.client.baseUri + '/' + this.client.credentials.subscriptionId + '/services/disks/' + name; // Create HTTP transport objects var httpRequest = new WebResource(); @@ -10928,7 +10928,7 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * * @param {Number} logicalUnitNumber The logical unit number of the disk. * - * @param {VirtualMachineDiskUpdateDataDiskParameters} parameters Parameters + * @param {VirtualMachineDataDiskUpdateParameters} parameters Parameters * supplied to the Update Virtual Machine Data Disk operation. * * @param {VirtualHardDiskHostCaching} parameters.hostCaching Required. @@ -10937,13 +10937,13 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * ReadOnly, ReadWrite. Warning: Setting this property impacts the * consistency of the disk. * - * @param {string} [parameters.diskLabel] Optional. Specifies the description - * of the data disk. When you attach a disk, either by directly referencing - * a media using the MediaLink element or specifying the target disk size, - * you can use the DiskLabel element to customize the name property of the + * @param {string} [parameters.label] Optional. Specifies the description of + * the data disk. When you attach a disk, either by directly referencing a + * media using the MediaLink element or specifying the target disk size, you + * can use the DiskLabel element to customize the name property of the * target data disk. * - * @param {string} [parameters.diskName] Optional. Specifies the name of the + * @param {string} [parameters.name] Optional. Specifies the name of the * disk. Windows Azure uses the specified disk to create the data disk for * the machine and populates this field with the disk name. * @@ -11021,15 +11021,15 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ js2xml.setElementValue(hostCachingElement, parameters.hostCaching ? parameters.hostCaching.toString() : 'None'); js2xml.addChildElement(dataVirtualHardDiskElement, hostCachingElement); - if (parameters.diskLabel) { + if (parameters.label) { var diskLabelElement = js2xml.createElement('DiskLabel', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskLabelElement, parameters.diskLabel); + js2xml.setElementValue(diskLabelElement, parameters.label); js2xml.addChildElement(dataVirtualHardDiskElement, diskLabelElement); } - if (parameters.diskName) { + if (parameters.name) { var diskNameElement = js2xml.createElement('DiskName', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskNameElement, parameters.diskName); + js2xml.setElementValue(diskNameElement, parameters.name); js2xml.addChildElement(dataVirtualHardDiskElement, diskNameElement); } @@ -11076,10 +11076,10 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * http://msdn.microsoft.com/en-us/library/windowsazure/jj157178.aspx for * more information) * - * @param {string} diskName The name of the disk being updated. + * @param {string} name The name of the disk being updated. * - * @param {VirtualMachineDiskUpdateDiskParameters} parameters Parameters - * supplied to the Update Virtual Machine Disk operation. + * @param {VirtualMachineDiskUpdateParameters} parameters Parameters supplied + * to the Update Virtual Machine Disk operation. * * @param {boolean} [parameters.hasOperatingSystem] Optional. Specifies * whether the disk contains an operation system. Note: Only a disk with an @@ -11105,13 +11105,13 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ * * @returns {Stream} The response stream. */ - VirtualMachineDiskOperations.prototype.updateDisk = function(diskName, parameters, callback) { + VirtualMachineDiskOperations.prototype.updateDisk = function(name, parameters, callback) { if (callback === null || callback === undefined) { throw new Error('callback cannot be null.'); } // Validate - if (diskName === null || diskName === undefined) { - return callback(new Error('diskName cannot be null.')); + if (name === null || name === undefined) { + return callback(new Error('name cannot be null.')); } if (parameters === null || parameters === undefined) { return callback(new Error('parameters cannot be null.')); @@ -11126,7 +11126,7 @@ var VirtualMachineDiskOperations = ( /** @lends VirtualMachineDiskOperations */ // Tracing // Construct URL - var url2 = this.client.baseUri + '/' + this.client.credentials.subscriptionId + '/services/disks/' + diskName; + var url2 = this.client.baseUri + '/' + this.client.credentials.subscriptionId + '/services/disks/' + name; // Create HTTP transport objects var httpRequest = new WebResource(); @@ -13430,11 +13430,11 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function * [parameters.oSVirtualHardDisk.hostCaching] Specifies the platform caching * behavior of the operating system disk blob for read/write efficiency. * - * @param {string} [parameters.oSVirtualHardDisk.diskLabel] Specifies the + * @param {string} [parameters.oSVirtualHardDisk.label] Specifies the * friendly name an operating system image in the image repository. * - * @param {string} [parameters.oSVirtualHardDisk.diskName] Specifies the name - * an operating system image in the image repository. + * @param {string} [parameters.oSVirtualHardDisk.name] Specifies the name an + * operating system image in the image repository. * * @param {string} [parameters.oSVirtualHardDisk.mediaLink] Specifies the * location of the operating system disk in Windows Azure storage. @@ -13997,7 +13997,7 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function if (resourceExtensionParameterValuesItem.type) { var typeElement = js2xml.createElement('Type', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(typeElement, resourceExtensionParameterValuesItem.type ? resourceExtensionParameterValuesItem.type.toString() : 'Public'); + js2xml.setElementValue(typeElement, resourceExtensionParameterValuesItem.type); js2xml.addChildElement(resourceExtensionParameterValueElement, typeElement); } } @@ -14006,7 +14006,7 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function if (resourceExtensionReferencesItem.state) { var stateElement = js2xml.createElement('State', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(stateElement, resourceExtensionReferencesItem.state ? resourceExtensionReferencesItem.state.toString() : 'Enable'); + js2xml.setElementValue(stateElement, resourceExtensionReferencesItem.state); js2xml.addChildElement(resourceExtensionReferenceElement, stateElement); } } @@ -14032,9 +14032,9 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function js2xml.addChildElement(dataVirtualHardDiskElement, diskLabelElement); } - if (dataVirtualHardDisksItem.diskName) { + if (dataVirtualHardDisksItem.name) { var diskNameElement = js2xml.createElement('DiskName', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskNameElement, dataVirtualHardDisksItem.diskName); + js2xml.setElementValue(diskNameElement, dataVirtualHardDisksItem.name); js2xml.addChildElement(dataVirtualHardDiskElement, diskNameElement); } @@ -14067,15 +14067,15 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function js2xml.addChildElement(oSVirtualHardDiskElement, hostCachingElement2); } - if (parameters.oSVirtualHardDisk.diskLabel) { + if (parameters.oSVirtualHardDisk.label) { var diskLabelElement2 = js2xml.createElement('DiskLabel', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskLabelElement2, parameters.oSVirtualHardDisk.diskLabel); + js2xml.setElementValue(diskLabelElement2, parameters.oSVirtualHardDisk.label); js2xml.addChildElement(oSVirtualHardDiskElement, diskLabelElement2); } - if (parameters.oSVirtualHardDisk.diskName) { + if (parameters.oSVirtualHardDisk.name) { var diskNameElement2 = js2xml.createElement('DiskName', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskNameElement2, parameters.oSVirtualHardDisk.diskName); + js2xml.setElementValue(diskNameElement2, parameters.oSVirtualHardDisk.name); js2xml.addChildElement(oSVirtualHardDiskElement, diskNameElement2); } @@ -14760,7 +14760,7 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function if (resourceExtensionParameterValuesItem.type) { var typeElement = js2xml.createElement('Type', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(typeElement, resourceExtensionParameterValuesItem.type ? resourceExtensionParameterValuesItem.type.toString() : 'Public'); + js2xml.setElementValue(typeElement, resourceExtensionParameterValuesItem.type); js2xml.addChildElement(resourceExtensionParameterValueElement, typeElement); } } @@ -14769,7 +14769,7 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function if (resourceExtensionReferencesItem.state) { var stateElement = js2xml.createElement('State', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(stateElement, resourceExtensionReferencesItem.state ? resourceExtensionReferencesItem.state.toString() : 'Enable'); + js2xml.setElementValue(stateElement, resourceExtensionReferencesItem.state); js2xml.addChildElement(resourceExtensionReferenceElement, stateElement); } } @@ -14801,9 +14801,9 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function js2xml.addChildElement(dataVirtualHardDiskElement, diskLabelElement); } - if (dataVirtualHardDisksItem.diskName) { + if (dataVirtualHardDisksItem.name) { var diskNameElement = js2xml.createElement('DiskName', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskNameElement, dataVirtualHardDisksItem.diskName); + js2xml.setElementValue(diskNameElement, dataVirtualHardDisksItem.name); js2xml.addChildElement(dataVirtualHardDiskElement, diskNameElement); } @@ -14842,15 +14842,15 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function js2xml.addChildElement(oSVirtualHardDiskElement, hostCachingElement2); } - if (roleListItem.oSVirtualHardDisk.diskLabel) { + if (roleListItem.oSVirtualHardDisk.label) { var diskLabelElement2 = js2xml.createElement('DiskLabel', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskLabelElement2, roleListItem.oSVirtualHardDisk.diskLabel); + js2xml.setElementValue(diskLabelElement2, roleListItem.oSVirtualHardDisk.label); js2xml.addChildElement(oSVirtualHardDiskElement, diskLabelElement2); } - if (roleListItem.oSVirtualHardDisk.diskName) { + if (roleListItem.oSVirtualHardDisk.name) { var diskNameElement2 = js2xml.createElement('DiskName', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskNameElement2, roleListItem.oSVirtualHardDisk.diskName); + js2xml.setElementValue(diskNameElement2, roleListItem.oSVirtualHardDisk.name); js2xml.addChildElement(oSVirtualHardDiskElement, diskNameElement2); } @@ -15503,11 +15503,11 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function * [parameters.oSVirtualHardDisk.hostCaching] Specifies the platform caching * behavior of the operating system disk blob for read/write efficiency. * - * @param {string} [parameters.oSVirtualHardDisk.diskLabel] Specifies the + * @param {string} [parameters.oSVirtualHardDisk.label] Specifies the * friendly name an operating system image in the image repository. * - * @param {string} [parameters.oSVirtualHardDisk.diskName] Specifies the name - * an operating system image in the image repository. + * @param {string} [parameters.oSVirtualHardDisk.name] Specifies the name an + * operating system image in the image repository. * * @param {string} [parameters.oSVirtualHardDisk.mediaLink] Specifies the * location of the operating system disk in Windows Azure storage. @@ -16076,7 +16076,7 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function if (resourceExtensionParameterValuesItem.type) { var typeElement = js2xml.createElement('Type', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(typeElement, resourceExtensionParameterValuesItem.type ? resourceExtensionParameterValuesItem.type.toString() : 'Public'); + js2xml.setElementValue(typeElement, resourceExtensionParameterValuesItem.type); js2xml.addChildElement(resourceExtensionParameterValueElement, typeElement); } } @@ -16085,7 +16085,7 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function if (resourceExtensionReferencesItem.state) { var stateElement = js2xml.createElement('State', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(stateElement, resourceExtensionReferencesItem.state ? resourceExtensionReferencesItem.state.toString() : 'Enable'); + js2xml.setElementValue(stateElement, resourceExtensionReferencesItem.state); js2xml.addChildElement(resourceExtensionReferenceElement, stateElement); } } @@ -16111,9 +16111,9 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function js2xml.addChildElement(dataVirtualHardDiskElement, diskLabelElement); } - if (dataVirtualHardDisksItem.diskName) { + if (dataVirtualHardDisksItem.name) { var diskNameElement = js2xml.createElement('DiskName', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskNameElement, dataVirtualHardDisksItem.diskName); + js2xml.setElementValue(diskNameElement, dataVirtualHardDisksItem.name); js2xml.addChildElement(dataVirtualHardDiskElement, diskNameElement); } @@ -16145,15 +16145,15 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function js2xml.addChildElement(oSVirtualHardDiskElement, hostCachingElement2); } - if (parameters.oSVirtualHardDisk.diskLabel) { + if (parameters.oSVirtualHardDisk.label) { var diskLabelElement2 = js2xml.createElement('DiskLabel', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskLabelElement2, parameters.oSVirtualHardDisk.diskLabel); + js2xml.setElementValue(diskLabelElement2, parameters.oSVirtualHardDisk.label); js2xml.addChildElement(oSVirtualHardDiskElement, diskLabelElement2); } - if (parameters.oSVirtualHardDisk.diskName) { + if (parameters.oSVirtualHardDisk.name) { var diskNameElement2 = js2xml.createElement('DiskName', 'http://schemas.microsoft.com/windowsazure'); - js2xml.setElementValue(diskNameElement2, parameters.oSVirtualHardDisk.diskName); + js2xml.setElementValue(diskNameElement2, parameters.oSVirtualHardDisk.name); js2xml.addChildElement(oSVirtualHardDiskElement, diskNameElement2); } @@ -16713,11 +16713,11 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function * [parameters.oSVirtualHardDisk.hostCaching] Specifies the platform caching * behavior of the operating system disk blob for read/write efficiency. * - * @param {string} [parameters.oSVirtualHardDisk.diskLabel] Specifies the + * @param {string} [parameters.oSVirtualHardDisk.label] Specifies the * friendly name an operating system image in the image repository. * - * @param {string} [parameters.oSVirtualHardDisk.diskName] Specifies the name - * an operating system image in the image repository. + * @param {string} [parameters.oSVirtualHardDisk.name] Specifies the name an + * operating system image in the image repository. * * @param {string} [parameters.oSVirtualHardDisk.mediaLink] Specifies the * location of the operating system disk in Windows Azure storage. @@ -17441,7 +17441,7 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function var diskNameElement = js2xml.getElement(responseDoc, dataVirtualHardDisksElement, 'DISKNAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskNameElement) { var diskNameInstance = diskNameElement; - dataVirtualHardDiskInstance.diskName = diskNameInstance; + dataVirtualHardDiskInstance.name = diskNameInstance; } var lunElement = js2xml.getElement(responseDoc, dataVirtualHardDisksElement, 'LUN', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); @@ -17478,13 +17478,13 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function var diskLabelElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'DISKLABEL', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskLabelElement2) { var diskLabelInstance2 = diskLabelElement2; - oSVirtualHardDiskInstance.diskLabel = diskLabelInstance2; + oSVirtualHardDiskInstance.label = diskLabelInstance2; } var diskNameElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'DISKNAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (diskNameElement2) { var diskNameInstance2 = diskNameElement2; - oSVirtualHardDiskInstance.diskName = diskNameInstance2; + oSVirtualHardDiskInstance.name = diskNameInstance2; } var mediaLinkElement2 = js2xml.getElement(responseDoc, oSVirtualHardDiskElement, 'MEDIALINK', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); @@ -17948,11 +17948,11 @@ var VirtualMachineOperations = ( /** @lends VirtualMachineOperations */ function * [parameters.oSVirtualHardDisk.hostCaching] Specifies the platform caching * behavior of the operating system disk blob for read/write efficiency. * - * @param {string} [parameters.oSVirtualHardDisk.diskLabel] Specifies the + * @param {string} [parameters.oSVirtualHardDisk.label] Specifies the * friendly name an operating system image in the image repository. * - * @param {string} [parameters.oSVirtualHardDisk.diskName] Specifies the name - * an operating system image in the image repository. + * @param {string} [parameters.oSVirtualHardDisk.name] Specifies the name an + * operating system image in the image repository. * * @param {string} [parameters.oSVirtualHardDisk.mediaLink] Specifies the * location of the operating system disk in Windows Azure storage. diff --git a/lib/services/storageManagement/lib/storageManagementClient.js b/lib/services/storageManagement/lib/storageManagementClient.js index eefac14adf..7f5dc2f0eb 100644 --- a/lib/services/storageManagement/lib/storageManagementClient.js +++ b/lib/services/storageManagement/lib/storageManagementClient.js @@ -709,7 +709,7 @@ var StorageAccountOperations = ( /** @lends StorageAccountOperations */ function var result = null; // Deserialize Response var responseContent = body; - result = { capabilities: [], extendedProperties: {} }; + result = {}; var options = {}; options.trim = true; options.strict = false; @@ -720,22 +720,25 @@ var StorageAccountOperations = ( /** @lends StorageAccountOperations */ function var storageServiceElement = js2xml.getElement(responseDoc, responseDoc, 'STORAGESERVICE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (storageServiceElement) { + var storageServiceInstance = { extendedProperties: {} }; + result.storageAccount = storageServiceInstance; + var urlElement = js2xml.getElement(responseDoc, storageServiceElement, 'URL', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (urlElement) { var urlInstance = urlElement; - result.uri = urlInstance; + storageServiceInstance.uri = urlInstance; } var serviceNameElement = js2xml.getElement(responseDoc, storageServiceElement, 'SERVICENAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (serviceNameElement) { var serviceNameInstance = serviceNameElement; - result.name = serviceNameInstance; + storageServiceInstance.name = serviceNameInstance; } var storageServicePropertiesElement = js2xml.getElement(responseDoc, storageServiceElement, 'STORAGESERVICEPROPERTIES', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (storageServicePropertiesElement) { var storageServicePropertiesInstance = { endpoints: [] }; - result.properties = storageServicePropertiesInstance; + storageServiceInstance.properties = storageServicePropertiesInstance; var descriptionElement = js2xml.getElement(responseDoc, storageServicePropertiesElement, 'DESCRIPTION', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (descriptionElement) { @@ -825,15 +828,7 @@ var StorageAccountOperations = ( /** @lends StorageAccountOperations */ function var extendedPropertiesElement = js2xml.getElements(responseDoc, extendedPropertiesSequenceElement, 'EXTENDEDPROPERTY', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE')[loweredIndex2]; var extendedPropertiesKey = js2xml.getElement(responseDoc, extendedPropertiesElement, 'NAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); var extendedPropertiesValue = js2xml.getElement(responseDoc, extendedPropertiesElement, 'VALUE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); - result.extendedProperties[extendedPropertiesKey] = extendedPropertiesValue; - } - } - - var capabilitiesSequenceElement = js2xml.getElement(responseDoc, storageServiceElement, 'CAPABILITIES', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); - if (capabilitiesSequenceElement) { - for (var loweredIndex3 = 0; loweredIndex3 < js2xml.getElements(responseDoc, capabilitiesSequenceElement, 'CAPABILITY', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE').length; loweredIndex3 = loweredIndex3 + 1) { - var capabilitiesElement = js2xml.getElements(responseDoc, capabilitiesSequenceElement, 'CAPABILITY', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE')[loweredIndex3]; - result.capabilities.push(capabilitiesElement); + storageServiceInstance.extendedProperties[extendedPropertiesKey] = extendedPropertiesValue; } } } @@ -991,27 +986,27 @@ var StorageAccountOperations = ( /** @lends StorageAccountOperations */ function var storageServicesSequenceElement = js2xml.getElement(responseDoc, responseDoc, 'STORAGESERVICES', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (storageServicesSequenceElement) { - for (var loweredIndex1 = 0; loweredIndex1 < js2xml.getElements(responseDoc, storageServicesSequenceElement, 'STORAGEACCOUNT', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE').length; loweredIndex1 = loweredIndex1 + 1) { - var storageServicesElement = js2xml.getElements(responseDoc, storageServicesSequenceElement, 'STORAGEACCOUNT', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE')[loweredIndex1]; - var storageAccountInstance = { extendedProperties: {} }; - result.storageAccounts.push(storageAccountInstance); + for (var loweredIndex1 = 0; loweredIndex1 < js2xml.getElements(responseDoc, storageServicesSequenceElement, 'STORAGESERVICE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE').length; loweredIndex1 = loweredIndex1 + 1) { + var storageServicesElement = js2xml.getElements(responseDoc, storageServicesSequenceElement, 'STORAGESERVICE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE')[loweredIndex1]; + var storageServiceInstance = { extendedProperties: {} }; + result.storageAccounts.push(storageServiceInstance); var urlElement = js2xml.getElement(responseDoc, storageServicesElement, 'URL', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (urlElement) { var urlInstance = urlElement; - storageAccountInstance.uri = urlInstance; + storageServiceInstance.uri = urlInstance; } var serviceNameElement = js2xml.getElement(responseDoc, storageServicesElement, 'SERVICENAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (serviceNameElement) { var serviceNameInstance = serviceNameElement; - storageAccountInstance.name = serviceNameInstance; + storageServiceInstance.name = serviceNameInstance; } var storageServicePropertiesElement = js2xml.getElement(responseDoc, storageServicesElement, 'STORAGESERVICEPROPERTIES', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (storageServicePropertiesElement) { var storageServicePropertiesInstance = { endpoints: [] }; - storageAccountInstance.properties = storageServicePropertiesInstance; + storageServiceInstance.properties = storageServicePropertiesInstance; var descriptionElement = js2xml.getElement(responseDoc, storageServicePropertiesElement, 'DESCRIPTION', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); if (descriptionElement) { @@ -1101,7 +1096,7 @@ var StorageAccountOperations = ( /** @lends StorageAccountOperations */ function var extendedPropertiesElement = js2xml.getElements(responseDoc, extendedPropertiesSequenceElement, 'EXTENDEDPROPERTY', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE')[loweredIndex3]; var extendedPropertiesKey = js2xml.getElement(responseDoc, extendedPropertiesElement, 'NAME', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); var extendedPropertiesValue = js2xml.getElement(responseDoc, extendedPropertiesElement, 'VALUE', 'HTTP://SCHEMAS.MICROSOFT.COM/WINDOWSAZURE'); - storageAccountInstance.extendedProperties[extendedPropertiesKey] = extendedPropertiesValue; + storageServiceInstance.extendedProperties[extendedPropertiesKey] = extendedPropertiesValue; } } } diff --git a/packages.config b/packages.config index 978d15f901..d97ff37013 100644 --- a/packages.config +++ b/packages.config @@ -1,15 +1,17 @@  - - - - - - - - - - - + + + + + + + + + + + + + \ No newline at end of file