Merge branch 'dev' into staging

vktrrdk · vktrrdk · commit 373af930c253 · 2024-10-10T07:51:08.000Z
diff --git a/.github/workflows/build_image.yml b/.github/workflows/build_image.yml
@@ -8,5 +8,5 @@ jobs:
               uses: rokroskar/workflow-run-cleanup-action@v0.3.3
               env:
                 GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
-            - uses: actions/checkout@v4.1.7
+            - uses: actions/checkout@v4.2.1
             - run: docker build --no-cache .
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -35,7 +35,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4.1.7
+      uses: actions/checkout@v4.2.1
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
diff --git a/.github/workflows/master-protection.yml b/.github/workflows/master-protection.yml
@@ -14,7 +14,7 @@ jobs:
         uses: rokroskar/workflow-run-cleanup-action@v0.3.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.1
 
       - name: Check Tag
         run: |
diff --git a/.github/workflows/publish_docker.yml b/.github/workflows/publish_docker.yml
@@ -15,7 +15,7 @@ jobs:
         uses: rokroskar/workflow-run-cleanup-action@v0.3.3
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      - uses: actions/checkout@v4.1.7
+      - uses: actions/checkout@v4.2.1
       - name: Extract branch name
         shell: bash
         run: echo "##[set-output name=branch;]$(echo ${GITHUB_REF#refs/heads/})"
