From 9f83400c6565c6215b0e986ba157e8244783e022 Mon Sep 17 00:00:00 2001
From: pan <601760354@163.com>
Date: Wed, 27 Mar 2024 14:47:10 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E5=88=AA=E9=99=A4=E8=A7=92=E8=89=B2?=
 =?UTF-8?q?=E9=A1=9Emachine?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/handler/base_yaml_check.py                   | 12 +++++++-----
 .../install_dependency/src/handler/connect_check.py  | 11 +++++------
 .../src/machine/builder_machine.py                   |  8 --------
 .../install_dependency/src/machine/devkit_machine.py |  8 --------
 .../src/machine/executor_machine.py                  |  8 --------
 tools/install_dependency/src/machine/klass_dict.py   | 12 ------------
 .../src/machine/scanner_machine.py                   |  8 --------
 7 files changed, 12 insertions(+), 55 deletions(-)
 delete mode 100644 tools/install_dependency/src/machine/builder_machine.py
 delete mode 100644 tools/install_dependency/src/machine/devkit_machine.py
 delete mode 100644 tools/install_dependency/src/machine/executor_machine.py
 delete mode 100644 tools/install_dependency/src/machine/klass_dict.py
 delete mode 100644 tools/install_dependency/src/machine/scanner_machine.py

diff --git a/tools/install_dependency/src/handler/base_yaml_check.py b/tools/install_dependency/src/handler/base_yaml_check.py
index 748a8b3..57028ae 100644
--- a/tools/install_dependency/src/handler/base_yaml_check.py
+++ b/tools/install_dependency/src/handler/base_yaml_check.py
@@ -2,7 +2,8 @@ import re
 import logging
 import constant
 from handler.handler_and_node import Handler
-from machine.klass_dict import KLASS_DICT
+from download import ROLE_LIST
+
 
 LOGGER = logging.getLogger("install_dependency")
 MIN_SET = (constant.USER, constant.PKEY, constant.INSTRUCTION)
@@ -48,11 +49,12 @@ class BaseCheck(Handler):
 
     @staticmethod
     def check_machine_ip(data):
-        for machine_type in (set(KLASS_DICT.keys()) & set(data.keys())):
-            if not data.get(machine_type) or not isinstance(data.get(machine_type), list):
-                LOGGER.error(f"Yaml file content not correct. Yaml file {machine_type} value not sequence.")
+        for role in ROLE_LIST:
+            ip_list = data.get(role, [])
+            if not isinstance(ip_list, list) or not ip_list:
+                LOGGER.error(f"Yaml file content not correct. Yaml file {role} value not sequence.")
                 return False
-            for ip in data.get(machine_type):
+            for ip in ip_list:
                 if not BaseCheck.validate_ip(ip):
                     LOGGER.error(f"Yaml file content not correct. Given ip: {ip} not correct.")
                     return False
diff --git a/tools/install_dependency/src/handler/connect_check.py b/tools/install_dependency/src/handler/connect_check.py
index e1e852f..66c6272 100644
--- a/tools/install_dependency/src/handler/connect_check.py
+++ b/tools/install_dependency/src/handler/connect_check.py
@@ -4,9 +4,9 @@ import socket
 import constant
 from handler.handler_and_node import Handler
 from machine.local_machine import LocalMachine
-from machine.klass_dict import KLASS_DICT
+from machine.machine import Machine
 from exception.connect_exception import ConnectException
-from download import ROLE_COMPONENT
+from download import ROLE_COMPONENT, ROLE_LIST
 
 LOGGER = logging.getLogger("install_dependency")
 
@@ -17,14 +17,13 @@ class ConnectCheck(Handler):
         local_ip = ConnectCheck.get_local_ip()
         data[constant.MACHINE] = dict()
         ret = True
-        for role in (set(KLASS_DICT.keys()) & set(data.keys())):
+        for role in ROLE_LIST:
             ret = ret and ConnectCheck.machine_role_check(data, role, local_ip)
         return ret
 
     @staticmethod
     def machine_role_check(data, role, local_ip):
         builder_list = data.get(role)
