# This is a combination of 2 commits.

# The first commit's message is:

Incorporated code review comments

# The 2nd commit message will be skipped:

#	fixed formatting

Author: gkvijay

Godeps/Godeps.json

@@ -39,7 +39,7 @@ $ vagrant ssh netplugin-node1
 ```
 $ netctl net create contiv-net --subnet=20.1.1.0/24
 	or
-netctl net create contiv-net --subnet=20.1.1.0/24 --pkt-tag=1001 --subnetv6=2001::/100 
+netctl net create contiv-net --subnet=20.1.1.0/24 --subnetv6=2001::/100 
 ```
 
 #### Step 3: Run your containers and enjoy the networking!

README.md

@@ -52,3 +52,48 @@ The containers created will get IPv4 and IPv6 address allocated from the corresp
 ]
 ```
 
+## Container IPv6 interface
+
+Container 'web' in Node1
+```
+[vagrant@netplugin-node1 netplugin]$ docker exec -it web /bin/sh
+/ # ip addr show dev eth0
+13: eth0@if12: <BROADCAST,MULTICAST,UP,LOWER_UP,M-DOWN> mtu 1450 qdisc noqueue state UP 
+    link/ether 02:02:14:01:01:03 brd ff:ff:ff:ff:ff:ff
+    inet 20.1.1.3/24 scope global eth0
+       valid_lft forever preferred_lft forever
+    inet6 2001::3/100 scope global 
+       valid_lft forever preferred_lft forever
+    inet6 fe80::2:14ff:fe01:103/64 scope link 
+       valid_lft forever preferred_lft forever
+/ # 
+```
+
+Container 'db' in Node2
+```
+[vagrant@netplugin-node2 ~]$ docker exec -it db /bin/sh
+/ # ip addr show dev eth0
+9: eth0@if8: <BROADCAST,MULTICAST,UP,LOWER_UP,M-DOWN> mtu 1450 qdisc noqueue state UP 
+    link/ether 02:02:14:01:01:04 brd ff:ff:ff:ff:ff:ff
+    inet 20.1.1.4/24 scope global eth0
+       valid_lft forever preferred_lft forever
+    inet6 2001::4/100 scope global 
+       valid_lft forever preferred_lft forever
+    inet6 fe80::2:14ff:fe01:104/64 scope link 
+       valid_lft forever preferred_lft forever
+/ # 
+```	
+
+## Ping6 between containers
+```
+/ # ping6 2001::4 -I 2001::3 -c 3
+PING 2001::4 (2001::4) from 2001::3: 56 data bytes
+64 bytes from 2001::4: seq=0 ttl=64 time=1.689 ms
+64 bytes from 2001::4: seq=1 ttl=64 time=2.437 ms
+64 bytes from 2001::4: seq=2 ttl=64 time=1.526 ms
+
+--- 2001::4 ping statistics ---
+3 packets transmitted, 3 packets received, 0% packet loss
+round-trip min/avg/max = 1.526/1.884/2.437 ms
+/ # 
+```

docs/ipv6.md

@@ -158,7 +158,7 @@ func CreateNetwork(network intent.ConfigNetwork, stateDriver core.StateDriver, t
 		nwCfg.IPv6Gateway = network.IPv6Gateway
 
 		// Reserve gateway IPv6 address if gateway is specified
-		hostID, err := netutils.GetIPv6HostID(nwCfg.IPv6Subnet, nwCfg.IPv6SubnetLen, 128, nwCfg.IPv6Gateway)
+		hostID, err := netutils.GetIPv6HostID(nwCfg.IPv6Subnet, nwCfg.IPv6SubnetLen, nwCfg.IPv6Gateway)
 		if err != nil {
 			log.Errorf("Error parsing gateway address %s. Err: %v", nwCfg.IPv6Gateway, err)
 			return err
@@ -503,12 +503,12 @@ func networkAllocAddress(nwCfg *mastercfg.CfgNetworkState, reqAddr string, isIPv
 	if reqAddr == "" {
 		if isIPv6 {
 			// Get the next available IPv6 address
-			hostID, err = netutils.GetNextIPv6HostID(nwCfg.IPv6LastHost, nwCfg.IPv6Subnet, nwCfg.IPv6SubnetLen, 128, nwCfg.IPv6AllocMap)
+			hostID, err = netutils.GetNextIPv6HostID(nwCfg.IPv6LastHost, nwCfg.IPv6Subnet, nwCfg.IPv6SubnetLen, nwCfg.IPv6AllocMap)
 			if err != nil {
 				log.Errorf("create eps: error allocating ip. Error: %s", err)
 				return "", err
 			}
-			ipAddress, err = netutils.GetSubnetIPv6(nwCfg.IPv6Subnet, nwCfg.IPv6SubnetLen, 128, hostID)
+			ipAddress, err = netutils.GetSubnetIPv6(nwCfg.IPv6Subnet, nwCfg.IPv6SubnetLen, hostID)
 			if err != nil {
 				log.Errorf("create eps: error acquiring subnet ip. Error: %s", err)
 				return "", err
@@ -540,7 +540,7 @@ func networkAllocAddress(nwCfg *mastercfg.CfgNetworkState, reqAddr string, isIPv
 
 	} else if reqAddr != "" && nwCfg.SubnetIP != "" {
 		if isIPv6 {
-			hostID, err = netutils.GetIPv6HostID(nwCfg.IPv6Subnet, nwCfg.IPv6SubnetLen, 128, reqAddr)
+			hostID, err = netutils.GetIPv6HostID(nwCfg.IPv6Subnet, nwCfg.IPv6SubnetLen, reqAddr)
 			if err != nil {
 				log.Errorf("create eps: error getting host id from hostIP %s Subnet %s/%d. Error: %s",
 					reqAddr, nwCfg.IPv6Subnet, nwCfg.IPv6SubnetLen, err)
@@ -578,7 +578,7 @@ func networkAllocAddress(nwCfg *mastercfg.CfgNetworkState, reqAddr string, isIPv
 func networkReleaseAddress(nwCfg *mastercfg.CfgNetworkState, ipAddress string) error {
 	isIPv6 := netutils.IsIPv6(ipAddress)
 	if isIPv6 {
-		hostID, err := netutils.GetIPv6HostID(nwCfg.SubnetIP, nwCfg.SubnetLen, 128, ipAddress)
+		hostID, err := netutils.GetIPv6HostID(nwCfg.SubnetIP, nwCfg.SubnetLen, ipAddress)
 		if err != nil {
 			log.Errorf("error getting host id from hostIP %s Subnet %s/%d. Error: %s",
 				ipAddress, nwCfg.SubnetIP, nwCfg.SubnetLen, err)