Merge pull request #16 from shiftky/support_decode_vs_name

Support decode VirtualServer name

decode.go

@@ -29,6 +29,11 @@ func unmarshal(n *node, out reflect.Value) {
 	switch n.kind {
 	case ltmNodeNode, ltmPoolNode, ltmVirtualNode:
 		unmarshal(n.children[0], out)
+		if f, ok := lookupField("name", out); ok {
+			if f.Kind() == reflect.String && f.String() == "" {
+				f.SetString(n.value)
+			}
+		}
 	case structNode:
 		decodeStructNode(n, out)
 	case keyNode:

decode_test.go

@@ -3,6 +3,8 @@ package tmsh
 import (
 	"reflect"
 	"testing"
+
+	"github.com/k0kubun/pp"
 )
 
 func TestUnmarshalNode(t *testing.T) {
@@ -40,7 +42,8 @@ func TestUnmarshalNode(t *testing.T) {
 	}
 
 	if !reflect.DeepEqual(node, expect) {
-		t.Errorf("got %v\nwant %v", node, expect)
+		t.Errorf("got :" + pp.Sprint(node))
+		t.Errorf("want :" + pp.Sprint(expect))
 	}
 }
 
@@ -170,7 +173,8 @@ func TestUnmarshalPool(t *testing.T) {
 	}
 
 	if !reflect.DeepEqual(pool, expect) {
-		t.Errorf("\ngot %v\nwant %v", pool, expect)
+		t.Errorf("got :" + pp.Sprint(pool))
+		t.Errorf("want :" + pp.Sprint(expect))
 	}
 }
 
@@ -200,6 +204,7 @@ func TestUnmarshalVirtualServer(t *testing.T) {
 	}
 
 	expect := VirtualServer{
+		Name:        "api.example.com_443",
 		Destination: "203.0.113.1:https",
 		IpProtocol:  "tcp",
 		Mask:        "255.255.255.255",
@@ -212,6 +217,7 @@ func TestUnmarshalVirtualServer(t *testing.T) {
 	}
 
 	if !reflect.DeepEqual(vs, expect) {
-		t.Errorf("\ngot %v\nwant %v", vs, expect)
+		t.Errorf("got :" + pp.Sprint(vs))
+		t.Errorf("want :" + pp.Sprint(expect))
 	}
 }

ltm_test.go

@@ -216,6 +216,7 @@ func TestGetVirtual(t *testing.T) {
 }`
 
 	expect := &VirtualServer{
+		Name:        "api.example.com_443",
 		Destination: "203.0.113.1:https",
 		IpProtocol:  "tcp",
 		Mask:        "255.255.255.255",
@@ -621,6 +622,7 @@ ltm virtual web.example.com_80 {
 
 	expect := []VirtualServer{
 		VirtualServer{
+			Name:        "api.example.com_443",
 			Destination: "203.0.113.1:https",
 			IpProtocol:  "tcp",
 			Mask:        "255.255.255.255",
@@ -633,6 +635,7 @@ ltm virtual web.example.com_80 {
 			},
 		},
 		VirtualServer{
+			Name:        "web.example.com_80",
 			Destination: "203.0.113.2:http",
 			IpProtocol:  "tcp",
 			Mask:        "255.255.255.255",