Adding functions to modify network settings and policies. Adding RemoteSubnetRoutePolicy.

hcn/hcnendpoint_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestCreateDeleteEndpoint(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -34,7 +34,7 @@ func TestCreateDeleteEndpoint(t *testing.T) {
 }
 
 func TestGetEndpointById(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -62,7 +62,7 @@ func TestGetEndpointById(t *testing.T) {
 }
 
 func TestGetEndpointByName(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -90,7 +90,7 @@ func TestGetEndpointByName(t *testing.T) {
 }
 
 func TestListEndpoints(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -118,7 +118,7 @@ func TestListEndpoints(t *testing.T) {
 }
 
 func TestListEndpointsOfNetwork(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -146,7 +146,7 @@ func TestListEndpointsOfNetwork(t *testing.T) {
 }
 
 func TestEndpointNamespaceAttachDetach(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -183,7 +183,7 @@ func TestEndpointNamespaceAttachDetach(t *testing.T) {
 }
 
 func TestCreateEndpointWithNamespace(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -210,7 +210,7 @@ func TestCreateEndpointWithNamespace(t *testing.T) {
 }
 
 func TestApplyPolicyOnEndpoint(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -251,7 +251,7 @@ func TestApplyPolicyOnEndpoint(t *testing.T) {
 }
 
 func TestModifyEndpointSettings(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}

hcn/hcnloadbalancer_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestCreateDeleteLoadBalancer(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -42,7 +42,7 @@ func TestCreateDeleteLoadBalancer(t *testing.T) {
 }
 
 func TestGetLoadBalancerById(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -83,7 +83,7 @@ func TestListLoadBalancer(t *testing.T) {
 }
 
 func TestLoadBalancerAddRemoveEndpoint(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -135,7 +135,7 @@ func TestLoadBalancerAddRemoveEndpoint(t *testing.T) {
 }
 
 func TestAddLoadBalancer(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -171,7 +171,7 @@ func TestAddLoadBalancer(t *testing.T) {
 }
 
 func TestAddDSRLoadBalancer(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := CreateTestOverlayNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -207,7 +207,7 @@ func TestAddDSRLoadBalancer(t *testing.T) {
 }
 
 func TestAddILBLoadBalancer(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := CreateTestOverlayNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}

hcn/hcnnamespace_test.go

@@ -97,7 +97,7 @@ func TestListNamespaces(t *testing.T) {
 }
 
 func TestGetNamespaceEndpointIds(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -161,7 +161,7 @@ func TestGetNamespaceContainers(t *testing.T) {
 }
 
 func TestAddRemoveNamespaceEndpoint(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -205,7 +205,7 @@ func TestAddRemoveNamespaceEndpoint(t *testing.T) {
 }
 
 func TestModifyNamespaceSettings(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}

hcn/hcnnetwork.go

@@ -75,6 +75,30 @@ type HostComputeNetwork struct {
 	SchemaVersion SchemaVersion   `json:",omitempty"`
 }
 
+// NetworkResourceType are the 3 different Network settings resources.
+type NetworkResourceType string
+
+var (
+	// NetworkResourceTypePolicy is for Network's policies. Ex: RemoteSubnet
+	NetworkResourceTypePolicy NetworkResourceType = "Policy"
+	// NetworkResourceTypeDNS is for Network's DNS settings.
+	NetworkResourceTypeDNS NetworkResourceType = "DNS"
+	// NetworkResourceTypeExtension is for Network's extension settings.
+	NetworkResourceTypeExtension NetworkResourceType = "Extension"
+)
+
+// ModifyNetworkSettingRequest is the structure used to send request to modify an network.
+// Used to update DNS/extension/policy on an network.
+type ModifyNetworkSettingRequest struct {
+	ResourceType NetworkResourceType `json:",omitempty"` // Policy, DNS, Extension
+	RequestType  RequestType         `json:",omitempty"` // Add, Remove, Update, Refresh
+	Settings     json.RawMessage     `json:",omitempty"`
+}
+
+type PolicyNetworkRequest struct {
+	Policies []NetworkPolicy `json:",omitempty"`
+}
+
 func getNetwork(networkGuid guid.GUID, query string) (*HostComputeNetwork, error) {
 	// Open network.
 	var (
@@ -311,6 +335,56 @@ func (network *HostComputeNetwork) Delete() (*HostComputeNetwork, error) {
 	return nil, nil
 }
 
+// ModifyNetworkSettings updates the Policy for a network.
+func (network *HostComputeNetwork) ModifyNetworkSettings(request *ModifyNetworkSettingRequest) error {
+	logrus.Debugf("hcn::HostComputeNetwork::ModifyNetworkSettings id=%s", network.Id)
+
+	networkSettingsRequest, err := json.Marshal(request)
+	if err != nil {
+		return err
+	}
+
+	_, err = modifyNetwork(network.Id, string(networkSettingsRequest))
+	if err != nil {
+		return err
+	}
+	return nil
+}
+
+// AddPolicy applies a Policy (ex: RemoteSubnet) on the Network.
+func (network *HostComputeNetwork) AddPolicy(networkPolicy PolicyNetworkRequest) error {
+	logrus.Debugf("hcn::HostComputeNetwork::AddPolicy id=%s", network.Id)
+
+	settingsJson, err := json.Marshal(networkPolicy)
+	if err != nil {
+		return err
+	}
+	requestMessage := &ModifyNetworkSettingRequest{
+		ResourceType: NetworkResourceTypePolicy,
+		RequestType:  RequestTypeAdd,
+		Settings:     settingsJson,
+	}
+
+	return network.ModifyNetworkSettings(requestMessage)
+}
+
+// RemovePolicy removes a Policy (ex: RemoteSubnet) from the Network.
+func (network *HostComputeNetwork) RemovePolicy(networkPolicy PolicyNetworkRequest) error {
+	logrus.Debugf("hcn::HostComputeNetwork::RemovePolicy id=%s", network.Id)
+
+	settingsJson, err := json.Marshal(networkPolicy)
+	if err != nil {
+		return err
+	}
+	requestMessage := &ModifyNetworkSettingRequest{
+		ResourceType: NetworkResourceTypePolicy,
+		RequestType:  RequestTypeRemove,
+		Settings:     settingsJson,
+	}
+
+	return network.ModifyNetworkSettings(requestMessage)
+}
+
 // CreateEndpoint creates an endpoint on the Network.
 func (network *HostComputeNetwork) CreateEndpoint(endpoint *HostComputeEndpoint) (*HostComputeEndpoint, error) {
 	isRemote := endpoint.Flags&EndpointFlagsRemoteEndpoint != 0

hcn/hcnnetwork_test.go

@@ -9,7 +9,7 @@ import (
 )
 
 func TestCreateDeleteNetwork(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -25,7 +25,7 @@ func TestCreateDeleteNetwork(t *testing.T) {
 }
 
 func TestGetNetworkByName(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -43,7 +43,7 @@ func TestGetNetworkByName(t *testing.T) {
 }
 
 func TestGetNetworkById(t *testing.T) {
-	network, err := HcnCreateTestNetwork()
+	network, err := HcnCreateTestNATNetwork()
 	if err != nil {
 		t.Fatal(err)
 	}
@@ -66,3 +66,61 @@ func TestListNetwork(t *testing.T) {
 		t.Fatal(err)
 	}
 }
+
+func TestAddRemoveRemoteSubnetRoutePolicy(t *testing.T) {
+
+	network, err := CreateTestOverlayNetwork()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	remoteSubnetRoutePolicy, err := HcnCreateTestRemoteSubnetRoute()
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	//Add Policy
+	network.AddPolicy(*remoteSubnetRoutePolicy)
+
+	//Reload the network object from HNS.
+	network, err = GetNetworkByID(network.Id)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	foundPolicy := false
+	for _, policy := range network.Policies {
+		if policy.Type == RemoteSubnetRoute {
+			foundPolicy = true
+			break
+		}
+	}
+	if !foundPolicy {
+		t.Fatalf("Could not find remote subnet route policy on network.")
+	}
+
+	//Remove Policy.
+	network.RemovePolicy(*remoteSubnetRoutePolicy)
+
+	//Reload the network object from HNS.
+	network, err = GetNetworkByID(network.Id)
+	if err != nil {
+		t.Fatal(err)
+	}
+
+	foundPolicy = false
+	for _, policy := range network.Policies {
+		if policy.Type == RemoteSubnetRoute {
+			foundPolicy = true
+			break
+		}
+	}
+	if foundPolicy {
+		t.Fatalf("Found remote subnet route policy on network when it should have been deleted.")
+	}
+
+	_, err = network.Delete()
+	if err != nil {
+		t.Fatal(err)
+	}
+}

hcn/hcnpolicy.go

@@ -39,6 +39,7 @@ const (
 	AutomaticDNS        NetworkPolicyType = "AutomaticDNS"
 	InterfaceConstraint NetworkPolicyType = "InterfaceConstraint"
 	ProviderAddress     NetworkPolicyType = "ProviderAddress"
+	RemoteSubnetRoute   NetworkPolicyType = "RemoteSubnetRoute"
 )
 
 // NetworkPolicy is a collection of Policy settings for a Network.
@@ -205,3 +206,11 @@ type VlanPolicySetting struct {
 type VsidPolicySetting struct {
 	IsolationId uint32 `json:","`
 }
+
+// RemoteSubnetRoutePolicySetting creates remote subnet route rules on a network
+type RemoteSubnetRoutePolicySetting struct {
+	DestinationPrefix           string
+	IsolationId                 uint16
+	ProviderAddress             string
+	DistributedRouterMacAddress string
+}