vcli 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46c3b42fcb446f735257bda7f13025ec65f2b697
-  data.tar.gz: edea7f33a1cf74778c4587253eb63e58d31056e1
+  metadata.gz: f7e81df0bb2f86fe03b09126c0d8eb1b94311cb4
+  data.tar.gz: 8855ae08ad7abe06fccfe03ec3b013a201cfaff0
 SHA512:
-  metadata.gz: 72973dbf8cccb3b7d9a5760782feaaeaa28ba7fca09d2e3a6eccd77b9676b3d9fed6aba30bd5753f0441d590523fe8a8e762a7166489162e195cac9ea4d25fae
-  data.tar.gz: f3e513398d4897c1e0fad293133bf5e9469c6df69bdf3f34ac9a91ef617b2e678caadd740891cfed670cd41d6551d758f986eef4319bc2067d3778353042a01d
+  metadata.gz: 6fbccfa4493719c91059d197c92b129c85e5daff9ef0680cc07956396aeba0a739037e9c79cfdd9ff79286472fcb3e4e43d0d77f4f9067774975d8a599d4620d
+  data.tar.gz: 4420b8b9c08e0c934ead13d07fc6ebbd6b2c83c5dbd0f48af717c2e414cfbca79780cccf21895fad99971e32708be644a0dd94298cfc4b7b2a8908d5c0f4a11b

data/lib/vcli/cli.rb

@@ -1,6 +1,6 @@
 require 'thor'
 require 'vcli/cli/show'
-require 'vcli/cli/resource'
+require 'vcli/cli/modify'
 require 'vcli/cli/create'
 require 'vcli/cli/delete'
 require 'abiquo-api'
@@ -77,6 +77,9 @@ module Vcli
     desc "delete COMMANDS", "Delete items within the Abiquo VDC" 
     subcommand "delete", Vcli::CLI::Delete
 
+    desc "modify COMMANDS", "Modify items within the Abiquo VDC" 
+    subcommand "modify", Vcli::CLI::Modify
+
     desc "deploy",
     "deploy [optional] --vm=<virtualmachine id>
     [required] --va=<virtualappliance id>
@@ -149,7 +152,7 @@ module Vcli
         reqoptions=Hash.new
         reqoptions[:accept]  = 'application/vnd.abiquo.acceptedrequest+json'
         print "Powering Off VM."
-        tries ||= 3
+        tries ||= 5
         begin
           response=abq.put(link,reqdata,reqoptions)
           status=response.link(:status).get

data/lib/vcli/cli/create.rb

@@ -66,28 +66,30 @@ module Vcli
       end
       
       desc "create virtualmachine", "create virtualmachine <name> <template id> <vdc id> <virtualappliance id>"
-      method_option :cpu, :type => :string, :aliases => "-t"
+      method_option :cpu, :type => :string, :aliases => "-c"
       method_option :ram, :type => :string, :aliases => "-r"
       method_option :description, :type => :string, :aliases => "-d"
       method_option :password, :type => :string, :aliases => "-p"
-      method_option :ip, :type => :string, :aliases => "-i"
-      method_option :vlan, :type => :string, :aliases => "-v"
+      method_option :vlanid, :type => :string, :aliases => "-v"
+      method_option :ipid, :type => :string, :aliases => "-i"
       def virtualmachine(name, template, vdc, va)
         begin
           abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           # Link to post
           link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines' ,
-                                   :type => 'application/vnd.abiquo.virtualmachine+json')
+                                   :type => 'application/vnd.abiquo.virtualmachine+json',
+                                   :client => abq)
+
+          # Link to get link for Template
+          templatelink=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/action/templates/',
+                                    :type => 'application/vnd.abiquo.virtualmachinetemplates+json',
+                                    :client => abq)
+
           # Hash to populate for new virtual machine
           newvirtualmachine=Hash.new
-          # Hash to populate for link
           link2hash=Hash.new
           linkhash=Hash.new
-          # Link to get link for Template
-          link2=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/action/templates/',
-                                    :type => 'application/vnd.abiquo.virtualmachinetemplates+json',
-                                    :client => abq)
-          templates=link2.get
+          templates=templatelink.get
           templates.each {|l|
             if l.id.to_s == template.to_s
               link2hash[:title]=l.name
@@ -96,17 +98,16 @@ module Vcli
               link2hash[:href]=l.url
             end
           }
-          newvirtualmachine[:label]=linkhash[:title]
           newvirtualmachine[:label]=name
           arrayforlinks=Array.new
           arrayforlinks[0]=link2hash
           newvirtualmachine[:links]=arrayforlinks
           cpu=options[:cpu].to_s
           ram=options[:ram].to_s
+          vlanid=options[:vlanid].to_s
+          ipid=options[:ipid].to_s
           description=options[:description].to_s
           password=options[:password].to_s
-          ip=options[:ip].to_s
-          vlan=options[:vlan].to_s
           newvirtualmachine[:cpu]= cpu if cpu.length >0
           newvirtualmachine[:ram]= ram if ram.length >0
           newvirtualmachine[:description]= description if description.length >0
@@ -117,35 +118,13 @@ module Vcli
           puts "ID for Virtual Machine - #{response.id}"
           system("vcli deploy --vdc=#{vdc} --va=#{va} --vm=#{response.id}")
           sleep 20
-          puts
+          puts "Powering Off VM"
           system("vcli poweroff --vdc=#{vdc} --va=#{va} --vm=#{response.id}")
+          puts "Reconfiguring VM"
+          system("vcli modify ip --vdc=#{vdc} --va=#{va} --vmid=#{response.id} --vlanid=#{vlanid} --ipid=#{ipid}")          
+          puts "Powering On VM"
+          system("vcli poweron --vdc=#{vdc} --va=#{va} --vm=#{response.id}")
           puts
-          
-          # Link to get put modified machine         
-          link4=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines/' + response.id.to_s ,
-                                    :type => 'application/vnd.abiquo.virtualmachine+json',
-                                    :client => abq)
-          # Private IPS in VLAN         
-          link5=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/privatenetworks/' + vlan + '/ips',
-                                    :type => 'application/vnd.abiquo.privateips+json',
-                                    :client => abq)
-          listofips=abq.list(link5)
-          listofips.each { |m|
-            if m.ip == ip
-              if !m.has_link?(:virtualmachine)
-                url=m.url
-                break
-              else
-                puts "IP Address already allocated"
-                exit 1
-              end
-            end
-          }
-          reqoptions=Hash.new
-          reqoptions[:accept]  = 'application/vnd.abiquo.acceptedrequest+json'
-          virtualmachine2=abq.get(link4)
-          puts virtualmachine2.to_yaml
-          response=abq.put(link4,virtualmachine2,reqoptions)
         rescue AbiquoAPIClient::Forbidden
           puts "Forbidden HTTP 403 Received"
         rescue AbiquoAPIClient::InvalidCredentials

data/lib/vcli/version.rb

@@ -23,7 +23,9 @@ module Vcli
 #         #        # and virtualmachines
 #################################################################
 #  0.2.6  #05082015# Added create virtualmachine
+#################################################################
+#  0.2.7  #11082015# Added modify ip
 #################################################################
 
-  VERSION = "0.2.6"
+  VERSION = "0.2.7"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vcli
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Jay Fearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-05 00:00:00.000000000 Z
+date: 2015-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '5'
 - !ruby/object:Gem::Dependency
@@ -84,28 +84,28 @@ dependencies:
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,14 +126,14 @@ dependencies:
   name: abiquo-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 description: "Command Line Interface for the Abiquo API\nStart with 'vcli target https://put.your.portal.api.fqdn.here/api'\nthen
@@ -153,13 +153,13 @@ files:
 - bin/console
 - bin/setup
 - bin/vcli
+- lib/vcli.rb
+- lib/vcli/cli.rb
 - lib/vcli/cli/create.rb
 - lib/vcli/cli/delete.rb
 - lib/vcli/cli/resource.rb
 - lib/vcli/cli/show.rb
-- lib/vcli/cli.rb
 - lib/vcli/version.rb
-- lib/vcli.rb
 - test/test_helper.rb
 - test/vcli_test.rb
 homepage: http://www.sittingonthe.net
@@ -172,17 +172,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Command Line Interface for the Abiquo API