feat: depends on field

cmd/topo.go

@@ -35,15 +35,11 @@ func topoFunc(cmd *cobra.Command, args []string) {
 
 	switch args[0] {
 	case "apply":
-		if err := topo.Apply(&topoStruct); err != nil {
-			errPrint(err)
-		} else {
+		if err := topo.Apply(&topoStruct); err == nil {
 			fmt.Printf("Topology applied successfully from file: %s\n", args[1])
 		}
 	case "delete":
-		if err := topo.Delete(&topoStruct); err != nil {
-			errPrint(err)
-		} else {
+		if err := topo.Delete(&topoStruct); err == nil {
 			fmt.Printf("Topology deleted successfully from file: %s\n", args[1])
 		}
 	default:

integration-test/topo/test.sh

@@ -42,6 +42,13 @@ assert_count() {
     echo "[+][PASS] $1"
 }
 
+topo_apply_cycle() {
+    output=$(../nsctl topo apply topo_template_deps_cycle.yaml)
+    expect=""
+
+    diff "Topo apply cycle" "$output" "$expect"
+}
+
 topo_apply() {
     output=$(../nsctl topo apply topo_template.yaml)
     expect=$(cat topo_apply.txt)
@@ -66,6 +73,7 @@ topo_delete() {
 }
 
 main() {
+    topo_apply_cycle
     topo_apply
     exec_ping_test
     topo_delete

integration-test/topo/topo_template.yaml

@@ -6,6 +6,8 @@ namespaces:
       - name: br-test-1
         bridge: br-test-1-2
         ipv4: 10.0.0.1/24
+    depends_on:
+      - test-2
 
   - name: test-2
     commands:

integration-test/topo/topo_template_deps_cycle.yaml

@@ -0,0 +1,24 @@
+namespaces:
+  - name: test-1
+    commands:
+      - ls
+    networks:
+      - name: br-test-1
+        bridge: br-test-1-2
+        ipv4: 10.0.0.1/24
+    depends_on:
+      - test-2
+
+  - name: test-2
+    commands:
+      - ls
+    networks:
+      - name: br-test-2
+        bridge: br-test-1-2
+        ipv4: 10.0.0.2/24
+    depends_on:
+      - test-1
+
+networks:
+  - name: br-test-1-2
+    subnet: 10.0.0.0/24

internal/topo/apply.go

@@ -8,7 +8,8 @@ import (
 )
 
 func Apply(topo *Topology) error {
-	if err := checkTopo(topo); err != nil {
+	g, err := checkTopo(topo)
+	if err != nil {
 		return err
 	}
 
@@ -20,7 +21,7 @@ func Apply(topo *Topology) error {
 		return err
 	}
 
-	if err := addNamespaces(topo.Namespaces); err != nil {
+	if err := addNamespaces(g.getSortedNamespaces(topo.Namespaces, false)); err != nil {
 		return err
 	}
 

internal/topo/delete.go

@@ -1,6 +1,8 @@
 package topo
 
 import (
+	"errors"
+
 	"github.com/Alonza0314/nsctl/internal/namespace"
 	"github.com/Alonza0314/nsctl/internal/veth"
 	"github.com/pterm/pterm"
@@ -9,71 +11,87 @@ import (
 )
 
 func Delete(topo *Topology) error {
-	if err := checkTopo(topo); err != nil {
+	g, err := checkTopo(topo)
+	if err != nil {
 		return err
 	}
 
-	if err := deleteNamespaces(topo.Namespaces); err != nil {
-		return err
+	errFlag := false
+	if err := deleteNamespaces(g.getSortedNamespaces(topo.Namespaces, true)); err != nil {
+		errFlag = true
 	}
 
 	if err := deleteBridges(topo.Networks); err != nil {
-		return err
+		errFlag = true
 	}
 
+	if errFlag {
+		return errors.New("Error")
+	}
 	return nil
 }
 
 func deleteNamespaces(nss []Namespace) error {
+	errFlag := false
+
 	for _, ns := range nss {
 		spinner, err := pterm.DefaultSpinner.Start("Deleting namespace " + ns.Name + "...")
 		if err != nil {
 			spinner.Fail("Failed to start spinner for namespace " + ns.Name + ": " + err.Error())
+			errFlag = true
 			continue
 		}
 
 		found, err := namespace.GetNs(ns.Name)
 		if err != nil {
 			spinner.Fail("Failed to get namespace " + ns.Name + ": " + err.Error())
+			errFlag = true
 			continue
 		}
 		if !found {
 			spinner.Fail("Namespace " + ns.Name + " does not exist")
+			errFlag = true
 			continue
 		}
 
 		_, originCloseFunc, err := namespace.GetOriginNs()
 		if err != nil {
 			spinner.Fail("Failed to get origin namespace file descriptor: " + err.Error())
+			errFlag = true
 			continue
 		}
 		nsFd, nsCloseFunc, err := namespace.GetNsFd(ns.Name)
 		if err != nil {
 			spinner.Fail("Failed to get namespace " + ns.Name + " file descriptor: " + err.Error())
 			originCloseFunc()
+			errFlag = true
 			continue
 		}
 
 		if err := netns.Set(nsFd); err != nil {
 			spinner.Fail("Failed to set namespace " + ns.Name + ": " + err.Error())
 			nsCloseFunc()
 			originCloseFunc()
+			errFlag = true
 			continue
 		}
 
 		for _, network := range ns.Networks {
 			if err := veth.UpDown(ns.Name, network.Name, false); err != nil {
 				spinner.Fail("Failed to bring down veth for namespace " + ns.Name + " and network " + network.Name + ": " + err.Error())
+				errFlag = true
 				continue
 			}
 
 			link, err := netlink.LinkByName(network.Name)
 			if err != nil {
 				spinner.Fail("Failed to get link " + network.Name + " in namespace " + ns.Name + ": " + err.Error())
+				errFlag = true
 				continue
 			}
 			if err := netlink.LinkDel(link); err != nil {
 				spinner.Fail("Failed to delete link " + network.Name + " in namespace " + ns.Name + ": " + err.Error())
+				errFlag = true
 			}
 		}
 
@@ -82,31 +100,43 @@ func deleteNamespaces(nss []Namespace) error {
 
 		if err := namespace.Delete(ns.Name); err != nil {
 			spinner.Fail("Failed to delete namespace " + ns.Name + ": " + err.Error())
+			errFlag = true
 		}
 		spinner.Success("Namespace " + ns.Name + " deleted")
 	}
 
+	if errFlag {
+		return errors.New("Error")
+	}
 	return nil
 }
 
 func deleteBridges(networks []Network) error {
+	errFlag := false
+
 	for _, network := range networks {
 		spinner, err := pterm.DefaultSpinner.Start("Deleting bridge " + network.Name + "...")
 		if err != nil {
 			spinner.Fail("Failed to start spinner for bridge " + network.Name + ": " + err.Error())
+			errFlag = true
 			continue
 		}
 
 		link, err := netlink.LinkByName(network.Name)
 		if err != nil {
 			spinner.Fail("Failed to get bridge " + network.Name + ": " + err.Error())
+			errFlag = true
 			continue
 		}
 		if err := netlink.LinkDel(link); err != nil {
 			spinner.Fail("Failed to delete bridge " + network.Name + ": " + err.Error())
+			errFlag = true
 		}
 		spinner.Success("Bridge " + network.Name + " deleted")
 	}
 
+	if errFlag {
+		return errors.New("Error")
+	}
 	return nil
 }

internal/topo/model.go

@@ -7,8 +7,8 @@ type Topology struct {
 
 type Namespace struct {
 	Name     string   `yaml:"name" validate:"required"`
-	Commands []string `yaml:"commands"`
 	Networks []Net    `yaml:"networks"`
+	DependsOn []string `yaml:"depends_on"`
 }
 
 type Network struct {