@@ -680,12 +680,12 @@

 		{

 			"ImportPath": "github.com/openshift/openshift-sdn/pkg",

 			"Comment": "v0.1-164-g9d342eb",

-			"Rev": "c3fefe01ae87a2e54c6ee02379679d3eaaf2c45d"

+			"Rev": "0d3440e224aeb26a056c0c4c91c30fdbb59588f9"

 		},

 		{

 			"ImportPath": "github.com/openshift/openshift-sdn/plugins",

 			"Comment": "v0.1-164-g9d342eb",

-			"Rev": "c3fefe01ae87a2e54c6ee02379679d3eaaf2c45d"

+			"Rev": "0d3440e224aeb26a056c0c4c91c30fdbb59588f9"

 		},

 		{

 			"ImportPath": "github.com/openshift/source-to-image/pkg/api",

@@ -9,7 +9,7 @@ import (

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

 	kerrors "k8s.io/kubernetes/pkg/util/errors"

-	"github.com/openshift/openshift-sdn/plugins/osdn/multitenant"

+	"github.com/openshift/openshift-sdn/plugins/osdn/ovs"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

@@ -39,7 +39,7 @@ func NewCmdIsolateProjectsNetwork(commandName, fullName string, f *clientcmd.Fac

 	cmd := &cobra.Command{

 		Use:     commandName,

 		Short:   "Isolate project network",

-		Long:    fmt.Sprintf(isolateProjectsNetworkLong, multitenant.NetworkPluginName()),

+		Long:    fmt.Sprintf(isolateProjectsNetworkLong, ovs.MultiTenantPluginName()),

 		Example: fmt.Sprintf(isolateProjectsNetworkExample, fullName),

 		Run: func(c *cobra.Command, args []string) {

 			if err := opts.Complete(f, c, args, out); err != nil {

@@ -10,7 +10,7 @@ import (

 	kcmdutil "k8s.io/kubernetes/pkg/kubectl/cmd/util"

 	kerrors "k8s.io/kubernetes/pkg/util/errors"

-	"github.com/openshift/openshift-sdn/plugins/osdn/multitenant"

+	"github.com/openshift/openshift-sdn/plugins/osdn/ovs"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

@@ -42,7 +42,7 @@ func NewCmdJoinProjectsNetwork(commandName, fullName string, f *clientcmd.Factor

 	cmd := &cobra.Command{

 		Use:     commandName,

 		Short:   "Join project network",

-		Long:    fmt.Sprintf(joinProjectsNetworkLong, multitenant.NetworkPluginName()),

+		Long:    fmt.Sprintf(joinProjectsNetworkLong, ovs.MultiTenantPluginName()),

 		Example: fmt.Sprintf(joinProjectsNetworkExample, fullName),

 		Run: func(c *cobra.Command, args []string) {

 			if err := opts.Complete(f, c, args, out); err != nil {

@@ -10,7 +10,7 @@ import (

 	kerrors "k8s.io/kubernetes/pkg/util/errors"

 	"github.com/openshift/openshift-sdn/plugins/osdn"

-	"github.com/openshift/openshift-sdn/plugins/osdn/multitenant"

+	"github.com/openshift/openshift-sdn/plugins/osdn/ovs"

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

@@ -40,7 +40,7 @@ func NewCmdMakeGlobalProjectsNetwork(commandName, fullName string, f *clientcmd.

 	cmd := &cobra.Command{

 		Use:     commandName,

 		Short:   "Make project network global",

-		Long:    fmt.Sprintf(makeGlobalProjectsNetworkLong, multitenant.NetworkPluginName()),

+		Long:    fmt.Sprintf(makeGlobalProjectsNetworkLong, ovs.MultiTenantPluginName()),

 		Example: fmt.Sprintf(makeGlobalProjectsNetworkExample, fullName),

 		Run: func(c *cobra.Command, args []string) {

 			if err := opts.Complete(f, c, args, out); err != nil {

deleted file mode 100644

@@ -1,77 +0,0 @@

-package netutils

-

-import (

-	"fmt"

-	"net"

-

-	log "github.com/golang/glog"

-)

-

-type IPAllocator struct {

-	network  *net.IPNet

-	allocMap map[string]bool

-}

-

-func NewIPAllocator(network string, inUse []string) (*IPAllocator, error) {

-	_, netIP, err := net.ParseCIDR(network)

-	if err != nil {

-		return nil, fmt.Errorf("Failed to parse network address: %q", network)

-	}

-

-	amap := make(map[string]bool)

-	for _, netStr := range inUse {

-		_, nIp, err := net.ParseCIDR(netStr)

-		if err != nil {

-			log.Errorf("Failed to parse network address: %s", netStr)

-			continue

-		}

-		if !netIP.Contains(nIp.IP) {

-			log.Errorf("Provided subnet doesn't belong to network: %s", nIp)

-			continue

-		}

-		amap[netStr] = true

-	}

-

-	// Add the network address to the map

-	amap[netIP.String()] = true

-	return &IPAllocator{network: netIP, allocMap: amap}, nil

-}

-

-func (ipa *IPAllocator) GetIP() (*net.IPNet, error) {

-	var (

-		numIPs    uint32

-		numIPBits uint

-	)

-	baseipu := IPToUint32(ipa.network.IP)

-	netMaskSize, _ := ipa.network.Mask.Size()

-	numIPBits = 32 - uint(netMaskSize)

-	numIPs = 1 << numIPBits

-

-	var i uint32

-	// We exclude the last address as it is reserved for broadcast

-	for i = 0; i < numIPs-1; i++ {

-		ipu := baseipu | i

-		genIP := &net.IPNet{IP: Uint32ToIP(ipu), Mask: net.CIDRMask(netMaskSize, 32)}

-		if !ipa.allocMap[genIP.String()] {

-			ipa.allocMap[genIP.String()] = true

-			return genIP, nil

-		}

-	}

-

-	return nil, fmt.Errorf("No IPs available")

-}

-

-func (ipa *IPAllocator) ReleaseIP(ip *net.IPNet) error {

-	if !ipa.network.Contains(ip.IP) {

-		return fmt.Errorf("Provided IP %v doesn't belong to the network %v", ip, ipa.network)

-	}

-

-	ipStr := ip.String()

-	if !ipa.allocMap[ipStr] {

-		return fmt.Errorf("Provided IP %v is already available", ip)

-	}

-

-	ipa.allocMap[ipStr] = false

-

-	return nil

-}

deleted file mode 100644

@@ -1,83 +0,0 @@

-package netutils

-

-import (

-	"testing"

-)

-

-func TestAllocateIP(t *testing.T) {

-	ipa, err := NewIPAllocator("10.1.2.0/24", nil)

-	if err != nil {

-		t.Fatal("Failed to initialize IP allocator: %v", err)

-	}

-

-	ip, err := ipa.GetIP()

-	if err != nil {

-		t.Fatal("Failed to get IP: ", err)

-	}

-	if ip.String() != "10.1.2.1/24" {

-		t.Fatal("Did not get expected IP")

-	}

-	ip, err = ipa.GetIP()

-	if err != nil {

-		t.Fatal("Failed to get IP: ", err)

-	}

-	if ip.String() != "10.1.2.2/24" {

-		t.Fatal("Did not get expected IP")

-	}

-	ip, err = ipa.GetIP()

-	if err != nil {

-		t.Fatal("Failed to get IP: ", err)

-	}

-	if ip.String() != "10.1.2.3/24" {

-		t.Fatal("Did not get expected IP")

-	}

-}

-

-func TestAllocateIPInUse(t *testing.T) {

-	inUse := []string{"10.1.2.1/24", "10.1.2.2/24", "10.2.2.3/24", "Invalid"}

-	ipa, err := NewIPAllocator("10.1.2.0/24", inUse)

-	if err != nil {

-		t.Fatal("Failed to initialize IP allocator: %v", err)

-	}

-

-	ip, err := ipa.GetIP()

-	if err != nil {

-		t.Fatal("Failed to get IP: ", err)

-	}

-	if ip.String() != "10.1.2.3/24" {

-		t.Fatal("Did not get expected IP", ip)

-	}

-	ip, err = ipa.GetIP()

-	if err != nil {

-		t.Fatal("Failed to get IP: ", err)

-	}

-	if ip.String() != "10.1.2.4/24" {

-		t.Fatal("Did not get expected IP", ip)

-	}

-}

-

-func TestAllocateReleaseIP(t *testing.T) {

-	ipa, err := NewIPAllocator("10.1.2.0/24", nil)

-	if err != nil {

-		t.Fatal("Failed to initialize IP allocator: %v", err)

-	}

-

-	ip, err := ipa.GetIP()

-	if err != nil {

-		t.Fatal("Failed to get IP: ", err)

-	}

-	if ip.String() != "10.1.2.1/24" {

-		t.Fatal("Did not get expected IP")

-	}

-

-	if err := ipa.ReleaseIP(ip); err != nil {

-		t.Fatal("Failed to release the IP")

-	}

-	ip, err = ipa.GetIP()

-	if err != nil {

-		t.Fatal("Failed to get IP: ", err)

-	}

-	if ip.String() != "10.1.2.1/24" {

-		t.Fatal("Did not get expected IP")

-	}

-}

deleted file mode 100644

@@ -1,129 +0,0 @@

-package server

-

-import (

-	"crypto/tls"

-	"fmt"

-	"net"

-	"net/http"

-	"strconv"

-	"time"

-)

-

-// Server is a http.Handler which exposes netutils functionality over HTTP.

-type Server struct {

-	ipam IpamInterface

-	mux  *http.ServeMux

-}

-

-type TLSOptions struct {

-	Config   *tls.Config

-	CertFile string

-	KeyFile  string

-}

-

-// IpamInterface contains all the methods required by the server.

-type IpamInterface interface {

-	GetIP() (*net.IPNet, error)

-	ReleaseIP(ip *net.IPNet) error

-	//GetStats() string

-}

-

-// ListenAndServeNetutilServer initializes a server to respond to HTTP network requests on the ipam interface

-func ListenAndServeNetutilServer(ipam IpamInterface, address net.IP, port uint, tlsOptions *TLSOptions) error {

-	handler := NewServer(ipam)

-	addr := net.JoinHostPort(address.String(), strconv.FormatUint(uint64(port), 10))

-	s := &http.Server{

-		Handler:        handler,

-		ReadTimeout:    5 * time.Minute,

-		WriteTimeout:   5 * time.Minute,

-		MaxHeaderBytes: 1 << 20,

-	}

-	var listener net.Listener

-	var err error

-	if tlsOptions != nil {

-		listener, err = tls.Listen("tcp", addr, tlsOptions.Config)

-	} else {

-		listener, err = net.Listen("tcp", addr)

-	}

-	if err != nil {

-		return err

-	}

-	go s.Serve(listener)

-	return nil

-}

-

-// NewServer initializes and configures the netutils_server.Server object to handle HTTP requests.

-func NewServer(ipam IpamInterface) *Server {

-	server := Server{

-		ipam: ipam,

-		mux:  http.NewServeMux(),

-	}

-	server.InstallDefaultHandlers()

-	return &server

-}

-

-// InstallDefaultHandlers registers the default set of supported HTTP request patterns with the mux.

-func (s *Server) InstallDefaultHandlers() {

-	s.mux.HandleFunc("/netutils/subnet", s.handleSubnet)

-	s.mux.HandleFunc("/netutils/ip/", s.handleIP)

-	s.mux.HandleFunc("/netutils/gateway", s.handleGateway)

-	s.mux.HandleFunc("/stats", s.handleStats)

-}

-

-// error serializes an error object into an HTTP response.

-func (s *Server) error(w http.ResponseWriter, err error) {

-	msg := fmt.Sprintf("Internal Error: %v", err)

-	http.Error(w, msg, http.StatusInternalServerError)

-}

-

-// handleSubnet handles gateway requests

-func (s *Server) handleSubnet(w http.ResponseWriter, req *http.Request) {

-	w.Header().Add("Content-type", "application/json")

-	w.Write([]byte("Not implemented"))

-	return

-}

-

-// handleGateway handles gateway requests

-func (s *Server) handleGateway(w http.ResponseWriter, req *http.Request) {

-	w.Header().Add("Content-type", "application/json")

-	w.Write([]byte("Not implemented"))

-	return

-}

-

-// handleIP handles IP requests

-func (s *Server) handleIP(w http.ResponseWriter, req *http.Request) {

-	if req.Method == "GET" {

-		w.Header().Add("Content-type", "application/json")

-		ipnet, err := s.ipam.GetIP()

-		if err != nil {

-			s.error(w, err)

-		} else {

-			w.Write([]byte(ipnet.String()))

-		}

-	} else if req.Method == "DELETE" {

-		ip, ipNet, err := net.ParseCIDR(req.URL.Path[len("/netutils/ip/"):])

-		if err != nil {

-			s.error(w, err)

-		}

-		delIP := &net.IPNet{IP: ip, Mask: ipNet.Mask}

-		err = s.ipam.ReleaseIP(delIP)

-		if err != nil {

-			s.error(w, err)

-		}

-	} else {

-		http.Error(w, "Method can only be GET/DELETE", http.StatusNotFound)

-	}

-	return

-}

-

-// handleStats handles stats requests

-func (s *Server) handleStats(w http.ResponseWriter, req *http.Request) {

-	w.Header().Add("Content-type", "application/json")

-	w.Write([]byte("Not implemented"))

-	return

-}

-

-// ServeHTTP responds to HTTP requests

-func (s *Server) ServeHTTP(w http.ResponseWriter, req *http.Request) {

-	s.mux.ServeHTTP(w, req)

-}

deleted file mode 100644

@@ -1,73 +0,0 @@

-package server

-

-import (

-	"fmt"

-	"io/ioutil"

-	"net"

-	"net/http"

-	"testing"

-

-	"github.com/openshift/openshift-sdn/pkg/netutils"

-)

-

-func delIP(t *testing.T, delip string) error {

-	url := fmt.Sprintf("http://127.0.0.1:9080/netutils/ip/%s", delip)

-	req, err := http.NewRequest("DELETE", url, nil)

-	if err != nil {

-		t.Fatalf("Error in forming request to IPAM server: %v", err)

-	}

-	res, err := http.DefaultClient.Do(req)

-	if err != nil {

-		t.Fatalf("Error in connecting to IPAM server: %v", err)

-	}

-	if res.StatusCode > 400 {

-		return fmt.Errorf("Bad response from server: %d", res.StatusCode)

-	}

-	return err

-}

-

-func getIP(t *testing.T) string {

-	res, err := http.Get("http://127.0.0.1:9080/netutils/ip")

-	if err != nil {

-		t.Fatalf("Error in connecting to IPAM server: %v", err)

-	}

-	ip, err := ioutil.ReadAll(res.Body)

-	if err != nil {

-		t.Fatalf("Error in obtaining IP address through server: %v", err)

-	}

-	res.Body.Close()

-	return string(ip)

-}

-

-func TestIPServe(t *testing.T) {

-	inuse := make([]string, 0)

-	ipam, err := netutils.NewIPAllocator("10.20.30.40/24", inuse)

-	if err != nil {

-		t.Fatalf("Error while initializing IPAM: %v", err)

-	}

-	ListenAndServeNetutilServer(ipam, net.ParseIP("127.0.0.1"), 9080, nil)

-

-	// get, get, delete, get

-	ip := getIP(t)

-	if ip != "10.20.30.1/24" {

-		t.Fatalf("Wrong IP. Expected 10.20.30.1/24, got %s", ip)

-	}

-	ip = getIP(t)

-	if ip != "10.20.30.2/24" {

-		t.Fatalf("Wrong IP. Expected 10.20.30.2/24, got %s", ip)

-	}

-	err = delIP(t, ip)

-	if err != nil {

-		t.Fatalf("Error while deleting IP address %s: %v", ip, err)

-	}

-	// get it again

-	ip = getIP(t)

-	if ip != "10.20.30.2/24" {

-		t.Fatalf("Wrong IP. Expected 10.20.30.2/24, got %s", ip)

-	}

-	// delete the wrong one and fail if there is no error

-	err = delIP(t, "10.10.10.10/23")

-	if err == nil {

-		t.Fatalf("Error while deleting IP address %s: %v", ip, err)

-	}

-}

@@ -10,17 +10,16 @@ import (

 	oskserver "github.com/openshift/origin/pkg/cmd/server/kubernetes"

 	kclient "k8s.io/kubernetes/pkg/client/unversioned"

-	"github.com/openshift/openshift-sdn/plugins/osdn/flatsdn"

-	"github.com/openshift/openshift-sdn/plugins/osdn/multitenant"

+	"github.com/openshift/openshift-sdn/plugins/osdn/ovs"

 )

 // Call by higher layers to create the plugin instance

 func NewPlugin(pluginType string, osClient *osclient.Client, kClient *kclient.Client, hostname string, selfIP string, ready chan struct{}) (api.OsdnPlugin, oskserver.FilteringEndpointsConfigHandler, error) {

 	switch strings.ToLower(pluginType) {

-	case flatsdn.NetworkPluginName():

-		return flatsdn.CreatePlugin(osdn.NewRegistry(osClient, kClient), hostname, selfIP, ready)

-	case multitenant.NetworkPluginName():

-		return multitenant.CreatePlugin(osdn.NewRegistry(osClient, kClient), hostname, selfIP, ready)

+	case ovs.SingleTenantPluginName():

+		return ovs.CreatePlugin(osdn.NewRegistry(osClient, kClient), false, hostname, selfIP, ready)

+	case ovs.MultiTenantPluginName():

+		return ovs.CreatePlugin(osdn.NewRegistry(osClient, kClient), true, hostname, selfIP, ready)

 	}

 	return nil, nil, nil

deleted file mode 100755

@@ -1,111 +0,0 @@

-#!/bin/bash

-set -e

-

-lock_file=/var/lock/openshift-sdn.lock

-

-action=$1

-pod_namespace=$2

-pod_name=$3

-net_container=$4

-

-lockwrap() {

-    (

-    flock 200

-    "$@"

-    ) 200>${lock_file}

-}

-

-# Retrieve the name of the host-local member of the veth pair that

-# connects the container (identified by pid) to the docker bridge.

-get_veth_host() {

-    local pid=$1

-

-    local veth_ifindex=$(nsenter -n -t $pid -- ethtool -S eth0 | sed -n -e 's/.*peer_ifindex: //p')

-    # Strip a suffix starting with '@' from the interface name.

-    # The suffixed interface name won't be recognized by brctl or ovs-*

-    ip link show | sed -ne "s/^$veth_ifindex: \([^:@]*\).*/\1/p"

-}

-

-get_ipaddr_pid_veth() {

-    network_mode=$(docker inspect --format "{{.HostConfig.NetworkMode}}" ${net_container})

-    if [ "${network_mode}" == "host" ]; then

-      # quit, nothing for the SDN here

-      exit 0

-    elif [[ "${network_mode}" =~ container:.* ]]; then

-      # Get pod infra container

-      net_container=$(echo ${network_mode} | cut -d ":" -f 2)

-    fi

-    ipaddr=$(docker inspect --format "{{.NetworkSettings.IPAddress}}" ${net_container})

-    pid=$(docker inspect --format "{{.State.Pid}}" ${net_container})

-    veth_host=$(get_veth_host $pid)

-}

-

-add_ovs_port() {

-    brctl delif lbr0 $veth_host

-    ovs-vsctl add-port br0 ${veth_host} 

-}

-

-del_ovs_port() {

-    ovs-vsctl --if-exists del-port $veth_host

-}

-

-add_ovs_flows() {

-    ovs_port=$(ovs-ofctl -O OpenFlow13 dump-ports-desc br0  | grep ${veth_host} | cut -d "(" -f 1 | tr -d ' ')

-

-    ovs-ofctl -O OpenFlow13 add-flow br0 "table=0,cookie=0x${ovs_port},priority=100,ip,nw_dst=${ipaddr},actions=output:${ovs_port}"

-    ovs-ofctl -O OpenFlow13 add-flow br0 "table=0,cookie=0x${ovs_port},priority=100,arp,nw_dst=${ipaddr},actions=output:${ovs_port}"

-}

-

-del_ovs_flows() {

-    ovs_port=$(ovs-ofctl -O OpenFlow13 dump-ports-desc br0  | grep ${veth_host} | cut -d "(" -f 1 | tr -d ' ')

-

-    ovs-ofctl -O OpenFlow13 del-flows br0 "table=0,cookie=0x${ovs_port}/0xffffffff"

-}

-

-add_subnet_route() {

-    source /etc/openshift-sdn/config.env

-    local subnet_route="ip route add ${OPENSHIFT_CLUSTER_SUBNET} dev eth0 proto kernel scope link src $ipaddr"

-    nsenter -n -t $pid -- $subnet_route

-}

-

-Init() {

-    true

-}

-

-Setup() {

-    get_ipaddr_pid_veth

-    add_ovs_port

-    add_ovs_flows

-    add_subnet_route

-}

-

-Teardown() {

-    get_ipaddr_pid_veth

-    del_ovs_port

-    del_ovs_flows

-}

-

-Status() {

-    # do nothing, empty output will default to address as picked by docker

-    true

-}

-

-case "$action" in

-    init)

-	lockwrap Init

-	;;

-    setup)

-	set -x

-	lockwrap Setup

-	;;

-    teardown)

-	set -x

-	lockwrap Teardown

-	;;

-    status)

-	lockwrap Status

-	;;

-    *)

-        echo "Bad input: $@"

-        exit 1

-esac

deleted file mode 100755

@@ -1,159 +0,0 @@

-#!/bin/bash

-

-set -ex

-

-lock_file=/var/lock/openshift-sdn.lock

-local_subnet_gateway=$1

-local_subnet_cidr=$2

-local_subnet_mask_len=$3

-cluster_network_cidr=$4

-service_network_cidr=$5

-mtu=$6

-printf 'Container network is "%s"; local host has subnet "%s", mtu "%d" and gateway "%s".\n' "${cluster_network_cidr}" "${local_subnet_cidr}" "${mtu}" "${local_subnet_gateway}"

-TUN=tun0

-

-# Synchronize code execution with a file lock.

-function lockwrap() {

-    (

-    flock 200

-    "$@"

-    ) 200>${lock_file}

-}

-

-function docker_network_config() {

-    if [ -z "${DOCKER_NETWORK_OPTIONS}" ]; then

-	DOCKER_NETWORK_OPTIONS="-b=lbr0 --mtu=${mtu}"

-    fi

-

-    local conf=/run/openshift-sdn/docker-network

-    case "$1" in

-	check)

-	    if ! grep -q -s "DOCKER_NETWORK_OPTIONS='${DOCKER_NETWORK_OPTIONS}'" $conf; then

-		return 1

-	    fi

-	    return 0

-	    ;;

-

-	update)

-		mkdir -p $(dirname $conf)

-		cat <<EOF > $conf

-# This file has been modified by openshift-sdn.

-

-DOCKER_NETWORK_OPTIONS='${DOCKER_NETWORK_OPTIONS}'

-EOF

-		## linux bridge

-		ip link set lbr0 down || true

-		brctl delbr lbr0 || true

-		brctl addbr lbr0

-		ip addr add ${local_subnet_gateway}/${local_subnet_mask_len} dev lbr0

-		ip link set lbr0 up

-

-	    if [ ! -f /.dockerinit ]; then

-		# disable iptables for lbr0

-		# for kernel version 3.18+, module br_netfilter needs to be loaded upfront

-		# for older ones, br_netfilter may not exist, but is covered by bridge (bridge-utils)

-		#

-		# This operation is assumed to have been performed in advance

-		# for docker-in-docker deployments.

-		modprobe br_netfilter || true

-		sysctl -w net.bridge.bridge-nf-call-iptables=0

-	    fi

-		# when using --pid=host to run docker container, systemctl inside it refuses

-		# to work because it detects that it's running in chroot. using dbus instead

-		# of systemctl is just a workaround

-		dbus-send --system --print-reply --reply-timeout=2000 --type=method_call --dest=org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager.Reload

-		dbus-send --system --print-reply --reply-timeout=2000 --type=method_call --dest=org.freedesktop.systemd1 /org/freedesktop/systemd1 org.freedesktop.systemd1.Manager.RestartUnit string:'docker.service' string:'replace'

-	    ;;

-    esac

-}

-

-function setup_required() {

-    ip=$(echo `ip a s lbr0 2>/dev/null|awk '/inet / {print $2}'`)

-    if [ "$ip" != "${local_subnet_gateway}/${local_subnet_mask_len}" ]; then

-        return 0

-    fi

-    if ! ovs-ofctl -O OpenFlow13 dump-flows br0 | grep -q 'table=0.*arp'; then

-        return 0

-    fi

-    return 1

-}

-

-# Delete the subnet routing entry created because of ip link up on device

-# ip link adds local subnet route entry asynchronously

-# So check for the new route entry every 100 ms upto timeout of 2 secs and

-# delete the route entry.

-function delete_local_subnet_route() {

-    local device=$1

-    local time_interval=0.1  # 100 milli secs

-    local max_intervals=20   # timeout: 2 secs

-    local num_intervals=0

-    local cmd="ip route | grep -q '${local_subnet_cidr} dev ${device}'"

-

-    until $(eval $cmd) || [ $num_intervals -ge $max_intervals ]; do

-        sleep $time_interval

-        num_intervals=$((num_intervals + 1))

-    done

-

-    if [ $num_intervals -ge $max_intervals ]; then

-        echo "Error: ${local_subnet_cidr} route not found for dev ${device}" >&2

-        return 1

-    fi

-    ip route del ${local_subnet_cidr} dev ${device} proto kernel scope link

-}

-

-function setup() {

-    # clear config file

-    rm -f /etc/openshift-sdn/config.env

-

-    ## openvswitch

-    ovs-vsctl del-br br0 || true

-    ovs-vsctl add-br br0 -- set Bridge br0 fail-mode=secure

-    ovs-vsctl set bridge br0 protocols=OpenFlow13

-    ovs-vsctl del-port br0 vxlan0 || true

-    ovs-vsctl add-port br0 vxlan0 -- set Interface vxlan0 type=vxlan options:remote_ip="flow" options:key="flow" ofport_request=1

-    ovs-vsctl add-port br0 ${TUN} -- set Interface ${TUN} type=internal ofport_request=2

-

-    ip link del vlinuxbr || true

-    ip link add vlinuxbr type veth peer name vovsbr

-    ip link set vlinuxbr up

-    ip link set vovsbr up

-    ip link set vlinuxbr txqueuelen 0

-    ip link set vovsbr txqueuelen 0

-    brctl addif lbr0 vlinuxbr

-

-    ovs-vsctl del-port br0 vovsbr || true

-    ovs-vsctl add-port br0 vovsbr -- set Interface vovsbr ofport_request=9

-

-    # setup tun address

-    ip addr add ${local_subnet_gateway}/${local_subnet_mask_len} dev ${TUN}

-    ip link set ${TUN} up

-    ip route add ${cluster_network_cidr} dev ${TUN} proto kernel scope link

-

-    # Cleanup docker0 since docker won't do it

-    ip link set docker0 down || true

-    brctl delbr docker0 || true

-

-    # enable IP forwarding for ipv4 packets

-    sysctl -w net.ipv4.ip_forward=1

-    sysctl -w net.ipv4.conf.${TUN}.forwarding=1

-

-    mkdir -p /etc/openshift-sdn

-    echo "export OPENSHIFT_CLUSTER_SUBNET=${cluster_network_cidr}" >> "/etc/openshift-sdn/config.env"

-

-    # delete unnecessary routes

-    delete_local_subnet_route lbr0 || true

-    delete_local_subnet_route ${TUN} || true

-}

-

-set +e

-if ! docker_network_config check; then

-  lockwrap docker_network_config update

-fi

-

-if ! setup_required; then

-    echo "SDN setup not required."

-    exit 140

-fi

-set -e

-

-lockwrap setup

deleted file mode 100644

@@ -1,113 +0,0 @@

-package flatsdn

-

-import (

-	"encoding/hex"

-	"fmt"

-	log "github.com/golang/glog"

-	"net"

-	"os/exec"

-	"syscall"

-

-	"github.com/openshift/openshift-sdn/pkg/netutils"

-	"github.com/openshift/openshift-sdn/plugins/osdn/api"

-)

-

-type FlowController struct {

-}

-

-func NewFlowController() *FlowController {

-	return &FlowController{}

-}

-

-func (c *FlowController) Setup(localSubnetCIDR, clusterNetworkCIDR, servicesNetworkCIDR string, mtu uint) error {

-	_, ipnet, err := net.ParseCIDR(localSubnetCIDR)

-	localSubnetMaskLength, _ := ipnet.Mask.Size()

-	localSubnetGateway := netutils.GenerateDefaultGateway(ipnet).String()

-	out, err := exec.Command("openshift-sdn-kube-subnet-setup.sh", localSubnetGateway, localSubnetCIDR, fmt.Sprint(localSubnetMaskLength), clusterNetworkCIDR, servicesNetworkCIDR, fmt.Sprint(mtu)).CombinedOutput()

-	log.Infof("Output of setup script:\n%s", out)

-	if err != nil {

-		exitErr, ok := err.(*exec.ExitError)

-		if ok {

-			status := exitErr.ProcessState.Sys().(syscall.WaitStatus)

-			if status.Exited() && status.ExitStatus() == 140 {

-				// valid, do nothing, its just a benevolent restart

-				return nil

-			}

-		}

-		log.Errorf("Error executing setup script. \n\tOutput: %s\n\tError: %v\n", out, err)

-		return err

-	}

-	_, err = exec.Command("ovs-ofctl", "-O", "OpenFlow13", "del-flows", "br0").CombinedOutput()

-	if err != nil {

-		return err

-	}

-	_, err = exec.Command("ovs-ofctl", "-O", "OpenFlow13", "add-flow", "br0", "cookie=0x0,table=0,priority=50,actions=output:2").CombinedOutput()

-	arprule := fmt.Sprintf("cookie=0x0,table=0,priority=100,arp,nw_dst=%s,actions=output:2", localSubnetGateway)

-	iprule := fmt.Sprintf("cookie=0x0,table=0,priority=100,ip,nw_dst=%s,actions=output:2", localSubnetGateway)

-	_, err = exec.Command("ovs-ofctl", "-O", "OpenFlow13", "add-flow", "br0", arprule).CombinedOutput()

-	_, err = exec.Command("ovs-ofctl", "-O", "OpenFlow13", "add-flow", "br0", iprule).CombinedOutput()

-	return err

-}

-

-func (c *FlowController) AddOFRules(nodeIP, nodeSubnetCIDR, localIP string) error {

-	cookie := generateCookie(nodeIP)

-	if nodeIP == localIP {

-		// self, so add the input rules for containers that are not processed through kube-hooks

-		// for the input rules to pods, see the kube-hook

-		iprule := fmt.Sprintf("table=0,cookie=0x%s,priority=75,ip,nw_dst=%s,actions=output:9", cookie, nodeSubnetCIDR)

-		arprule := fmt.Sprintf("table=0,cookie=0x%s,priority=75,arp,nw_dst=%s,actions=output:9", cookie, nodeSubnetCIDR)

-		o, e := exec.Command("ovs-ofctl", "-O", "OpenFlow13", "add-flow", "br0", iprule).CombinedOutput()

-		log.Infof("Output of adding %s: %s (%v)", iprule, o, e)

-		o, e = exec.Command("ovs-ofctl", "-O", "OpenFlow13", "add-flow", "br0", arprule).CombinedOutput()

-		log.Infof("Output of adding %s: %s (%v)", arprule, o, e)

-		return e

-	} else {

-		iprule := fmt.Sprintf("table=0,cookie=0x%s,priority=100,ip,nw_dst=%s,actions=set_field:%s->tun_dst,output:1", cookie, nodeSubnetCIDR, nodeIP)

-		arprule := fmt.Sprintf("table=0,cookie=0x%s,priority=100,arp,nw_dst=%s,actions=set_field:%s->tun_dst,output:1", cookie, nodeSubnetCIDR, nodeIP)

-		o, e := exec.Command("ovs-ofctl", "-O", "OpenFlow13", "add-flow", "br0", iprule).CombinedOutput()

-		log.Infof("Output of adding %s: %s (%v)", iprule, o, e)

-		o, e = exec.Command("ovs-ofctl", "-O", "OpenFlow13", "add-flow", "br0", arprule).CombinedOutput()

-		log.Infof("Output of adding %s: %s (%v)", arprule, o, e)

-		return e

-	}

-	return nil

-}

-

-func (c *FlowController) DelOFRules(nodeIP, localIP string) error {

-	log.Infof("Calling del rules for %s", nodeIP)

-	cookie := generateCookie(nodeIP)

-	if nodeIP == localIP {

-		iprule := fmt.Sprintf("table=0,cookie=0x%s/0xffffffff,ip,in_port=10", cookie)

-		arprule := fmt.Sprintf("table=0,cookie=0x%s/0xffffffff,arp,in_port=10", cookie)

-		o, e := exec.Command("ovs-ofctl", "-O", "OpenFlow13", "del-flows", "br0", iprule).CombinedOutput()

-		log.Infof("Output of deleting local ip rules %s (%v)", o, e)

-		o, e = exec.Command("ovs-ofctl", "-O", "OpenFlow13", "del-flows", "br0", arprule).CombinedOutput()

-		log.Infof("Output of deleting local arp rules %s (%v)", o, e)

-		return e

-	} else {

-		iprule := fmt.Sprintf("table=0,cookie=0x%s/0xffffffff,ip", cookie)

-		arprule := fmt.Sprintf("table=0,cookie=0x%s/0xffffffff,arp", cookie)

-		o, e := exec.Command("ovs-ofctl", "-O", "OpenFlow13", "del-flows", "br0", iprule).CombinedOutput()

-		log.Infof("Output of deleting %s: %s (%v)", iprule, o, e)

-		o, e = exec.Command("ovs-ofctl", "-O", "OpenFlow13", "del-flows", "br0", arprule).CombinedOutput()

-		log.Infof("Output of deleting %s: %s (%v)", arprule, o, e)

-		return e

-	}

-	return nil

-}

-

-func generateCookie(ip string) string {

-	return hex.EncodeToString(net.ParseIP(ip).To4())

-}

-

-func (c *FlowController) AddServiceOFRules(netID uint, IP string, protocol api.ServiceProtocol, port uint) error {

-	return nil

-}

-

-func (c *FlowController) DelServiceOFRules(netID uint, IP string, protocol api.ServiceProtocol, port uint) error {

-	return nil

-}

-

-func (c *FlowController) UpdatePod(namespace, podName, containerID string, netID uint) error {

-	return nil

-}

deleted file mode 100644

@@ -1,84 +0,0 @@

-package flatsdn

-

-import (

-	"github.com/golang/glog"

-

-	"github.com/openshift/openshift-sdn/plugins/osdn"

-	"github.com/openshift/openshift-sdn/plugins/osdn/api"

-	oskserver "github.com/openshift/origin/pkg/cmd/server/kubernetes"