diff --git a/.github/workflows/release_image.yml b/.github/workflows/release_image.yml
@@ -11,7 +11,7 @@ jobs:
      - name: Get the version
        id: get_version
        run: echo ::set-output name=VERSION::${GITHUB_REF/refs\/tags\//}
-     - uses: actions/checkout@v4.1.7
+     - uses: actions/checkout@v4.2.1
      - name: Set up Docker Buildx
        uses: docker/setup-buildx-action@v3
      - name: Login to Quay.io
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -3,15 +3,15 @@ default_stages: [ commit ]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
       - id: check-yaml
 
   - repo: https://github.com/psf/black-pre-commit-mirror
 
-    rev: 24.8.0
+    rev: 24.10.0
     hooks:
       - id: black
         language_version: python3.11
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.12.6
+FROM python:3.12.7
 RUN echo "deb https://deb.debian.org/debian/ stable main" > /etc/apt/sources.list
 RUN apt-get update -y \
     && apt-get install -y build-essential python3-openstackclient vim\
diff --git a/docker-compose.bibigrid.host.yml b/docker-compose.bibigrid.host.yml
@@ -21,7 +21,7 @@ services:
   simplevm_client_redis:
     container_name: simplevm_client_redis
     network_mode: host  # Use the host network namespace
-    image: redis:7.4.0
+    image: redis:7.4.1
     expose:
       - "6379"
 
@@ -43,7 +43,7 @@ services:
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.15.1
+    image: docker.elastic.co/beats/filebeat:8.15.2
     network_mode: host  # Use the host network namespace
 
     env_file:
diff --git a/docker-compose.bibigrid.yml b/docker-compose.bibigrid.yml
@@ -21,7 +21,7 @@ services:
 
   simplevm_client_redis:
     container_name: simplevm_client_redis
-    image: redis:7.4.0
+    image: redis:7.4.1
     expose:
       - "6379"
     networks:
@@ -44,7 +44,7 @@ services:
 
   # filebeat
   simplevm_filebeat:
-    image: docker.elastic.co/beats/filebeat:8.15.1
+    image: docker.elastic.co/beats/filebeat:8.15.2
     env_file:
       - .env
     volumes:
diff --git a/docker-compose.dev.bibigrid.yml b/docker-compose.dev.bibigrid.yml
@@ -21,7 +21,7 @@ services:
 
   client_redis:
     container_name: simplevm_client_redis
-    image: redis:7.4.0
+    image: redis:7.4.1
     expose:
       - "6379"
     networks:
diff --git a/docker-compose.dev.giessen.yml b/docker-compose.dev.giessen.yml
@@ -21,7 +21,7 @@ services:
 
   simplevm_client_giessen_redis:
     container_name: simplevm_client_giessen_redis
-    image: redis:7.4.0
+    image: redis:7.4.1
     expose:
       - "6379"
     networks:
diff --git a/docker-compose.dev.yml b/docker-compose.dev.yml
@@ -21,7 +21,7 @@ services:
 
   client_redis:
     container_name: simplevm_client_redis
-    image: redis:7.4.0
+    image: redis:7.4.1
     expose:
       - "6379"
     networks:
diff --git a/docker-compose.host.yml b/docker-compose.host.yml
@@ -22,15 +22,15 @@ services:
   simplevm_client_redis:
     container_name: simplevm_client_redis
     network_mode: host  # Use the host network namespace
-    image: redis:7.4.0
+    image: redis:7.4.1
     expose:
       - "6379"
     networks:
       - portal
 
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.15.1
+    image: docker.elastic.co/beats/filebeat:8.15.2
     env_file:
       - .env
     volumes:
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -21,7 +21,7 @@ services:
 
   simplevm_client_redis:
     container_name: simplevm_client_redis
-    image: redis:7.4.0
+    image: redis:7.4.1
     expose:
       - "6379"
     networks:
@@ -30,7 +30,7 @@ services:
   # filebeat
   simplevm_client_filebeat:
     container_name: simplevm_client_filebeat
-    image: docker.elastic.co/beats/filebeat:8.15.1
+    image: docker.elastic.co/beats/filebeat:8.15.2
     env_file:
       - .env
     volumes:
diff --git a/filebeat/filebeat.yml b/filebeat/filebeat.yml
@@ -9,8 +9,9 @@ output.elasticsearch:
     username: '${ELASTIC_USER}'
     password: '${ELASTIC_PASSWORD}'
     ssl:
-      verification_mode: none
-    timeout: 15
+      verification_mode: full
+    timeout: 60
+    bulk_max_size: 50
     headers:
       HOST: '${HOST}'
 
diff --git a/portal_client.thrift b/portal_client.thrift
@@ -267,6 +267,11 @@ exception ServerNotFoundException {
     2: string name_or_id
 }
 
+exception SecurityGroupNotFoundException {
+    /** Server not found. */
+    1: string message
+    2: string name_or_id
+}
 exception SecurityGroupRuleNotFoundException {
     /** Server not found. */
     1: string message
@@ -619,6 +624,8 @@ service VirtualMachineService {
     **/
 	list<VM> get_servers_by_bibigrid_id(1:string bibigrid_id)
 
+
+    string get_security_group_id_by_name(1:string name) throws(1:SecurityGroupNotFoundException s)
 	map<string,list<string>> scale_up_cluster(1: string cluster_id,2: string image_name,3:string flavor_name,4:int count,
                           5:list<string>names,6:int start_idx,7:int batch_idx)
 
diff --git a/requirements.txt b/requirements.txt
@@ -3,19 +3,19 @@ thrift==0.21.0
 openstacksdk==4.0.0
 deprecated==1.2.14
 Click==8.1.7
-ansible==10.4.0
+ansible==10.5.0
 flake8==7.1.1
 paramiko==3.5.0
 ruamel.yaml==0.18.6
 pyvim==3.0.3
-redis==5.0.8
+redis==5.1.1
 requests==2.32.3
 pyyaml==6.0.2
-pre-commit==3.8.0
+pre-commit==4.0.1
 types-PyYAML==6.0.12.20240917
 sympy==1.13.3
 colorama==0.4.6
 gevent==24.2.1
 pytest==8.3.3
-types-redis==4.6.0.20240903
+types-redis==4.6.0.20241004
 oslo.utils==7.3.0
diff --git a/simple_vm_client/VirtualMachineHandler.py b/simple_vm_client/VirtualMachineHandler.py
@@ -479,8 +479,13 @@ def create_and_deploy_playbook(
     def is_bibigrid_available(self) -> bool:
         return self.bibigrid_connector.is_bibigrid_available()
 
-    def get_cluster_info(self, cluster_id: str) -> ClusterInfo:
-        return self.bibigrid_connector.get_cluster_info(cluster_id=cluster_id)
+    def get_security_group_id_by_name(self, security_group_name) -> str:
+        return self.openstack_connector.get_security_group_id_by_name(
+            security_group_name=security_group_name
+        )
+
+    def get_cluster_info(self, cluster_id) -> ClusterInfo:
+        return self.openstack_connector.get_cluster_info(cluster_id=cluster_id)
 
     def get_cluster_status(self, cluster_id: str) -> dict[str, str]:
         return self.bibigrid_connector.get_cluster_status(cluster_id=cluster_id)
diff --git a/simple_vm_client/VirtualMachineServer.py b/simple_vm_client/VirtualMachineServer.py
@@ -47,6 +47,7 @@ def catch_shutdown(signal: int, frame: object) -> None:
     click.echo(f"Server is running on port {PORT}")
     handler = VirtualMachineHandler(CONFIG_FILE)
     processor = Processor(handler)
+
     if USE_SSL:
         click.echo("Use SSL")
         ssl_context = ssl.create_default_context(ssl.Purpose.CLIENT_AUTH)
diff --git a/simple_vm_client/VirtualMachineService-remote b/simple_vm_client/VirtualMachineService-remote
@@ -87,6 +87,7 @@ if len(sys.argv) <= 1 or sys.argv[1] == "--help":
     print("   get_servers()")
     print("   get_servers_by_ids( server_ids)")
     print("   get_servers_by_bibigrid_id(string bibigrid_id)")
+    print("  string get_security_group_id_by_name(string name)")
     print(
         "   scale_up_cluster(string cluster_id, string image_name, string flavor_name, int count,  names, int start_idx, int batch_idx)"
     )
@@ -651,6 +652,16 @@ elif cmd == "get_servers_by_bibigrid_id":
         )
     )
 
+elif cmd == "get_security_group_id_by_name":
+    if len(args) != 1:
+        print("get_security_group_id_by_name requires 1 args")
+        sys.exit(1)
+    pp.pprint(
+        client.get_security_group_id_by_name(
+            args[0],
+        )
+    )
+
 elif cmd == "scale_up_cluster":
     if len(args) != 7:
         print("scale_up_cluster requires 7 args")
diff --git a/simple_vm_client/VirtualMachineService.py b/simple_vm_client/VirtualMachineService.py
diff --git a/simple_vm_client/metadata_connector/metadata_connector.py b/simple_vm_client/metadata_connector/metadata_connector.py
diff --git a/simple_vm_client/openstack_connector/openstack_connector.py b/simple_vm_client/openstack_connector/openstack_connector.py
diff --git a/simple_vm_client/test_openstack_connector.py b/simple_vm_client/test_openstack_connector.py
diff --git a/simple_vm_client/test_virtualmachinehandler.py b/simple_vm_client/test_virtualmachinehandler.py
diff --git a/simple_vm_client/ttypes.py b/simple_vm_client/ttypes.py

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM python:3.12.6`
	`1`	`+FROM python:3.12.7`
`2`	`2`	`RUN echo "deb https://deb.debian.org/debian/ stable main" > /etc/apt/sources.list`
`3`	`3`	`RUN apt-get update -y \`
`4`	`4`	`&& apt-get install -y build-essential python3-openstackclient vim\`