Revert "Passing Resource Pool names to the VyOS/Networking Script to allow setting hostname based on Resource Pool"

This reverts commit 9c86f62.

Author: xdkaine

internal/cloning/cloning_service.go

@@ -202,7 +202,6 @@ func (cs *CloningService) CloneTemplate(req CloneRequest) error {
 			// Store router info for later operations
 			clonedRouters = append(clonedRouters, RouterInfo{
 				TargetName: target.Name,
-				PoolName:   target.PoolName,
 				RouterType: routerType,
 				PodNumber:  target.PodNumber,
 				Node:       bestNode,
@@ -345,7 +344,7 @@ func (cs *CloningService) CloneTemplate(req CloneRequest) error {
 		}
 
 		log.Printf("Configuring pod router for %s (Pod: %d, VMID: %d)", routerInfo.TargetName, routerInfo.PodNumber, routerInfo.VMID)
-		err = cs.ProxmoxService.ConfigurePodRouter(routerInfo.PodNumber, routerInfo.Node, routerInfo.VMID, routerInfo.RouterType, routerInfo.PoolName)
+		err = cs.ProxmoxService.ConfigurePodRouter(routerInfo.PodNumber, routerInfo.Node, routerInfo.VMID, routerInfo.RouterType)
 		if err != nil {
 			errors = append(errors, fmt.Sprintf("failed to configure pod router for %s: %v", routerInfo.TargetName, err))
 		}

internal/cloning/types.go

@@ -119,7 +119,6 @@ type CloneRequest struct {
 
 type RouterInfo struct {
 	TargetName string
-	PoolName   string
 	RouterType string
 	PodNumber  int
 	Node       string

internal/proxmox/networking.go

@@ -40,7 +40,7 @@ func (s *ProxmoxService) GetRouterType(router VM) (string, error) {
 }
 
 // ConfigurePodRouter configures the pod router with proper networking settings
-func (s *ProxmoxService) ConfigurePodRouter(podNumber int, node string, vmid int, routerType string, poolName string) error {
+func (s *ProxmoxService) ConfigurePodRouter(podNumber int, node string, vmid int, routerType string) error {
 	config := RouterConfig{
 		WANScriptPath:  s.Config.WANScriptPath,
 		VIPScriptPath:  s.Config.VIPScriptPath,
@@ -115,10 +115,9 @@ func (s *ProxmoxService) ConfigurePodRouter(podNumber int, node string, vmid int
 	case "vyos":
 		reqBody := map[string]any{
 			"command": []string{
-				config.VYOSScriptPath,
-				fmt.Sprintf("%d", podNumber),
-				config.WANIPBase,
-				poolName,
+				"sh",
+				"-c",
+				fmt.Sprintf("sed -i -e 's/{{THIRD_OCTET}}/%d/g;s/{{NETWORK_PREFIX}}/%s/g' %s", podNumber, config.WANIPBase, config.VYOSScriptPath),
 			},
 		}
 
@@ -130,7 +129,7 @@ func (s *ProxmoxService) ConfigurePodRouter(podNumber int, node string, vmid int
 
 		_, err := s.RequestHelper.MakeRequest(execReq)
 		if err != nil {
-			return fmt.Errorf("failed to run VyOS setup script: %v", err)
+			return fmt.Errorf("failed to make IP change request: %v", err)
 		}
 
 	default:

internal/proxmox/pools.go

@@ -446,7 +446,7 @@ func (s *ProxmoxService) CreateTemplatePool(creator string, name string, addRout
 	log.Printf("Third octect is %d", octect)
 
 	log.Printf("Configuring router")
-	err = s.ConfigurePodRouter(octect, bestNode, routerVMID, routerType, poolName)
+	err = s.ConfigurePodRouter(octect, bestNode, routerVMID, routerType)
 	if err != nil {
 		return fmt.Errorf("failed to configure router for %s: %v", routerType, err)
 	}

internal/proxmox/types.go

@@ -26,7 +26,7 @@ type ProxmoxConfig struct {
 	RouterWaitTimeout time.Duration `envconfig:"ROUTER_WAIT_TIMEOUT" default:"120s"`
 	WANScriptPath     string        `envconfig:"WAN_SCRIPT_PATH" default:"/home/update-wan-ip.sh"`
 	VIPScriptPath     string        `envconfig:"VIP_SCRIPT_PATH" default:"/home/update-wan-vip.sh"`
-	VYOSScriptPath    string        `envconfig:"VYOS_SCRIPT_PATH" default:"/config/scripts/setup.sh"`
+	VYOSScriptPath    string        `envconfig:"VYOS_SCRIPT_PATH" default:"/config/scripts/vyos-postconfig-bootup.script"`
 	WANIPBase         string        `envconfig:"WAN_IP_BASE" default:"172.16."`
 	Nodes             []string      // Parsed from NodesStr
 	APIToken          string        // Computed from TokenID and TokenSecret
@@ -76,7 +76,7 @@ type Service interface {
 
 	// Networking
 	GetRouterType(router VM) (string, error)
-	ConfigurePodRouter(podNumber int, node string, vmid int, routerType string, poolName string) error
+	ConfigurePodRouter(podNumber int, node string, vmid int, routerType string) error
 	SetPodVnet(poolName string, vnetName string, routerVMID int) error
 	GetUsedVNets() ([]VNet, error)
 	CreateTemplatePool(creator string, name string, addRouter bool, vms []VM) error