-        klass = KLASS_DICT.get(role)
         for ip in builder_list:
             if ip == local_ip or ip == "127.0.0.1":
                 ip = "127.0.0.1"
@@ -33,8 +32,8 @@ class ConnectCheck(Handler):
                 data[constant.MACHINE][ip] = machine_instance
                 continue
             try:
-                machine_instance = data[constant.MACHINE].get(ip, klass(ip, data[constant.USER], data[constant.PKEY],
-                                                                        data.get(constant.PASSWORD, None)))
+                machine_instance = data[constant.MACHINE].get(ip, Machine(ip, data[constant.USER], data[constant.PKEY],
+                                                                          data.get(constant.PASSWORD, None)))
                 machine_instance.add_component(ROLE_COMPONENT[role])
                 data[constant.MACHINE][ip] = machine_instance
             except ConnectException:
diff --git a/tools/install_dependency/src/machine/builder_machine.py b/tools/install_dependency/src/machine/builder_machine.py
deleted file mode 100644
index 8ee4479..0000000
--- a/tools/install_dependency/src/machine/builder_machine.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import constant
-from machine.machine import Machine
-
-
-class BuilderMachine(Machine):
-    def __init__(self, ip, user, pkey, password=None):
-        super(BuilderMachine, self).__init__(ip, user, pkey, password)
-        self.role = constant.BUILDER
diff --git a/tools/install_dependency/src/machine/devkit_machine.py b/tools/install_dependency/src/machine/devkit_machine.py
deleted file mode 100644
index 35147f4..0000000
--- a/tools/install_dependency/src/machine/devkit_machine.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import constant
-from machine.machine import Machine
-
-
-class DevkitMachine(Machine):
-    def __init__(self, ip, user, pkey, password=None):
-        super(DevkitMachine, self).__init__(ip, user, pkey, password)
-        self.role = constant.DEVKIT
diff --git a/tools/install_dependency/src/machine/executor_machine.py b/tools/install_dependency/src/machine/executor_machine.py
deleted file mode 100644
index 923c7a1..0000000
--- a/tools/install_dependency/src/machine/executor_machine.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import constant
-from machine.machine import Machine
-
-
-class ExecutorMachine(Machine):
-    def __init__(self, ip, user, pkey, password=None):
-        super(ExecutorMachine, self).__init__(ip, user, pkey, password)
-        self.role = constant.EXECUTOR
diff --git a/tools/install_dependency/src/machine/klass_dict.py b/tools/install_dependency/src/machine/klass_dict.py
deleted file mode 100644
index 835b999..0000000
--- a/tools/install_dependency/src/machine/klass_dict.py
+++ /dev/null
@@ -1,12 +0,0 @@
-import constant
-from machine.scanner_machine import ScannerMachine
-from machine.builder_machine import BuilderMachine
-from machine.executor_machine import ExecutorMachine
-from machine.devkit_machine import DevkitMachine
-
-KLASS_DICT = {
-    constant.EXECUTOR: ExecutorMachine,
-    constant.DEVKIT: DevkitMachine,
-    constant.SCANNER: ScannerMachine,
-    constant.BUILDER: BuilderMachine,
-}
diff --git a/tools/install_dependency/src/machine/scanner_machine.py b/tools/install_dependency/src/machine/scanner_machine.py
deleted file mode 100644
index 9377b52..0000000
--- a/tools/install_dependency/src/machine/scanner_machine.py
+++ /dev/null
@@ -1,8 +0,0 @@
-import constant
-from machine.machine import Machine
-
-
-class ScannerMachine(Machine):
-    def __init__(self, ip, user, pkey, password=None):
-        super(ScannerMachine, self).__init__(ip, user, pkey, password)
-        self.role = constant.SCANNER
-- 
Gitee


From c3b04af6938648e18cce644a6f91e013978b3660 Mon Sep 17 00:00:00 2001
From: pan <601760354@163.com>
Date: Wed, 27 Mar 2024 16:27:45 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E4=BE=9D=E8=B3=B4=E9=97=9C=E4=BF=82?=
 =?UTF-8?q?=E8=AA=BF=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/devkitdependencies.tar.gz             | Bin 0 -> 6941 bytes
 .../install_dependency/src/deploy/__init__.py |   0
 .../src/{ => deploy}/command_line.py          |   0
 .../src/{ => deploy}/lkp_collect_map.py       |  52 ++++++-------
 tools/install_dependency/src/deploy_main.py   |  57 ++++++++++++++
 .../src/download.py                           |   0
 .../src/download/__init__.py                  |   0
 .../src/download}/download_command_line.py    |   0
 .../src/download}/download_config.py          |   0
 .../src/download}/download_utils.py           |   0
 tools/install_dependency/src/download_main.py |  70 ++++++++++++++++++
 11 files changed, 153 insertions(+), 26 deletions(-)
 create mode 100644 tools/download_dependency/src/devkitdependencies.tar.gz
 create mode 100644 tools/install_dependency/src/deploy/__init__.py
 rename tools/install_dependency/src/{ => deploy}/command_line.py (100%)
 rename tools/install_dependency/src/{ => deploy}/lkp_collect_map.py (96%)
 create mode 100644 tools/install_dependency/src/deploy_main.py
 rename tools/{download_dependency => install_dependency}/src/download.py (100%)
 create mode 100644 tools/install_dependency/src/download/__init__.py
 rename tools/{download_dependency/src => install_dependency/src/download}/download_command_line.py (100%)
 rename tools/{download_dependency/src => install_dependency/src/download}/download_config.py (100%)
 rename tools/{download_dependency/src => install_dependency/src/download}/download_utils.py (100%)
 create mode 100644 tools/install_dependency/src/download_main.py

diff --git a/tools/download_dependency/src/devkitdependencies.tar.gz b/tools/download_dependency/src/devkitdependencies.tar.gz
new file mode 100644
index 0000000000000000000000000000000000000000..d4cecd9803228b81095b2b638134e9fd242a8dfa
GIT binary patch
literal 6941
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

literal 0
HcmV?d00001

diff --git a/tools/install_dependency/src/deploy/__init__.py b/tools/install_dependency/src/deploy/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tools/install_dependency/src/command_line.py b/tools/install_dependency/src/deploy/command_line.py
similarity index 100%
rename from tools/install_dependency/src/command_line.py
rename to tools/install_dependency/src/deploy/command_line.py
diff --git a/tools/install_dependency/src/lkp_collect_map.py b/tools/install_dependency/src/deploy/lkp_collect_map.py
similarity index 96%
rename from tools/install_dependency/src/lkp_collect_map.py
rename to tools/install_dependency/src/deploy/lkp_collect_map.py
index 2303e2c..e06a4f0 100644
--- a/tools/install_dependency/src/lkp_collect_map.py
+++ b/tools/install_dependency/src/deploy/lkp_collect_map.py
@@ -1,26 +1,26 @@
-import os.path
-
-from utils import base_path
-
-CURRENT_DEFAULT_PATH = "./devkitdependencies"
-
-lkp_collection_map = {
-    "LkpTests": {
-        "download file": {
-            "save_path": f"{os.path.join(CURRENT_DEFAULT_PATH, 'lkp-tests.tar.gz')}",
-        },
-        "download gem dependency": {
-            "save_path": f"{os.path.join(CURRENT_DEFAULT_PATH, 'gem_dependencies.zip')}",
-        },
-    },
-    "CompatibilityTesting": {
-        "download file": {
-            "save_path": f"{os.path.join(CURRENT_DEFAULT_PATH, 'compatibility_testing.tar.gz')}",
-        }
-    },
-    "DevkitDistribute": {
-        "download file": {
-            "save_path": f"{os.path.join(base_path('component'), 'DevkitDistribute', 'devkit_distribute.tar.gz')}",
-        }
-    }
-}
+import os.path
+
+from utils import base_path
+
+CURRENT_DEFAULT_PATH = "./devkitdependencies"
+
+lkp_collection_map = {
+    "LkpTests": {
+        "download file": {
+            "save_path": f"{os.path.join(CURRENT_DEFAULT_PATH, 'lkp-tests.tar.gz')}",
+        },
+        "download gem dependency": {
+            "save_path": f"{os.path.join(CURRENT_DEFAULT_PATH, 'gem_dependencies.zip')}",
+        },
+    },
+    "CompatibilityTesting": {
+        "download file": {
+            "save_path": f"{os.path.join(CURRENT_DEFAULT_PATH, 'compatibility_testing.tar.gz')}",
+        }
+    },
+    "DevkitDistribute": {
+        "download file": {
+            "save_path": f"{os.path.join(base_path('component'), 'DevkitDistribute', 'devkit_distribute.tar.gz')}",
+        }
+    }
+}
diff --git a/tools/install_dependency/src/deploy_main.py b/tools/install_dependency/src/deploy_main.py
new file mode 100644
index 0000000..a406e3a
--- /dev/null
+++ b/tools/install_dependency/src/deploy_main.py
@@ -0,0 +1,57 @@
+import os
+import subprocess
+import sys
+import logging
+
+
+import constant
+from log import config_logging
+from deploy.command_line import process_command_line, CommandLine
+
+from handler.pipeline import PipeLine
+from handler.base_yaml_check import BaseCheck
+from handler.connect_check import ConnectCheck
+from handler.gather_package import GatherPackage
+from handler.install_package import InstallPackage
+from utils import read_yaml_file
+
+LOGGER = logging.getLogger("install_dependency")
+PIPELINE = [BaseCheck(), ConnectCheck(), GatherPackage(), InstallPackage()]
+ISO_VERIFY_FLAG_STRING = "ISO 9660 CD-ROM filesystem data"
+
+
+def check_iso_available(iso_path):
+    if not os.path.isfile(iso_path):
+        LOGGER.error(f"ISO file is not in specified path. Error: {iso_path} file not found.")
+        sys.exit(1)
+    try:
+        result = subprocess.run(f"file -b {iso_path}".split(' '),
+                                capture_output=True, shell=False)
+        output = result.stdout.decode().strip()
+        if output.find(ISO_VERIFY_FLAG_STRING) == -1:
+            LOGGER.error(f"Verify iso result: Not available. Please re-download iso file.")
+            sys.exit(1)
+    except (FileNotFoundError, IsADirectoryError, PermissionError, Exception) as e:
+        LOGGER.error(f"Verify iso file integrity occur error: {str(e)}")
+        sys.exit(1)
+
+
+if __name__ == '__main__':
+    try:
+        process_command_line(program="install_dependency", description="devkit-pipeline install_dependency tool",
+                             class_list=[CommandLine])
+        config_logging(CommandLine.debug)
+        config_dict = read_yaml_file(CommandLine.yaml_path)
+
+        if CommandLine.iso_path:
+            config_dict[constant.INSTRUCTION] = "deploy_iso"
+            check_iso_available(CommandLine.iso_path)
+        else:
+            config_dict[constant.INSTRUCTION] = "default"
+        LOGGER.debug(f"-- config_dict: {config_dict}")
+
+        pipe = PipeLine(config_dict)
+        pipe.add_tail(*PIPELINE)
+        pipe.start()
+    except (KeyboardInterrupt, Exception) as e:
+        print(f"[warning] Program Exited. {str(e)}")
diff --git a/tools/download_dependency/src/download.py b/tools/install_dependency/src/download.py
similarity index 100%
rename from tools/download_dependency/src/download.py
rename to tools/install_dependency/src/download.py
diff --git a/tools/install_dependency/src/download/__init__.py b/tools/install_dependency/src/download/__init__.py
new file mode 100644
index 0000000..e69de29
diff --git a/tools/download_dependency/src/download_command_line.py b/tools/install_dependency/src/download/download_command_line.py
similarity index 100%
rename from tools/download_dependency/src/download_command_line.py
rename to tools/install_dependency/src/download/download_command_line.py
diff --git a/tools/download_dependency/src/download_config.py b/tools/install_dependency/src/download/download_config.py
similarity index 100%
rename from tools/download_dependency/src/download_config.py
rename to tools/install_dependency/src/download/download_config.py
diff --git a/tools/download_dependency/src/download_utils.py b/tools/install_dependency/src/download/download_utils.py
similarity index 100%
rename from tools/download_dependency/src/download_utils.py
rename to tools/install_dependency/src/download/download_utils.py
diff --git a/tools/install_dependency/src/download_main.py b/tools/install_dependency/src/download_main.py
new file mode 100644
index 0000000..48819ba
--- /dev/null
+++ b/tools/install_dependency/src/download_main.py
@@ -0,0 +1,70 @@
+import os
+import sys
+import shutil
+import tarfile
+import wget
+from download.download_command_line import process_command_line, CommandLine
+from download.download_utils import download_iso, download_dependence
+from utils import read_yaml_file, generate_component_list
+
+
+DEFAULT_PATH = "./devkitdependencies"
+DEPENDENCY_FILE = "devkitdependencies.tar.gz"
+
+# A-FOT files
+BASE_URL = "https://gitee.com/openeuler/A-FOT/raw/master/{}"
+A_FOT = "a-fot"
+A_FOT_INI = "a-fot.ini"
+AUTO_FDO_SH = "auto_fdo.sh"
+AUTO_BOLT_SH = "auto_bolt.sh"
+AUTO_PREFETCH = "auto_prefetch.sh"
+SPLIT_JSON_PY = "split_json.py"
+FILE_LIST = (A_FOT, A_FOT_INI, AUTO_FDO_SH, AUTO_BOLT_SH, AUTO_PREFETCH, SPLIT_JSON_PY)
+
+
+def download_a_fot():
+    saved_path = os.path.join(DEFAULT_PATH, A_FOT)
+    try:
+        os.mkdir(saved_path)
+    except FileExistsError as e:
+        pass
+
+    try:
+        for f in FILE_LIST:
+            wget.download(BASE_URL.format(f), os.path.join(saved_path, f))
+
+        with tarfile.open(os.path.join(DEFAULT_PATH, "a-fot.tar.gz"), "w:gz") as t:
+            t.add(saved_path, arcname="a-fot")
+        return True
+    except Exception as e:
+        print(e)
+        return False
+    finally:
+        shutil.rmtree(saved_path)
+
+
+if __name__ == '__main__':
+    try:
+        process_command_line(program="download_dependency", description="devkit-pipeline download_dependency tool",
+                             class_list=[CommandLine])
+        if CommandLine.download_iso:
+            if download_iso():
+                print("-- Download iso success. --")
+            else:
+                print("Download iso failed.")
+            sys.exit(0)
+        config_dict = read_yaml_file(CommandLine.yaml_path)
+        ret = download_dependence(generate_component_list(config_dict))
+        if ret:
+            print(f"Now compress dependencies to {DEPENDENCY_FILE}...")
+            with tarfile.open(DEPENDENCY_FILE, "w:gz") as tar:
+                tar.add(DEFAULT_PATH, arcname=os.path.basename(DEFAULT_PATH))
+
+            print(f"-- Compress dependencies to {DEPENDENCY_FILE} success. --")
+            shutil.rmtree(DEFAULT_PATH)
+            print("-- Delete dependencies directory. --")
+        else:
+            print("-- Download dependencies failed. Please try execute download tool again. --")
+    except (KeyboardInterrupt, Exception) as e:
+        print(f"\nDownload dependencies failed. {str(e)} Please try execute download tool again.")
+        sys.exit(1)
-- 
Gitee