OpenNebula · openmilanese · May 6, 2024 · May 6, 2024 · May 8, 2024 · May 9, 2024
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -31,10 +31,6 @@ Add any other context about the problem here.
 <!--////////////////////////////////////////////-->
 
 ## Progress Status
-- [ ] Branch created 
-- [ ] Code committed to development branch
+- [ ] Code committed
 - [ ] Testing - QA
-- [ ] Documentation 
-- [ ] Release notes - resolved issues, compatibility, known issues
-- [ ] Code committed to upstream release/hotfix branches
-- [ ] Documentation committed to upstream release/hotfix branches
+- [ ] Documentation (Release notes - resolved issues, compatibility, known issues)
diff --git a/.github/ISSUE_TEMPLATE/enhancement-request.md b/.github/ISSUE_TEMPLATE/enhancement-request.md
@@ -23,10 +23,6 @@ Add any other context or screenshots about the feature request here. Or any othe
 <!--////////////////////////////////////////////-->
 
 ## Progress Status
-- [ ] Branch created
-- [ ] Code committed to development branch
+- [ ] Code committed
 - [ ] Testing - QA
-- [ ] Documentation
-- [ ] Release notes - resolved issues, compatibility, known issues
-- [ ] Code committed to upstream release/hotfix branches
-- [ ] Documentation committed to upstream release/hotfix branches
+- [ ] Documentation (Release notes - resolved issues, compatibility, known issues)
diff --git a/.github/workflows/smoke_tests.yml b/.github/workflows/smoke_tests.yml
@@ -3,6 +3,9 @@ name: OpenNebula Smoke Tests
 # Controls when the action will run.
 on: [push, pull_request, workflow_dispatch]
 
+permissions:
+  contents: read
+
 jobs:
   smoke-tests:
     runs-on: ubuntu-latest

diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,5 @@
+.gitignore
+src/fireedge/package-lock.json
 *.a
 *.o
 *.pyc
@@ -68,7 +70,7 @@ share/esx-fw-vnc/*.rpm
 share/esx-fw-vnc/.vagrant*
 
 *.vscode
-
+*.code-workspace
 share/context/*
 !share/context/download_context.sh
 !share/context/SConstruct

diff --git a/README.md b/README.md
@@ -1,7 +1,5 @@
 # [![OpenNebula Logo](https://opennebula.io/wp-content/uploads/2019/04/img-logo-blue.svg)](https://opennebula.io/)
 
-![Smoke Tests](https://github.com/OpenNebula/one-ee/actions/workflows/smoke_tests.yml/badge.svg)
-
 ## Description
 
 [OpenNebula](http://opennebula.io) is an open source platform delivering a simple but feature-rich and flexible solution to build and manage enterprise clouds for virtualized services, containerized applications and serverless computing.
@@ -59,7 +57,7 @@ After the OpenNebula Front-end is correctly set up, the next step is preparing t
 
 ## License
 
-Copyright 2002-2021, OpenNebula Project, OpenNebula Systems (formerly C12G Labs)
+Copyright 2002-2022, OpenNebula Project, OpenNebula Systems (formerly 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 a copy of the License at http://www.apache.org/licenses/LICENSE-2.0
 

diff --git a/SConstruct b/SConstruct
@@ -1,6 +1,6 @@
 # -*- coding: utf-8 -*-
 # -------------------------------------------------------------------------- #
-# Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                #
+# Copyright 2002-2022, 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    #

diff --git a/include/AclManager.h b/include/AclManager.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/AclRule.h b/include/AclRule.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/ActionSet.h b/include/ActionSet.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/AddressRange.h b/include/AddressRange.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/AddressRangeIPAM.h b/include/AddressRangeIPAM.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/AddressRangeInternal.h b/include/AddressRangeInternal.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/AddressRangePool.h b/include/AddressRangePool.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/Attribute.h b/include/Attribute.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/AuthManager.h b/include/AuthManager.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/AuthRequest.h b/include/AuthRequest.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/Backups.h b/include/Backups.h
@@ -0,0 +1,208 @@
+/* -------------------------------------------------------------------------- */
+/* Copyright 2002-2022, 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    */
+/* a copy of the License at                                                   */
+/*                                                                            */
+/* http://www.apache.org/licenses/LICENSE-2.0                                 */
+/*                                                                            */
+/* Unless required by applicable law or agreed to in writing, software        */
+/* distributed under the License is distributed on an "AS IS" BASIS,          */
+/* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.   */
+/* See the License for the specific language governing permissions and        */
+/* limitations under the License.                                             */
+/* -------------------------------------------------------------------------- */
+
+#ifndef BACKUPS_H_
+#define BACKUPS_H_
+
+#include <string>
+#include <map>
+
+#include "ObjectCollection.h"
+#include "Template.h"
+
+class ObjectXML;
+
+/**
+ *  This class represents the backup information of a VM, it consists of two
+ *  parts, configuration and list of backups
+ *  The schema is as follows:
+ *  <BACKUPS>
+ *   <BACKUP_CONFIG>
+ *     <KEEP_LAST> Just keep the last N backups
+ *     <BACKUP_VOLATILE> Backup volatile disks or not
+ *     <FS_FREEZE> FS freeze operation to perform on the VM
+ *     <LAST_DATASTORE_ID> The dastore ID used to store the active backups(*)
+ *     <LAST_BACKUP_ID> ID of the active backup(*)
+ *     <LAST_BACKUP_SIZE> SIZE of the active backup(*)
+ *   <BACKUP_IDS>
+ *     <ID> ID of the image with a valid backup
+ *
+ *  (*) refers to the active backup operation, and are only present while
+ *  a backup is being performed
+ *
+ *  Configuration attributes defaults
+ *    - BACKUP_VOLATILE "NO"
+ *    - FS_FREEZE "NONE"
+ *    - KEEP_LAST (empty = keep all)
+ */
+class Backups
+{
+public:
+    Backups();
+
+    ~Backups() = default;
+
+    // *************************************************************************
+    // Inititalization functions
+    // *************************************************************************
+
+    /**
+     *  Builds the snapshot list from its XML representation. This function
+     *  is used when importing it from the DB.
+     *    @param node xmlNode for the template
+     *    @return 0 on success
+     */
+    int from_xml(const ObjectXML* xml);
+
+    /**
+     *  XML Representation of the Snapshots
+     */
+    std::string& to_xml(std::string& xml) const;
+
+    /**
+     *  Gets the BACKUP_CONFIG attribute attribute and parses the associated
+     *  attributes:
+     *     - BACKUP_VOLATILE
+     *     - KEEP_LAST
+     *     - FS_FREEZE
+     *
+     *  The following attributes are stored in the configuration and refers
+     *  only to the active backup operation
+     *     - LAST_DATASTORE_ID
+     *     - LAST_BACKUP_ID
+     *     - LAST_BACKUP_SIZE
+     */
+    int parse(std::string& error_str, Template *tmpl);
+
+    /**
+     *  @return true if the backup needs to include volatile disks
+     */
+    bool do_volatile() const;
+
+    /**
+     *  Set of functions to manipulate the LAST_* attributes referring to
+     *  the active backup operation
+     */
+    void last_datastore_id(int ds_id)
+    {
+        config.replace("LAST_DATASTORE_ID", ds_id);
+    }
+
+    void last_backup_id(const std::string& id)
+    {
+        config.replace("LAST_BACKUP_ID", id);
+    }
+
+    void last_backup_size(const std::string& size)
+    {
+        config.replace("LAST_BACKUP_SIZE", size);
+    }
+
+    /* ---------------------------------------------------------------------- */
+
+    int last_datastore_id() const
+    {
+        int dst;
+
+        config.get("LAST_DATASTORE_ID", dst);
+
+        return dst;
+    }
+
+    std::string last_backup_id() const
+    {
+        std::string id;
+
+        config.get("LAST_BACKUP_ID", id);
+
+        return id;
+    }
+
+    std::string last_backup_size() const
+    {
+        std::string sz;
+
+        config.get("LAST_BACKUP_SIZE", sz);
+
+        return sz;
+    }
+
+    /* ---------------------------------------------------------------------- */
+
+    void last_backup_clear()
+    {
+        config.erase("LAST_DATASTORE_ID");
+
+        config.erase("LAST_BACKUP_ID");
+        config.erase("LAST_BACKUP_SIZE");
+    }
+
+    /**
+     *  @param riids Return the backups that needs to be removed to conform
+     *  to KEEP_LAST configuration
+     */
+    void remove_last(std::set<int> &riids) const
+    {
+        int kl;
+
+        riids.clear();
+
+        if (!config.get("KEEP_LAST", kl) || kl == 0)
+        {
+            return;
+        }
+
+        auto iids = ids.get_collection();
+        auto it   = iids.cbegin();
+
+        int to_remove = iids.size() - kl;
+
+        for (int i = 0 ; i < to_remove && it != iids.cend() ; ++i, ++it)
+        {
+            riids.insert(*it);
+        }
+    }
+
+    /**
+     *  Adds / deletes a backup from the list. Each backup is represented by
+     *  an image in the backup datastore. The list holds the ID's of the images
+     *
+     *  @return 0 on success -1 if an error adding (already present) or deleting
+     *  (not present) occurred
+     */
+    int add(int id)
+    {
+        return ids.add(id);
+    }
+
+    int del(int id)
+    {
+        return ids.del(id);
+    }
+
+private:
+    /**
+     *  Text representation of the backup information of the VM
+     */
+    Template config;
+
+    /**
+     *  Backups of the VM as a collection of Image ID
+     */
+    ObjectCollection ids;
+};
+
+#endif /*BACKUPS_H_*/
diff --git a/include/BitMap.h b/include/BitMap.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/CachePool.h b/include/CachePool.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/Callbackable.h b/include/Callbackable.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/Client.h b/include/Client.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */

diff --git a/include/Cluster.h b/include/Cluster.h
@@ -1,5 +1,5 @@
 /* ------------------------------------------------------------------------ */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems              */
+/* Copyright 2002-2022, 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  */

diff --git a/include/ClusterPool.h b/include/ClusterPool.h
@@ -1,5 +1,5 @@
 /* -------------------------------------------------------------------------- */
-/* Copyright 2002-2021, OpenNebula Project, OpenNebula Systems                */
+/* Copyright 2002-2022, 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    */