Merge pull request #74 from ClaireM2/issue/get_host_entry_by_ID

get host entry by ID, all excess, YML files removed

Author: craigpnnl

inventory/hosts.yml

@@ -0,0 +1,31 @@
+all: 
+  hosts:
+    test_instance:
+      ansible_connection: ssh
+      ansible_host: 172.18.65.126
+      ansible_port: 22
+      ansible_user: installer
+      ansible_ssh_private_key_file: ~/.ssh/id_rsa
+      id: test_instance
+      volttron_home: ~/.volttron
+    instance1:
+      ansible_connection: ssh
+      ansible_host: 172.18.65.126
+      ansible_port: 22
+      ansible_user: installer
+      ansible_ssh_private_key_file: ~/.ssh/id_rsa
+      id: instance1
+      volttron_home: ~/.volt1
+
+    instance2:
+      ansible_connection: ssh
+      ansible_host: 172.18.65.126
+      ansible_port: 22
+      ansible_user: installer
+      ansible_ssh_private_key_file: ~/.ssh/id_rsa
+      id: instance2
+      volttron_home: ~/.volt2
+
+
+
+

tests/backend/test_ansible_installation.py

@@ -4,6 +4,7 @@
 import json
 import re
 import os
+import yaml
 
 def test_ansible_version():
     """Test that ansible version is >= 2.9"""
@@ -456,3 +457,26 @@ async def test_host_key_verification_with_ssh_options():
             known_hosts.unlink()
         if backup_path and backup_path.exists():
             backup_path.rename(known_hosts)
+
+@pytest.mark.asyncio
+async def test_host_location_given_host_id():
+    test_pass_existence = False
+    #gets a known test case 
+    with open(Path.home() /'.volttron_installer_data/inventory.yml', 'r') as file:
+        data = yaml.safe_load(file)
+        
+    host_id = 'test_host' #set existing host id
+    temp_string = str(data)
+    
+    assert host_id in temp_string
+    
+    if host_id in temp_string:
+        user=data['all']['hosts'][host_id]['ansible_user']
+        port=data['all']['hosts'][host_id]['ansible_port']
+    
+    if 'ansible_password' in temp_string:
+        test_pass_existence = True
+        
+    assert test_pass_existence == False
+    assert user == "user"#is proper information from test_host
+    assert port == 22

volttron_installer/backend/services/ansible_service.py

@@ -7,6 +7,7 @@
 from .. services.platform_service import get_platform_service, PlatformService
 import json
 import os
+import yaml
 from loguru import logger
 
 class AnsibleService:
@@ -271,9 +272,16 @@ async def get_host_entry_by_id(self, host_id: str) -> 'HostEntry':
         Returns:
             HostEntry object
         """
+        with open(Path.home()/".volttron_user_data/inventory.yml", "r") as file:
+            data = yaml.safe_load(file)
         # Implement the logic to retrieve the HostEntry by its ID
         # This is a placeholder implementation
-        return HostEntry(host="example.com", user="user", port=22, password="password")
+        tmp_str = str(data)
+        if "ansible_password" in tmp_str:
+            password = data['all']['hosts'][host_id]['ansible_password']
+            return HostEntry(host=host_id, user=data['all']['hosts'][host_id]['ansible_user'], port=data['all']['hosts'][host_id]['ansible_port'], password = data['all']['hosts'][host_id]['ansible_password'])
+            
+        return HostEntry(host=host_id, user=data['all']['hosts'][host_id]['ansible_user'], port=data['all']['hosts'][host_id]['ansible_port'])
 
 __ansible_service__ = AnsibleService()
 

volttron_installer/pages/platform_page.py

@@ -170,7 +170,7 @@ def configuration_tab_content() -> rx.Component:
                                 form_entry.form_entry(
                                     "Host",
                                     rx.input(
-                                        value= working_platform.host.id,
+                                        value= working_platform.host.ansible_host,
                                         on_change=lambda v: State.update_detail("id", v),
                                         size="3",
                                         required=True,