azurex 0.6.5 → 0.6.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a6f9d12b83d338df45827df63b1627a5fc556b56
-  data.tar.gz: 0b1851e3d7bd14bb66e1a1fdfa2cfb6c0d6ef0e7
+  metadata.gz: c96ccd80aafb20085d1e9b30e35c0546542f1ef1
+  data.tar.gz: c383e6867d9e57d804bdb2d2134fad00a56b4250
 SHA512:
-  metadata.gz: 91ed977a7c75814f5e9998aeedebdf4c454f9153a53c894a28433b847677ae8e9af4885bcdb52a9451796d386f2af8088a1c3dc21b604b538de69cf206c2ff3b
-  data.tar.gz: 9263653f9252e419f2d01fd2a5155e87ef8826a0c54855407c584a93ef0980376ebc09c736a92f43f0da15e2154656a4a85950ab593b232378882a2712c6c35a
+  metadata.gz: 6c8d74bd5d0fa9754e3b30071a5c4e984235418cbd365d99537670b75c2ed091b62e9bd29112b92fc8abb9e076f1f6973657adddb56efa16d38b034775a07c44
+  data.tar.gz: 48b7d6a731e96eacf0eb477e9b7d334a157e17176da345450de705d2e4425e2d4c57381c7265499b9023171bcff579f0cc3d60f052414553c40f327d9230c7df

data/README.md

@@ -446,6 +446,23 @@ options = {
 }
 virtual_machine_service.create_virtual_machine(params,options)
 
+#API usage to add new roles under cloud service creating VM. Example is an Ubuntu 14.04 VM with CustomData
+params = {
+  :vm_name => 'vm_name',
+  :cloud_service_name => 'cloud_service_name',
+  :vm_user => 'azureuser',
+  :image => 'b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04-LTS-amd64-server-20140724-en-us-30GB',
+  :password => 'ComplexPassword',
+}
+options = {
+  :storage_account_name => 'storage',
+  :private_key_file => '/home/data/private_key.key', #required for ssh
+  :certificate_file => '/home/data/pub_key.pem', #required for ssh
+  :vm_size => 'Small', #valid choices are (ExtraSmall Small Medium Large ExtraLarge A5 A6 A7 Basic_A0 Basic_A1 Basic_A2 Basic_A3 Basic_A4)
+  :custom_data => "#!/bin/sh\n\necho \"this is a shell script\" > /tmp/output\n",
+}
+virtual_machine_service.add_role(params, options)
+
 #API usage to add new roles under cloud service creating VM 
 #API add_role create multiple roles under the same cloud service. Atleast a single deployment should be created under a hosted service.
 params = {

data/lib/azure/version.rb

@@ -17,7 +17,7 @@ module Azure
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 6 unless defined? MINOR
-    UPDATE = 5 unless defined? UPDATE
+    UPDATE = 6 unless defined? UPDATE
     PRE = nil unless defined? PRE
 
     class << self
@@ -28,4 +28,4 @@ module Azure
       end
     end
   end
-end
+end

data/lib/azure/virtual_machine_management/serialization.rb

@@ -148,6 +148,7 @@ module Azure
                 end
               end
             end
+            add_custom_data(xml, options)
           end
         elsif options[:os_type] == 'Windows'
           xml.ConfigurationSet('i:type' => 'WindowsProvisioningConfigurationSet') do
@@ -174,10 +175,21 @@ module Azure
               end
             end
             xml.AdminUsername params[:vm_user]
+            add_custom_data(xml, options)
           end
         end
       end
 
+      def self.add_custom_data(xml, options)
+        if options[:custom_data]
+          custom_data = options[:custom_data]
+          unless custom_data.chomp[/==$/]
+            custom_data = Base64.encode64(custom_data) 
+          end
+          xml.CustomData custom_data
+        end
+      end
+
       def self.default_endpoints_to_xml(xml, options)
         os_type = options[:os_type]
         used_ports = options[:existing_ports]

data/lib/azure/virtual_machine_management/virtual_machine_management_service.rb

@@ -79,6 +79,7 @@ module Azure
       # * +:storage_account_name+     - String. Name of storage account.
       # * +:cloud_service_name+       - String. Name of cloud service.
       # * +:deployment_name+          - String. A name for the deployment.
+      # * +:custom_data+              - String. Your custom data for the virtual machine. It will be base64 encoded as required. Cannot be longer than 64kb or Azure will reject it
       # * +:tcp_endpoints+            - String. Specifies the internal port and external/public port separated by a colon.
       #   You can map multiple internal and external ports by separating them with a comma.
       # * +:ssh_private_key_file+     - String. Path of private key file.

data/test/fixtures/virtual_machine.xml

@@ -53,6 +53,11 @@ kZS1mYWNlNSI+DQogICAgPEluc3RhbmNlcyBjb3VudD0iMSIgLz4NCiAgPC9Sb2xlPg0KPC9TZXJ2aWN
       <OsVersion/>
       <RoleType>PersistentVMRole</RoleType>
       <ConfigurationSets>
+        <ConfigurationSet i:type="LinuxProvisioningConfigurationSet">
+          <ConfigurationSetType>LinuxProvisioningConfiguration</ConfigurationSetType>
+          <!-- Shell script: "#!/bin/sh\n\necho \"this is a shell script\" > /tmp/output\n" -->
+          <CustomData>IyEvYmluL3NoCgplY2hvICJ0aGlzIGlzIGEgc2hlbGwgc2NyaXB0IiA+IC90\nbXAvb3V0cHV0Cg==</CustomData>
+        </ConfigurationSet>
         <ConfigurationSet i:type="NetworkConfigurationSet">
           <ConfigurationSetType>NetworkConfiguration</ConfigurationSetType>
           <InputEndpoints>

data/test/unit/virtual_machine_management/serialization_test.rb

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
+require 'base64'
 require 'test_helper'
 
 describe Azure::VirtualMachineManagement::Serialization do
@@ -19,6 +20,7 @@ describe Azure::VirtualMachineManagement::Serialization do
 
   let(:vm_xml) { Nokogiri::XML(Fixtures['virtual_machine']) }
   let(:csn) { 'cloud-service-1' }
+  CUSTOM_DATA = "#!/bin/sh\n\necho \"this is a shell script\" > /tmp/output\n"
 
   describe '#virtual_machines_from_xml' do
 
@@ -123,6 +125,7 @@ describe Azure::VirtualMachineManagement::Serialization do
         cloud_service_name: 'cloud-service-name',
         tcp_endpoints: '80,3389:3390,85:85',
         availability_set_name: 'aval-set',
+        custom_data: CUSTOM_DATA,
         winrm_https_port: '5988',
         winrm_transport: ['http','https']
       }
@@ -173,6 +176,15 @@ describe Azure::VirtualMachineManagement::Serialization do
         local_port: '5986'
       )
     end
+
+    it "returns an XML file with the CustomData encoded" do
+      params[:certificate] = {fingerprint: 'CFB8C256D2986559C630547F2D0'}
+      options[:os_type] = 'Linux'
+      result = subject.deployment_to_xml params, image, options
+      doc = Nokogiri::XML(result)
+      encoded_script = Base64.encode64(CUSTOM_DATA)
+      doc.css('Deployment RoleList Role ConfigurationSets ConfigurationSet CustomData').text.must_equal encoded_script
+    end
   end
 
   describe '#add_data_disk_to_xml' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azurex
 version: !ruby/object:Gem::Version
-  version: 0.6.5
+  version: 0.6.6
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-24 00:00:00.000000000 Z
+date: 2014-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri