vcli 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ca49ce6cb3ce084f921e40b31fdbffa3ce0280d
-  data.tar.gz: ee9be5e5df59c172c3dde26e7ab68498d35d65ca
+  metadata.gz: b173126518d858853f8fde0e0b9d27fe71d7fe41
+  data.tar.gz: bcd88daf8c29e87f836299cc1515f0d7e1758e4a
 SHA512:
-  metadata.gz: 92acb347d9f3414130323438211c68bf76f92244c6dbdbb839d81feda4d44f90af2d9772739b428c2e1159e3540c41e14f541071cbf49cec69dc5836910f281c
-  data.tar.gz: 05784f604a14cd9a9bd140e31be5aac8ab96641686c4155dcd1c4d4df2b56a236ebd1039238827444405a6f966405441ae0df9404dfbcdb45a1ea7bfd957a302
+  metadata.gz: fc06acdf59f7578d0619d774d78f311a38aa36412c21aa8d63064b96d02e79589c7db357c6194ff657d90edb914a796668734711cce4b73822f21e3b1956fba7
+  data.tar.gz: 098e735691cfadf26c373b94480124f81f0546052707ae8247a01c8f6154a59a0330a82e72ed77a0af0c6e52f063074887f08ca2a02887da29f261417f895456

data/lib/vcli/cli.rb

@@ -76,5 +76,108 @@ module Vcli
     
     desc "delete COMMANDS", "Delete items within the Abiquo VDC" 
     subcommand "delete", Vcli::CLI::Delete
+
+    desc "deploy",
+    "deploy [optional] --vm=<virtualmachine id>
+    [required] --va=<virtualappliance id>
+    [required] --vdc=<vdc id>"
+    method_option :vm, :type => :string
+    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')
+
+      end
+      response=abq.post(link,"{}")
+    end
+  
+    desc "undeploy",
+    "undeploy [optional] --vm=<virtualmachine id>
+    [required] --va=<virtualappliance id>
+    [required] --vdc=<vdc id>"
+    method_option :vm, :type => :string
+    method_option :va, :type => :string,  :required => true
+    method_option :vdc, :type => :string, :required => true
+    method_option :force, :type => :boolean
+    def undeploy()
+      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
+        force=options[:force]
+        request=Hash.new
+        forcerequest=Hash.new
+        if force
+          forcerequest[:forceUndeploy]=true      
+        else
+          forcerequest[:forceUndeploy]=false        
+        end
+      
+        request[:virtualmachinetask]=forcerequest
+        if vm.length != 0
+          # if Virtual Machine Specified        
+          link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines/' + vm + '/action/undeploy',
+                                    :type => 'application/vnd.abiquo.virtualmachinetask+json')
+        else
+          # If no Virtual Machine specified its a Virtual Appliance       
+          link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/action/undeploy',
+                                   :type => 'application/vnd.abiquo.virtualmachinetask+json')
+
+        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
+    end
   end
 end

data/lib/vcli/cli/create.rb

@@ -89,8 +89,7 @@ module Vcli
                               :abiquo_username => Vcli::user,
                               :abiquo_password => Vcli::password)
           
-          # Get template link
-          
+
           # Link to post
           link=AbiquoAPI::Link.new(:href => 'api/cloud/virtualdatacenters/' + vdc + '/virtualappliances/' + va + '/virtualmachines' ,
                                    :type => 'application/vnd.abiquo.virtualmachine+json')

data/lib/vcli/cli/show.rb

@@ -99,6 +99,8 @@ module Vcli
       desc "show vlans", "Show all VLANS within your account, Options --vdc limits query to single VDC, --ips shows IP address"
       method_option :vdc, :type => :string
       method_option :ips, :type => :boolean
+      method_option :allocated, :type => :boolean, :default => false
+      method_option :free, :type => :boolean, :default => false
       def vlans( )
         begin
           abq = AbiquoAPI.new(:abiquo_api_url => Vcli::target,
@@ -120,7 +122,33 @@ module Vcli
                                          :type => 'application/vnd.abiquo.privateips+json')
                 listofips=abq.list(link2)
                 listofips.each { |m|
-                   puts "  - #{m.id}, #{m.ip}, #{m.name}"
+                  case options[:free]
+                  when true
+                    if !m.has_link?(:virtualmachine)
+                      virtualmachine="Free"
+                      puts "  - #{m.id}, #{m.ip}, #{virtualmachine}"
+                    end
+                  when false
+                    case options[:allocated]
+                    when true
+                      if m.has_link?(:virtualmachine)
+                        virtualmachinelink=m.link(:virtualmachine)
+                        virtualmachinelink.get
+                        virtualmachine=virtualmachinelink.title
+                        puts "  - #{m.id}, #{m.ip}, #{virtualmachine}"
+                      end
+                    when false
+                      if m.has_link?(:virtualmachine)
+                        virtualmachinelink=m.link(:virtualmachine)
+                        virtualmachinelink.get
+                        virtualmachine=virtualmachinelink.title
+                        puts "  - #{m.id}, #{m.ip}, #{virtualmachine}"
+                      else
+                        virtualmachine="Free"
+                        puts "  - #{m.id}, #{m.ip}, #{virtualmachine}"
+                      end
+                    end
+                  end
                 }
               end
               

data/lib/vcli/version.rb

@@ -19,6 +19,10 @@ module Vcli
 #         #        # nic uses default, need to work out nic
 #         #        # allocation.
 #################################################################
+#  0.2.5  #31072015# Added deploy and undeploy for virtualappliance
+#         #        # and virtualmachines
+#################################################################
+
 
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vcli
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.2.5
 platform: ruby
 authors:
 - Jay Fearn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-30 00:00:00.000000000 Z
+date: 2015-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,6 +66,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.5.5
+- !ruby/object:Gem::Dependency
+  name: rspec-core
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.3.0
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement