opennebula-cli 3.9.0.beta → 3.9.80.beta

data/lib/one_helper/onevnet_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2012, OpenNebula Project Leads (OpenNebula.org)             #
+# Copyright 2002-2013, OpenNebula Project (OpenNebula.org), C12G Labs        #
 #                                                                            #
 # Licensed under the Apache License, Version 2.0 (the "License"); you may    #
 # not use this file except in compliance with the License. You may obtain    #
@@ -15,6 +15,7 @@
 #--------------------------------------------------------------------------- #
 
 require 'one_helper'
+require 'one_helper/onevm_helper'
 
 class OneVNetHelper < OpenNebulaHelper::OneHelper
     def self.rname
@@ -97,7 +98,7 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         OpenNebula::VirtualNetworkPool.new(@client, user_flag)
     end
 
-    def format_resource(vn)
+    def format_resource(vn, options = {})
         str_h1="%-80s"
         CLIHelper.print_header(str_h1 %
             ["VIRTUAL NETWORK #{vn.id.to_s} INFORMATION"])
@@ -111,8 +112,10 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
         puts str % ["TYPE", vn.type_str]
         puts str % ["BRIDGE", vn["BRIDGE"]]
         puts str % ["VLAN", OpenNebulaHelper.boolean_to_str(vn['VLAN'])]
-        puts str % ["PHYSICAL DEVICE", vn["PHYDEV"]] if vn["PHYDEV"]
-        puts str % ["VLAN ID", vn["VLAN_ID"]] if vn["VLAN_ID"]
+        puts str % ["PHYSICAL DEVICE", vn["PHYDEV"]] if !vn["PHYDEV"].empty?
+        puts str % ["VLAN ID", vn["VLAN_ID"]] if !vn["VLAN_ID"].empty?
+        puts str % ["GLOBAL PREFIX", vn["GLOBAL_PREFIX"]] if !vn["GLOBAL_PREFIX"].empty?
+        puts str % ["SITE PREFIX", vn["SITE_PREFIX"]] if !vn["SITE_PREFIX"].empty?
         puts str % ["USED LEASES", vn['TOTAL_LEASES']]
         puts
 
@@ -152,5 +155,19 @@ class OneVNetHelper < OpenNebulaHelper::OneHelper
                 puts leases_str
             end
         }
+
+        puts
+        CLIHelper.print_header("VIRTUAL MACHINES", false)
+        puts
+
+        vms=vn.retrieve_elements("LEASES/LEASE/VID")
+
+        if vms
+            vms=vms.delete_if {|vm| vm=="-1" }
+            vms.map!{|e| e.to_i }
+            onevm_helper=OneVMHelper.new
+            onevm_helper.client=@client
+            onevm_helper.list_pool({:ids=>vms}, false)
+        end
     end
 end

metadata

@@ -1,43 +1,35 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: opennebula-cli
-version: !ruby/object:Gem::Version 
-  hash: -1897663041
-  prerelease: 6
-  segments: 
-  - 3
-  - 9
-  - 0
-  - beta
-  version: 3.9.0.beta
+version: !ruby/object:Gem::Version
+  version: 3.9.80.beta
+  prerelease: 7
 platform: ruby
-authors: 
+authors:
 - OpenNebula
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-12-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: opennebula-oca
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2013-03-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: opennebula
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: -1897663041
-        segments: 
-        - 3
-        - 9
-        - 0
-        - beta
-        version: 3.9.0.beta
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.80.beta
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.9.80.beta
 description: Commands used to talk to OpenNebula
 email: contact@opennebula.org
-executables: 
+executables:
 - oneacct
 - oneacl
 - onecluster
@@ -50,10 +42,8 @@ executables:
 - onevm
 - onevnet
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - bin/oneacct
 - bin/oneacl
 - bin/onecluster
@@ -84,38 +74,27 @@ files:
 - LICENSE
 homepage: http://opennebula.org
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
       version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.15
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: OpenNebula Client API
 test_files: []
-
+has_rdoc: