vagrant-mos 0.8.82 → 0.8.83

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5f6fd76f5f7094a20bf66f53332ac7860bbac14
-  data.tar.gz: 7afe121ea98860e9fbd1258a8b0252cdcbae869c
+  metadata.gz: 8e594224be6917e4e46e6aa414b38d863195c1b3
+  data.tar.gz: 96dfa51f7e102a4cbf12a112dfd174c9f058cd37
 SHA512:
-  metadata.gz: 814220e20ab76a8315124876e62a97bef15d9e3ea02ecfd32140aeb2da3a9f81a347d32a0bf98ca2e508f3215a04c9e517a87dbfa6b4fe54b11987d508fd6640
-  data.tar.gz: 5f9d5ab35191a8216d5a34203e3e2103a092cc8a7186533e80a08b290d5ee8a4f6b700012c6c9f006fb9bb1b486b870eb7e3a14a023a40dac1432781ade0754d
+  metadata.gz: 53a335d98f501c129023ff8149dfa743c6009511fd656df2f89ef3446d72d698b0603b7fb42ce83e80aaf8326b5d3683154c19525c7b8e37990107fa7f02e091
+  data.tar.gz: c6311faee37e9c402987e133f19263a841369a97dae13d915f34b088745a7a586c8e5442d3b3648bd9816ae6f59e7c0c70b37cd436a5587115f7e146354fd5d2

data/lib/vagrant-mos/action/run_instance.rb

@@ -27,7 +27,7 @@ module VagrantPlugins
           # Get the configs
           region_config = env[:machine].provider_config.get_region_config(region)
           ami = region_config.ami
-          instance_name = region_config.name
+          name = region_config.name
           instance_type = region_config.instance_type
           keypair = region_config.keypair_name
           terminate_on_shutdown = region_config.terminate_on_shutdown
@@ -39,7 +39,7 @@ module VagrantPlugins
 
           # Launch!
           env[:ui].info(I18n.t("vagrant_mos.launching_instance"))
-          env[:ui].info(" -- Name: #{instance_name}") if instance_name
+          env[:ui].info(" -- Name: #{name}") if name
           env[:ui].info(" -- Type: #{instance_type}")
           env[:ui].info(" -- AMI: #{ami}")
           env[:ui].info(" -- Region: #{region}")
@@ -48,7 +48,7 @@ module VagrantPlugins
 
           options = {
               :flavor_id => instance_type,
-              :instance_name => instance_name,
+              :name => name,
               :image_id => ami,
               :key_name => keypair,
               :instance_initiated_shutdown_behavior => terminate_on_shutdown == true ? "terminate" : nil,
@@ -56,7 +56,7 @@ module VagrantPlugins
 
           begin
             # create a handler to access MOS
-            server = env[:mos_compute].create_instance(options[:image_id], options[:flavor_id], nil, options[:instance_name], options[:key_name], datadisk=9, bandwidth=2)
+            server = env[:mos_compute].create_instance(options[:image_id], options[:flavor_id], nil, options[:name], options[:key_name], datadisk=9, bandwidth=2)
           rescue Exception => e
             raise Errors::MosError, :message => e.message
           end

data/lib/vagrant-mos/config.rb

@@ -16,7 +16,7 @@ module VagrantPlugins
       # The name of the instance to create.
       #
       # @return [String]
-      attr_accessor :instance_name
+      attr_accessor :name
 
       # The timeout to wait for an instance to become ready.
       #
@@ -78,7 +78,7 @@ module VagrantPlugins
         @access_key_id             = UNSET_VALUE
         @ami                       = UNSET_VALUE
         @instance_ready_timeout    = UNSET_VALUE
-        @instance_name             = UNSET_VALUE
+        @name             = UNSET_VALUE
         @instance_type             = UNSET_VALUE
         @keypair_name              = UNSET_VALUE
         @region                    = UNSET_VALUE
@@ -165,7 +165,7 @@ module VagrantPlugins
         @ami = nil if @ami == UNSET_VALUE
 
         # Default instance name is nil
-        @instance_name = nil if @instance_name == UNSET_VALUE
+        @name = nil if @name == UNSET_VALUE
 
         # Set the default timeout for waiting for an instance to be ready
         @instance_ready_timeout = 120 if @instance_ready_timeout == UNSET_VALUE

data/lib/vagrant-mos/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module MOS
-    VERSION = '0.8.82'
+    VERSION = '0.8.83'
   end
 end

data/spec/vagrant-mos/config_spec.rb

@@ -18,7 +18,7 @@ describe VagrantPlugins::MOS::Config do
     its("access_key_id")     { should be_nil }
     its("ami")               { should be_nil }
     its("instance_ready_timeout") { should == 120 }
-    its("instance_name")     { should be_nil }
+    its("name")     { should be_nil }
     its("instance_type")     { should == "C1_M2" }
     its("keypair_name")      { should be_nil }
     its("region")            { should == "us-east-1" }
@@ -34,7 +34,7 @@ describe VagrantPlugins::MOS::Config do
     # simple boilerplate test, so I cut corners here. It just sets
     # each of these attributes to "foo" in isolation, and reads the value
     # and asserts the proper result comes back out.
-    [:access_key_id, :ami, :instance_ready_timeout,:instance_name,
+    [:access_key_id, :ami, :instance_ready_timeout,:name,
       :instance_type, :keypair_name, :ssh_host_attribute,
       :region, :secret_access_key, :secret_access_url, :terminate_on_shutdown,
       :use_iam_profile].each do |attribute|
@@ -88,7 +88,7 @@ describe VagrantPlugins::MOS::Config do
     let(:config_access_key_id)     { "foo" }
     let(:config_ami)               { "foo" }
     let(:config_instance_type)     { "foo" }
-    let(:config_instance_name)     { "foo" }
+    let(:config_name)     { "foo" }
     let(:config_keypair_name)      { "foo" }
     let(:config_region)            { "foo" }
     let(:config_secret_access_key) { "foo" }
@@ -98,7 +98,7 @@ describe VagrantPlugins::MOS::Config do
       instance.access_key_id     = config_access_key_id
       instance.ami               = config_ami
       instance.instance_type     = config_instance_type
-      instance.instance_name     = config_instance_name
+      instance.name     = config_name
       instance.keypair_name      = config_keypair_name
       instance.region            = config_region
       instance.secret_access_key = config_secret_access_key
@@ -125,7 +125,7 @@ describe VagrantPlugins::MOS::Config do
       its("access_key_id")     { should == config_access_key_id }
       its("ami")               { should == config_ami }
       its("instance_type")     { should == config_instance_type }
-      its("instance_name")     { should == config_instance_name }
+      its("name")     { should == config_name }
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == config_region }
       its("secret_access_key") { should == config_secret_access_key }
@@ -151,7 +151,7 @@ describe VagrantPlugins::MOS::Config do
       its("access_key_id")     { should == config_access_key_id }
       its("ami")               { should == config_ami }
       its("instance_type")     { should == config_instance_type }
-      its("instance_name")     { should == config_instance_name }
+      its("name")     { should == config_name }
       its("keypair_name")      { should == config_keypair_name }
       its("region")            { should == region_name }
       its("secret_access_key") { should == config_secret_access_key }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-mos
 version: !ruby/object:Gem::Version
-  version: 0.8.82
+  version: 0.8.83
 platform: ruby
 authors:
 - yangcs2009