opennebula-cli 5.12.5 → 5.13.85.pre

data/lib/one_helper/onevdc_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/one_helper/onevm_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -252,7 +252,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
         end
 
         vm_nics.each do |nic|
-            %w[IP IP6_GLOBAL IP6_ULA IP6
+            %w[IP EXTERNAL_IP IP6_GLOBAL IP6_ULA IP6
                VROUTER_IP VROUTER_IP6_GLOBAL VROUTER_IP6_ULA].each do |attr|
                 if nic.key?(attr)
                     ips.push(nic[attr])
@@ -985,7 +985,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
             vm_nics.each do |nic|
                 next if nic.key?('CLI_DONE')
 
-                %w[IP6_LINK IP6_ULA IP6_GLOBAL IP6].each do |attr|
+                %w[EXTERNAL_IP IP6_LINK IP6_ULA IP6_GLOBAL IP6].each do |attr|
                     next unless nic.key?(attr)
 
                     shown_ips << nic[attr]
@@ -1013,6 +1013,7 @@ class OneVMHelper < OpenNebulaHelper::OneHelper
                 end
 
                 shown_ips << nic['IP'] if nic.key?('IP')
+                shown_ips << nic['EXTERNAL_IP'] if nic.key?('EXTERNAL_IP')
 
                 nic.merge!(nic_default) {|_k, v1, _v2| v1 }
                 array_id += 1

data/lib/one_helper/onevmgroup_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/one_helper/onevnet_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/one_helper/onevntemplate_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #

data/lib/one_helper/onevrouter_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -38,25 +38,6 @@ class OneVirtualRouterHelper < OpenNebulaHelper::OneHelper
         "onevrouter.yaml"
     end
 
-    def show_resource(id, options)
-        resource = retrieve_resource(id)
-
-        if !options[:extended].nil?
-            rc = resource.info(options[:extended])
-        else
-            rc = resource.info
-        end
-
-        return -1, rc.message if OpenNebula.is_error?(rc)
-
-        if options[:xml]
-            return 0, resource.to_xml(true)
-        else
-            format_resource(resource, options)
-            return 0
-        end
-    end
-
     def format_pool(options)
         config_file = self.class.table_conf
 

data/lib/one_helper/onezone_helper.rb

@@ -1,5 +1,5 @@
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2020, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                #
 #                                                                            #
 # 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    #
@@ -38,8 +38,6 @@ class Replicator
           :service => 'opennebula' },
         { :name    => 'monitord.conf',
           :service => 'opennebula' },
-        { :name    => 'econe.conf',
-          :service => 'opennebula-econe' },
         { :name    => 'oneflow-server.conf',
           :service => 'opennebula-flow' },
         { :name    => 'onegate-server.conf',
@@ -57,7 +55,6 @@ class Replicator
     FOLDERS = [
         { :name => 'sunstone-views', :service => 'opennebula-sunstone' },
         { :name => 'auth', :service => 'opennebula' },
-        { :name => 'ec2query_templates', :service => 'opennebula' },
         { :name => 'hm', :service => 'opennebula' },
         { :name => 'sunstone-views', :service => 'opennebula' },
         { :name => 'vmm_exec', :service => 'opennebula' }
@@ -99,8 +96,7 @@ class Replicator
         @opennebula_services = { 'opennebula'          => false,
                                  'opennebula-sunstone' => false,
                                  'opennebula-gate'     => false,
-                                 'opennebula-flow'     => false,
-                                 'opennebula-econe'    => false }
+                                 'opennebula-flow'     => false }
     end
 
     # Process files and folders
@@ -470,6 +466,17 @@ class OneZoneHelper < OpenNebulaHelper::OneHelper
 
         if options[:xml]
             return 0, resource.to_xml(true)
+        elsif options[:json]
+            # If body is set, the resource contains a JSON inside
+            if options[:body]
+                return 0, check_resource_xsd(resource)
+            else
+                return 0, ::JSON.pretty_generate(
+                    check_resource_xsd(resource)
+                )
+            end
+        elsif options[:yaml]
+            return 0, check_resource_xsd(resource).to_yaml(:indent => 4)
         else
             format_resource(resource, options)
             return 0

data/share/schemas/xsd/acct.xsd

@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+
+  <xs:element name="HISTORY_RECORDS">
+    <xs:complexType>
+      <xs:sequence maxOccurs="1" minOccurs="1">
+        <xs:element ref="HISTORY" maxOccurs="unbounded" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+
+  <xs:element name="HISTORY">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="OID" type="xs:integer"/>
+        <xs:element name="SEQ" type="xs:integer"/>
+        <xs:element name="HOSTNAME" type="xs:string"/>
+        <xs:element name="HID" type="xs:integer"/>
+        <xs:element name="CID" type="xs:integer"/>
+        <xs:element name="STIME" type="xs:integer"/>
+        <xs:element name="ETIME" type="xs:integer"/>
+        <xs:element name="VM_MAD" type="xs:string"/>
+        <xs:element name="TM_MAD" type="xs:string"/>
+        <xs:element name="DS_ID" type="xs:integer"/>
+        <xs:element name="PSTIME" type="xs:integer"/>
+        <xs:element name="PETIME" type="xs:integer"/>
+        <xs:element name="RSTIME" type="xs:integer"/>
+        <xs:element name="RETIME" type="xs:integer"/>
+        <xs:element name="ESTIME" type="xs:integer"/>
+        <xs:element name="EETIME" type="xs:integer"/>
+
+        <!-- ACTION values:
+          NONE_ACTION             = 0
+          MIGRATE_ACTION          = 1
+          LIVE_MIGRATE_ACTION     = 2
+          SHUTDOWN_ACTION         = 3
+          SHUTDOWN_HARD_ACTION    = 4
+          UNDEPLOY_ACTION         = 5
+          UNDEPLOY_HARD_ACTION    = 6
+          HOLD_ACTION             = 7
+          RELEASE_ACTION          = 8
+          STOP_ACTION             = 9
+          SUSPEND_ACTION          = 10
+          RESUME_ACTION           = 11
+          BOOT_ACTION             = 12
+          DELETE_ACTION           = 13
+          DELETE_RECREATE_ACTION  = 14
+          REBOOT_ACTION           = 15
+          REBOOT_HARD_ACTION      = 16
+          RESCHED_ACTION          = 17
+          UNRESCHED_ACTION        = 18
+          POWEROFF_ACTION         = 19
+          POWEROFF_HARD_ACTION    = 20
+          DISK_ATTACH_ACTION      = 21
+          DISK_DETACH_ACTION      = 22
+          NIC_ATTACH_ACTION       = 23
+          NIC_DETACH_ACTION       = 24
+          DISK_SNAPSHOT_CREATE_ACTION = 25
+          DISK_SNAPSHOT_DELETE_ACTION = 26
+          TERMINATE_ACTION        = 27
+          TERMINATE_HARD_ACTION   = 28
+          DISK_RESIZE_ACTION      = 29
+          DEPLOY_ACTION           = 30
+          CHOWN_ACTION            = 31
+          CHMOD_ACTION            = 32
+          UPDATECONF_ACTION       = 33
+          RENAME_ACTION           = 34
+          RESIZE_ACTION           = 35
+          UPDATE_ACTION           = 36
+          SNAPSHOT_CREATE_ACTION  = 37
+          SNAPSHOT_DELETE_ACTION  = 38
+          SNAPSHOT_REVERT_ACTION  = 39
+          DISK_SAVEAS_ACTION      = 40
+          DISK_SNAPSHOT_REVERT_ACTION = 41
+          RECOVER_ACTION          = 42
+          RETRY_ACTION            = 43
+          MONITOR_ACTION          = 44
+          DISK_SNAPSHOT_RENAME_ACTION = 45
+        -->
+        <xs:element name="ACTION" type="xs:integer"/>
+        <xs:element name="UID" type="xs:integer"/>
+        <xs:element name="GID" type="xs:integer"/>
+        <xs:element name="REQUEST_ID" type="xs:string"/>
+        <xs:element name="VM">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer"/>
+              <xs:element name="UID" type="xs:integer"/>
+              <xs:element name="GID" type="xs:integer"/>
+              <xs:element name="UNAME" type="xs:string"/>
+              <xs:element name="GNAME" type="xs:string"/>
+              <xs:element name="NAME" type="xs:string"/>
+              <xs:element name="PERMISSIONS" minOccurs="0" maxOccurs="1">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="OWNER_U" type="xs:integer"/>
+                    <xs:element name="OWNER_M" type="xs:integer"/>
+                    <xs:element name="OWNER_A" type="xs:integer"/>
+                    <xs:element name="GROUP_U" type="xs:integer"/>
+                    <xs:element name="GROUP_M" type="xs:integer"/>
+                    <xs:element name="GROUP_A" type="xs:integer"/>
+                    <xs:element name="OTHER_U" type="xs:integer"/>
+                    <xs:element name="OTHER_M" type="xs:integer"/>
+                    <xs:element name="OTHER_A" type="xs:integer"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+              <xs:element name="LAST_POLL" type="xs:integer"/>
+
+              <!-- STATE values,
+              see http://docs.opennebula.org/stable/user/references/vm_states.html
+              -->
+              <xs:element name="STATE" type="xs:integer"/>
+
+              <!-- LCM_STATE values, this sub-state is relevant only when STATE is
+                   ACTIVE (4)
+              see http://docs.opennebula.org/stable/user/references/vm_states.html
+              -->
+              <xs:element name="LCM_STATE" type="xs:integer"/>
+              <xs:element name="PREV_STATE" type="xs:integer"/>
+              <xs:element name="PREV_LCM_STATE" type="xs:integer"/>
+              <xs:element name="RESCHED" type="xs:integer"/>
+              <xs:element name="STIME" type="xs:integer"/>
+              <xs:element name="ETIME" type="xs:integer"/>
+              <xs:element name="DEPLOY_ID" type="xs:string"/>
+              <xs:element name="MONITORING">
+              <!--
+                <xs:complexType>
+                  <xs:all>
+                    <- Percentage of 1 CPU consumed (two fully consumed cpu is 200) ->
+                    <xs:element name="CPU" type="xs:decimal" minOccurs="0" maxOccurs="1"/>
+
+                    <- MEMORY consumption in kilobytes ->
+                    <xs:element name="MEMORY" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+
+                    <- NETTX: Sent bytes to the network ->
+                    <xs:element name="NETTX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+
+                    <- NETRX: Received bytes from the network ->
+                    <xs:element name="NETRX" type="xs:integer" minOccurs="0" maxOccurs="1"/>
+                  </xs:all>
+                </xs:complexType>
+              -->
+              </xs:element>
+              <xs:element name="TEMPLATE" type="xs:anyType"/>
+              <xs:element name="USER_TEMPLATE" type="xs:anyType"/>
+              <xs:element name="HISTORY_RECORDS">
+              </xs:element>
+              <xs:element name="SNAPSHOTS" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="ALLOW_ORPHANS" type="xs:string"/>
+                    <xs:element name="CURRENT_BASE" type="xs:integer"/>
+                    <xs:element name="DISK_ID" type="xs:integer"/>
+                    <xs:element name="NEXT_SNAPSHOT" type="xs:integer"/>
+                    <xs:element name="SNAPSHOT" minOccurs="0" maxOccurs="unbounded">
+                      <xs:complexType>
+                        <xs:sequence>
+                          <xs:element name="ACTIVE" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:element name="CHILDREN" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:element name="DATE" type="xs:integer"/>
+                          <xs:element name="ID" type="xs:integer"/>
+                          <xs:element name="NAME" type="xs:string" minOccurs="0" maxOccurs="1"/>
+                          <xs:element name="PARENT" type="xs:integer"/>
+                          <xs:element name="SIZE" type="xs:integer"/>
+                        </xs:sequence>
+                      </xs:complexType>
+                    </xs:element>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

data/share/schemas/xsd/acl_pool.xsd

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+  <xs:element name="ACL_POOL">
+    <xs:complexType>
+      <xs:sequence maxOccurs="1" minOccurs="1">
+        <xs:element name="ACL" maxOccurs="unbounded" minOccurs="0">
+          <xs:complexType>
+            <xs:sequence>
+              <xs:element name="ID" type="xs:integer"/>
+              <xs:element name="USER" type="xs:string"/>
+              <xs:element name="RESOURCE" type="xs:string"/>
+              <xs:element name="RIGHTS" type="xs:string"/>
+              <xs:element name="ZONE" type="xs:string"/>
+              <xs:element name="STRING" type="xs:string"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

data/share/schemas/xsd/api_info.xsd

@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- The information sent to the hook when $API is used in an API Hook follos the following schema   -->
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns="http://opennebula.org/XMLSchema" elementFormDefault="qualified" targetNamespace="http://opennebula.org/XMLSchema">
+  <xs:element name="CALL_INFO">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="RESULT" type="xs:integer"/>
+        <xs:element name="PARAMETERS" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <!-- The list of IN and OUT parameters will match the API call parameters defined here: http://docs.opennebula.org/5.9/integration/system_interfaces/api.html   -->
+              <xs:element name="PARAMETER" minOccurs="0" maxOccurs="unbounded">
+                <xs:complexType>
+                  <xs:sequence>
+                    <xs:element name="POSITION" type="xs:integer"/>
+                    <xs:element name="TYPE" type="xs:integer">
+                      <xs:simpleType>
+                        <xs:restriction base="xs:string">
+                        <xs:enumeration value="IN"/>
+                        <xs:enumeration value="OUT"/>
+                        </xs:restriction>
+                      </xs:simpleType>
+                    </xs:element>
+                    <xs:element name="VALUE" type="xs:string"/>
+                  </xs:sequence>
+                </xs:complexType>
+              </xs:element>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+        <!-- This info is only included when the API hook is set on a one.*.delete or one.*.allocate API call   -->
+        <xs:element name="EXTRA" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:sequence>
+              <!-- EXTRA section will contain the template of the allocated/deleted resource as defined here; https://github.com/OpenNebula/one/tree/master/share/doc/xsd  -->
+              <xs:any minOccurs="0" maxOccurs="unbounded" processContents="skip"/>
+            </xs:sequence>
+          </xs:complexType>
+        </xs:element>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

data/share/schemas/xsd/cluster.xsd

@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+  <xs:element name="CLUSTER">
+    <xs:complexType>
+      <xs:sequence>
+        <xs:element name="ID" type="xs:integer"/>
+        <xs:element name="NAME" type="xs:string"/>
+        <xs:element name="HOSTS">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+              </xs:complexType>
+        </xs:element>
+        <xs:element name="DATASTORES">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+              </xs:complexType>
+        </xs:element>
+        <xs:element name="VNETS">
+              <xs:complexType>
+                <xs:sequence>
+                  <xs:element name="ID" type="xs:integer" minOccurs="0" maxOccurs="unbounded"/>
+                </xs:sequence>
+              </xs:complexType>
+        </xs:element>
+        <xs:element name="TEMPLATE" type="xs:anyType"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>

data/share/schemas/xsd/cluster_pool.xsd

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified"
+  targetNamespace="http://opennebula.org/XMLSchema" xmlns="http://opennebula.org/XMLSchema">
+  <xs:include schemaLocation="cluster.xsd"/>
+  <xs:element name="CLUSTER_POOL">
+    <xs:complexType>
+      <xs:sequence maxOccurs="1" minOccurs="1">
+        <xs:element ref="CLUSTER" maxOccurs="unbounded" minOccurs="0"/>
+      </xs:sequence>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>