vcli 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b173126518d858853f8fde0e0b9d27fe71d7fe41
-  data.tar.gz: bcd88daf8c29e87f836299cc1515f0d7e1758e4a
+  metadata.gz: 46c3b42fcb446f735257bda7f13025ec65f2b697
+  data.tar.gz: edea7f33a1cf74778c4587253eb63e58d31056e1
 SHA512:
-  metadata.gz: fc06acdf59f7578d0619d774d78f311a38aa36412c21aa8d63064b96d02e79589c7db357c6194ff657d90edb914a796668734711cce4b73822f21e3b1956fba7
-  data.tar.gz: 098e735691cfadf26c373b94480124f81f0546052707ae8247a01c8f6154a59a0330a82e72ed77a0af0c6e52f063074887f08ca2a02887da29f261417f895456
+  metadata.gz: 72973dbf8cccb3b7d9a5760782feaaeaa28ba7fca09d2e3a6eccd77b9676b3d9fed6aba30bd5753f0441d590523fe8a8e762a7166489162e195cac9ea4d25fae
+  data.tar.gz: f3e513398d4897c1e0fad293133bf5e9469c6df69bdf3f34ac9a91ef617b2e678caadd740891cfed670cd41d6551d758f986eef4319bc2067d3778353042a01d

data/lib/vcli/cli.rb

@@ -55,7 +55,7 @@ module Vcli
       rescue AbiquoAPIClient::BadRequest
         puts "Bad Request - HTTP 400 or 406 Received"
       rescue AbiquoAPIClient::NotFound
-        puts "Note Found - HTTP 400 Received"
+        puts "Not Found - HTTP 400 Received"
       rescue AbiquoAPIClient::UnsupportedMediaType
         puts "Unsupported Media Type Specified - HTTP 415 Received"
       end
@@ -85,25 +85,166 @@ module Vcli
     method_option :va, :type => :string, :required => true
     method_option :vdc, :type => :string, :required => true
     def deploy()
-      abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                          :abiquo_username => Vcli::user,
-                          :abiquo_password => Vcli::password)
-      # If --vm parameter passed
-      vdc=options[:vdc].to_s
-      va=options[:va].to_s
-      vm=options[:vm].to_s
-      if vm.length != 0
-        # if Virtual Machine Specified        
-        link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines/' + vm + '/action/deploy',
-                                  :type => 'application/vnd.abiquo.acceptedrequest+json')
-      else
-        # If no Virtual Machine specified its a Virtual Appliance       
-        link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/action/deploy')
+      begin
+        abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
+        # If --vm parameter passed
+        vdc=options[:vdc].to_s
+        va=options[:va].to_s
+        vm=options[:vm].to_s
+        if vm.length != 0
+          # if Virtual Machine Specified        
+          link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines/' + vm + '/action/deploy',
+                                    :type => 'application/vnd.abiquo.acceptedrequest+json')
+          reqdata=Hash.new
+          response=abq.post(link,reqdata)
+          puts "Deploying Virtual Machine"
+          puts "Waiting for VM to be deployed"
+          status=response.link(:status).get          
+          while status.state == "STARTED" && status.state != "LOCKED" do
+            status=response.link(:status).get
+            print "."
+            sleep 10
+          end
+        else
+          # If no Virtual Machine specified its a Virtual Appliance       
+          link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/action/deploy')
+          reqdata=Hash.new
+          response=abq.post(link,reqdata)
+          puts "Deploying Virtual Appliance"
+          puts "Waiting for VA to be Deployed"
+        end
+
+      rescue AbiquoAPIClient::Forbidden
+        puts "Forbidden HTTP 403 Received"
+      rescue AbiquoAPIClient::InvalidCredentials
+        puts "Invalid Credentials - HTTP 401 Received" 
+      rescue AbiquoAPIClient::BadRequest => e
+        puts "Bad Request - HTTP 400 or 406 Received"
+        puts e.inspect
+      rescue AbiquoAPIClient::NotFound
+        puts "Not Found - HTTP 400 Received"
+      rescue AbiquoAPIClient::UnsupportedMediaType
+        puts "Unsupported Media Type Specified - HTTP 415 Received"        
+      end
+    end
 
+    
+    desc "poweroff",
+    "poweroff [required]--vm=<virtualmachine id>
+    [required] --va=<virtualappliance id>
+    [required] --vdc=<vdc id>"
+    method_option :vm, :type => :string, :required =>true
+    method_option :va, :type => :string, :required => true
+    method_option :vdc, :type => :string, :required => true
+    def poweroff()
+      begin
+        abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
+        vdc=options[:vdc].to_s
+        va=options[:va].to_s
+        vm=options[:vm].to_s
+        link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines/' + vm + '/state',
+                                    :type => 'application/vnd.abiquo.virtualmachinestate+json')
+        reqdata=Hash.new
+        reqdata[:state]= "OFF"
+        reqoptions=Hash.new
+        reqoptions[:accept]  = 'application/vnd.abiquo.acceptedrequest+json'
+        print "Powering Off VM."
+        tries ||= 3
+        begin
+          response=abq.put(link,reqdata,reqoptions)
+          status=response.link(:status).get
+          while status.state == "STARTED" && status.state != "LOCKED" do
+            status=response.link(:status).get
+            print "."
+            sleep 10
+          end
+        rescue Exception=> e
+          retry unless (tries -= 1).zero?
+        end
+        puts
+        puts "VM Powered Off"
+      rescue AbiquoAPIClient::Forbidden
+        puts "Forbidden HTTP 403 Received"
+      rescue AbiquoAPIClient::InvalidCredentials
+        puts "Invalid Credentials - HTTP 401 Received" 
+      rescue AbiquoAPIClient::BadRequest => e
+        puts "Bad Request - HTTP 400 or 406 Received"
+        puts e.inspect
+      rescue AbiquoAPIClient::NotFound
+        puts "Not Found - HTTP 400 Received"
+      rescue AbiquoAPIClient::UnsupportedMediaType
+        puts "Unsupported Media Type Specified - HTTP 415 Received"        
       end
-      response=abq.post(link,"{}")
     end
-  
+
+    desc "poweron",
+    "poweron [required]--vm=<virtualmachine id>
+    [required] --va=<virtualappliance id>
+    [required] --vdc=<vdc id>"
+    method_option :vm, :type => :string, :required =>true
+    method_option :va, :type => :string, :required => true
+    method_option :vdc, :type => :string, :required => true
+    def poweron()
+      begin
+        abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
+        vdc=options[:vdc].to_s
+        va=options[:va].to_s
+        vm=options[:vm].to_s
+        link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines/' + vm + '/state',
+                                    :type => 'application/vnd.abiquo.virtualmachinestate+json')
+        reqdata=Hash.new
+        reqdata[:state]= "ON"
+        reqoptions=Hash.new
+        reqoptions[:accept]  = 'application/vnd.abiquo.acceptedrequest+json'
+        abq.put(link,reqdata,reqoptions)
+        puts "VM Powered On"
+      rescue AbiquoAPIClient::Forbidden
+        puts "Forbidden HTTP 403 Received"
+      rescue AbiquoAPIClient::InvalidCredentials
+        puts "Invalid Credentials - HTTP 401 Received" 
+      rescue AbiquoAPIClient::BadRequest => e
+        puts "Bad Request - HTTP 400 or 406 Received"
+        puts e.inspect
+      rescue AbiquoAPIClient::NotFound
+        puts "Not Found - HTTP 400 Received"
+      rescue AbiquoAPIClient::UnsupportedMediaType
+        puts "Unsupported Media Type Specified - HTTP 415 Received"        
+      end
+    end
+    
+    desc "reset",
+    "reset [required]--vm=<virtualmachine id>
+    [required] --va=<virtualappliance id>
+    [required] --vdc=<vdc id>"
+    method_option :vm, :type => :string, :required =>true
+    method_option :va, :type => :string, :required => true
+    method_option :vdc, :type => :string, :required => true
+    def reset()
+      begin
+        abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
+        # If --vm parameter passed
+        vdc=options[:vdc].to_s
+        va=options[:va].to_s
+        vm=options[:vm].to_s
+        link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines/' + vm + '/action/reset',
+                                    :type => 'application/vnd.abiquo.acceptedrequest+json')
+        reqdata=Hash.new
+        abq.post(link,reqdata)
+        puts "VM Reset"
+      rescue AbiquoAPIClient::Forbidden
+        puts "Forbidden HTTP 403 Received"
+      rescue AbiquoAPIClient::InvalidCredentials
+        puts "Invalid Credentials - HTTP 401 Received" 
+      rescue AbiquoAPIClient::BadRequest => e
+        puts "Bad Request - HTTP 400 or 406 Received"
+        puts e.inspect
+      rescue AbiquoAPIClient::NotFound
+        puts "Not Found - HTTP 400 Received"
+      rescue AbiquoAPIClient::UnsupportedMediaType
+        puts "Unsupported Media Type Specified - HTTP 415 Received"        
+      end
+    end
+    
     desc "undeploy",
     "undeploy [optional] --vm=<virtualmachine id>
     [required] --va=<virtualappliance id>
@@ -114,9 +255,7 @@ module Vcli
     method_option :force, :type => :boolean
     def undeploy()
       begin
-        abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                            :abiquo_username => Vcli::user,
-                            :abiquo_password => Vcli::password)
+        abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
         # If --vm parameter passed
         vdc=options[:vdc].to_s
         va=options[:va].to_s
@@ -127,9 +266,8 @@ module Vcli
         if force
           forcerequest[:forceUndeploy]=true      
         else
-          forcerequest[:forceUndeploy]=false        
-        end
-      
+          forcerequest[:forceUndeploy]=false         
+        end      
         request[:virtualmachinetask]=forcerequest
         if vm.length != 0
           # if Virtual Machine Specified        
@@ -143,41 +281,19 @@ module Vcli
         end
         reqoptions=Hash.new
         reqoptions[:accept]  = 'application/vnd.abiquo.acceptedrequest+json'
-        response=abq.post(link,request,reqoptions)
-        rescue AbiquoAPIClient::Forbidden
-          puts "Forbidden HTTP 403 Received"
-        rescue AbiquoAPIClient::InvalidCredentials
-          puts "Invalid Credentials - HTTP 401 Received" 
-        rescue AbiquoAPIClient::BadRequest => e
-          puts "Bad Request - HTTP 400 or 406 Received"
-          puts e.inspect
-        rescue AbiquoAPIClient::NotFound
-          puts "Not Found - HTTP 400 Received"
-        rescue AbiquoAPIClient::UnsupportedMediaType
-          puts "Unsupported Media Type Specified - HTTP 415 Received"
-        end
-    end
-
-    desc "poweron",
-    "poweron [optional] --vm=<virtualmachine id>
-    [required] --va=<virtualappliance id>
-    [required] --vdc=<vdc id>"
-    method_option :virtualmachine, :type => :string, :aliases => "-vm"
-    method_option :virtualappliance, :type => :string, :aliases => "-va", :required => true
-    method_option :vdc, :type => :string, :required => true
-    def poweron()
-        #TODO
-    end
-    
-    desc "poweroff",
-    "poweroff [optional] --vm=<virtualmachine id>
-    [required] --va=<virtualappliance id>
-    [required] --vdc=<vdc id>"
-    method_option :virtualmachine, :type => :string, :aliases => "-vm"
-    method_option :virtualappliance, :type => :string, :aliases => "-va", :required => true
-    method_option :vdc, :type => :string, :required => true
-    def poweroff()
-        #TODO
+        abq.post(link,request,reqoptions)
+      rescue AbiquoAPIClient::Forbidden
+        puts "Forbidden HTTP 403 Received"
+      rescue AbiquoAPIClient::InvalidCredentials
+        puts "Invalid Credentials - HTTP 401 Received" 
+      rescue AbiquoAPIClient::BadRequest => e
+        puts "Bad Request - HTTP 400 or 406 Received"
+        puts e.inspect
+      rescue AbiquoAPIClient::NotFound
+        puts "Not Found - HTTP 400 Received"
+      rescue AbiquoAPIClient::UnsupportedMediaType
+        puts "Unsupported Media Type Specified - HTTP 415 Received"
+      end
     end
   end
 end

data/lib/vcli/cli/create.rb

@@ -18,9 +18,7 @@ module Vcli
       desc "create virtualappliance", "create virtualappliance <name> <vdc>"
       def virtualappliance(name,vdc)
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances' ,
                                    :type => 'application/vnd.abiquo.virtualappliance+json')
           newvirtualappliance={name: name}
@@ -42,9 +40,7 @@ module Vcli
       desc "create vlan", "create vlan <name> <address> <mask> <gateway> <vdc id>"
       def vlan(name, address, mask, gateway, vdc)
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/privatenetworks' ,
                                    :type => 'application/vnd.abiquo.vlan+json')
           #  TODO Check the limits before creating new VLAN
@@ -70,26 +66,15 @@ module Vcli
       end
       
       desc "create virtualmachine", "create virtualmachine <name> <template id> <vdc id> <virtualappliance id>"
-      method_option :cpu,
-                    :type => :string,
-                    :aliases => "-t"
-      method_option :ram,
-                    :type => :string,
-                    :aliases => "-r"
-      method_option :description,
-                    :type => :string,
-                    :aliases => "-d"
-      method_option :password,
-                    :type => :string,
-                    :aliases => "-p"
+      method_option :cpu, :type => :string, :aliases => "-t"
+      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"
       def virtualmachine(name, template, vdc, va)
         begin
-
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
-          
-
+          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')
@@ -113,29 +98,54 @@ module Vcli
           }
           newvirtualmachine[:label]=linkhash[:title]
           newvirtualmachine[:label]=name
-          #link2hash["0"]=linkhash
           arrayforlinks=Array.new
           arrayforlinks[0]=link2hash
           newvirtualmachine[:links]=arrayforlinks
           cpu=options[:cpu].to_s
-          if cpu.length >0
-            newvirtualmachine[:cpu]= cpu
-          end
           ram=options[:ram].to_s
-          if ram.length >0
-            newvirtualmachine[:ram]= ram
-          end
           description=options[:description].to_s
-          if description.length >0
-            newvirtualmachine[:description]= description
-          end
           password=options[:password].to_s
-          if password.length >0
-            newvirtualmachine[:password]=password
-          end
+          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
+          newvirtualmachine[:password]=password if password.length >0
           newvirtualmachine[:vdrpEnabled]=true
+          # Create VirtualMachine
           response=abq.post(link,newvirtualmachine)
           puts "ID for Virtual Machine - #{response.id}"
+          system("vcli deploy --vdc=#{vdc} --va=#{va} --vm=#{response.id}")
+          sleep 20
+          puts
+          system("vcli poweroff --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
@@ -150,7 +160,6 @@ module Vcli
           puts "Error - "+ e.message
         end
       end
-      
     end
   end
 end

data/lib/vcli/cli/delete.rb

@@ -18,12 +18,10 @@ module Vcli
       desc "delete virtualappliance", "delete virtualappliance <virtualappliance id> <vdc id>"
       def virtualappliance(id,vdc)
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + id ,
                                    :type => 'application/vnd.abiquo.virtualappliance+json')
-          response=abq.delete(link)
+          abq.delete(link)
         rescue AbiquoAPIClient::Forbidden
           puts "Forbidden HTTP 403 Received"
         rescue AbiquoAPIClient::InvalidCredentials
@@ -40,12 +38,10 @@ module Vcli
       desc "delete vlan", "delete vlan <vlan id> <vdc id>"
       def vlan(id,vdc)
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/privatenetworks/' + id ,
                                    :type => 'application/vnd.abiquo.vlan+json')
-          response=abq.delete(link)
+          abq.delete(link)
           puts "VLAN Deleted"
         rescue AbiquoAPIClient::Forbidden
           puts "Forbidden HTTP 403 Received"
@@ -65,12 +61,10 @@ module Vcli
       desc "delete virtualmachine", "delete virtualmachine <virtualmachine id> <virtualappliance id> <vdc id>"
       def virtualmachine(vm, va, vdc)
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines/' + vm,
                                    :type => 'application/vnd.abiquo.virtualmachine+json')
-          response=abq.delete(link)
+          abq.delete(link)
           puts "VM Deleted"
         rescue AbiquoAPIClient::Forbidden
           puts "Forbidden HTTP 403 Received"

data/lib/vcli/cli/show.rb

@@ -52,9 +52,7 @@ module Vcli
       method_option :vdc, :type => :string
       def virtualappliances( )
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           # Get something on the screen
           puts "VDC,Appliance Name,Appliance ID"
           # If --vdc parameter passed
@@ -103,9 +101,7 @@ module Vcli
       method_option :free, :type => :boolean, :default => false
       def vlans( )
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           # Get something on the screen
           puts "VLAN ID,VLAN Name,VDC ID,Network,Mask,Gateway"
           # If --vdc parameter passed
@@ -151,9 +147,8 @@ module Vcli
                   end
                 }
               end
-              
             }
-          # If no --vdc parameter passwd
+          # If no --vdc parameter passed
           else
             # Cycle through all virtualdatacenters
             link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters',
@@ -186,9 +181,7 @@ module Vcli
       desc "show users", "Show all users within your account"
       def users( )
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           abq.user
           ent=abq.user.link(:enterprise).get
           link=AbiquoAPI::Link.new(:href => 'api/admin/enterprises/'+ent.id.to_s + '/users',
@@ -216,9 +209,7 @@ module Vcli
       method_option :ent, :type => :string
       def enterprise( )
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, 
-                              :abiquo_username => Vcli::user, 
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,  :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           ent=options[:ent].to_s
           if ent.length == 0 
             link=AbiquoAPI::Link.new(:href => 'api/admin/enterprises',
@@ -266,9 +257,7 @@ module Vcli
       desc "show templates", "show templates --vdc=<vdc id>"
       method_option :vdc, :type => :string, :required => true
       def templates( )
-        abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                            :abiquo_username => Vcli::user,
-                            :abiquo_password => Vcli::password)
+        abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
         vdc=options[:vdc].to_s
         link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/action/templates',
                                  :type => 'application/vnd.abiquo.virtualmachinetemplates+json',
@@ -287,9 +276,7 @@ module Vcli
       method_option :vdc, :type => :string
       def virtualdatacenters( )
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           vdc=options[:vdc].to_s
           if vdc.length==0
             link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters',
@@ -338,9 +325,7 @@ module Vcli
       method_option :vdc, :type => :string
       def virtualmachines( )
         begin
-          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
-                              :abiquo_username => Vcli::user,
-                              :abiquo_password => Vcli::password)
+          abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target, :abiquo_username => Vcli::user, :abiquo_password => Vcli::password)
           # If --vdc parameter passed
           va=options[:va].to_s
           vdc=options[:vdc].to_s

data/lib/vcli/version.rb

@@ -21,8 +21,9 @@ module Vcli
 #################################################################
 #  0.2.5  #31072015# Added deploy and undeploy for virtualappliance
 #         #        # and virtualmachines
+#################################################################
+#  0.2.6  #05082015# Added create virtualmachine
 #################################################################
 
-
-  VERSION = "0.2.5"
+  VERSION = "0.2.6"
 end

metadata

@@ -1,55 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vcli
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - Jay Fearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2015-08-05 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.4.5
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Command Line Interface for the Abiquo API