Skip to content

Commit

Permalink
flow_manager supported
Browse files Browse the repository at this point in the history
  • Loading branch information
SUGYO committed Jun 1, 2012
1 parent 1377c14 commit ac2adec
Show file tree
Hide file tree
Showing 16 changed files with 75 additions and 61 deletions.
4 changes: 2 additions & 2 deletions sliceable_switch/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ GEM_BIN = `ruby -e 'require "rubygems"; puts Gem::bindir'`
TREMA_APPS = ..

CC = gcc
CFLAGS = $(shell $(TREMA)/trema-config --cflags) -I$(TREMA_APPS)/topology -std=gnu99 -g -D_GNU_SOURCE -Wall
LDFLAGS = $(shell $(TREMA)/trema-config --libs) -L$(TREMA_APPS)/topology -ltopology
CFLAGS = $(shell $(TREMA)/trema-config --cflags) -I$(TREMA_APPS)/topology -I$(TREMA_APPS)/flow_manager -std=gnu99 -g -D_GNU_SOURCE -Wall
LDFLAGS = $(shell $(TREMA)/trema-config --libs) -L$(TREMA_APPS)/topology -ltopology -L$(TREMA_APPS)/flow_manager -lpath

TARGET = sliceable_switch
SRCS = fdb.c filter.c libpathresolver.c port.c sliceable_switch.c slice.c redirector.c
Expand Down
3 changes: 2 additions & 1 deletion sliceable_switch/Slice.pm
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,11 @@ sub close(){
sub create_slice(){
my ($self, $slice_id, $description) = @_;

my $slice_number = 1;
my $sth = $self->{'dbh'}->prepare("SELECT MAX(number) FROM slices");
my $ret = $sth->execute();
my $row = $sth->fetch();
my $slice_number = $row->[0] + 1;
$slice_number = $row->[0] + 1 if defined($row->[0]);

if(!defined($description)){
$description = "";
Expand Down
2 changes: 2 additions & 0 deletions sliceable_switch/features/mac_binding.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down Expand Up @@ -145,6 +146,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
1 change: 1 addition & 0 deletions sliceable_switch/features/mac_binding_65535_slices.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
2 changes: 2 additions & 0 deletions sliceable_switch/features/mac_binding_loose_mode.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down Expand Up @@ -145,6 +146,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
2 changes: 2 additions & 0 deletions sliceable_switch/features/mac_binding_multiple_slices.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down Expand Up @@ -110,6 +111,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
1 change: 1 addition & 0 deletions sliceable_switch/features/mac_port_mac_mixed_binding.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
2 changes: 2 additions & 0 deletions sliceable_switch/features/port_binding.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down Expand Up @@ -145,6 +146,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
2 changes: 2 additions & 0 deletions sliceable_switch/features/port_binding_multiple_slices.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down Expand Up @@ -106,6 +107,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
3 changes: 3 additions & 0 deletions sliceable_switch/features/port_mac_binding.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down Expand Up @@ -153,6 +154,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down Expand Up @@ -213,6 +215,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
1 change: 1 addition & 0 deletions sliceable_switch/features/port_mac_mixed_binding.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
1 change: 1 addition & 0 deletions sliceable_switch/features/port_port_mac_mixed_binding.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ Feature: control multiple openflow switchies using sliceable_switch
run { path "../apps/topology/topology" }
run { path "../apps/topology/topology_discovery" }
run { path "../apps/flow_manager/flow_manager" }
event :port_status => "topology", :packet_in => "filter", :state_notify => "topology"
filter :lldp => "topology_discovery", :packet_in => "sliceable_switch"
Expand Down
100 changes: 42 additions & 58 deletions sliceable_switch/sliceable_switch.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "slice.h"
#include "sliceable_switch.h"
#include "topology_service_interface_option_parser.h"
#include "libpath.h"


static const uint16_t FLOW_TIMER = 60;
Expand Down Expand Up @@ -67,41 +68,12 @@ typedef struct {
} port_params;


static void
modify_flow_entry( const pathresolver_hop *h, const buffer *packet, uint16_t idle_timeout, uint16_t out_vid ) {
const uint32_t wildcards = 0;
struct ofp_match match;
set_match_from_packet( &match, h->in_port_no, wildcards, packet );

uint16_t in_vid = match.dl_vlan;
uint32_t transaction_id = get_transaction_id();
openflow_actions *actions = create_actions();

if ( out_vid != in_vid ) {
if ( in_vid != VLAN_NONE && out_vid == VLAN_NONE ) {
append_action_strip_vlan( actions );
}
else {
append_action_set_vlan_vid( actions, out_vid );
}
}

const uint16_t max_len = UINT16_MAX;
append_action_output( actions, h->out_port_no, max_len );

const uint16_t hard_timeout = 0;
const uint16_t priority = UINT16_MAX;
const uint32_t buffer_id = UINT32_MAX;
const uint16_t flags = 0;
buffer *flow_mod = create_flow_mod( transaction_id, match, get_cookie(),
OFPFC_ADD, idle_timeout, hard_timeout,
priority, buffer_id,
h->out_port_no, flags, actions );

send_openflow_message( h->dpid, flow_mod );
delete_actions( actions );
free_buffer( flow_mod );
}
typedef struct packet_out_params {
buffer *packet;
uint64_t out_datapath_id;
uint16_t out_port_no;
uint16_t out_vid;
} packet_out_params;


static void
Expand Down Expand Up @@ -155,18 +127,15 @@ output_packet( const buffer *packet, uint64_t dpid, uint16_t port_no, uint16_t o


static void
output_packet_from_last_switch( const pathresolver_hop *last_hop, const buffer *packet, uint16_t out_vid ) {
output_packet( packet, last_hop->dpid, last_hop->out_port_no, out_vid );
}
handle_setup( int status, const path *p, void *user_data ) {
UNUSED(p);
assert(user_data);


static uint32_t
count_hops( const dlist_element *hops ) {
uint32_t i = 0;
for ( const dlist_element *e = hops; e != NULL; e = e->next ) {
i++;
packet_out_params *params = user_data;
if ( status == SETUP_SUCCEEDED ) {
output_packet( params->packet, params->out_datapath_id, params->out_port_no, params->out_vid );
}
return i;
xfree( params );
}


Expand Down Expand Up @@ -208,24 +177,35 @@ make_path( sliceable_switch *sliceable_switch, uint64_t in_datapath_id, uint16_t
return;
}

// count elements
uint32_t hop_count = count_hops( hops );
const uint32_t wildcards = 0;
struct ofp_match match;
set_match_from_packet( &match, 0, wildcards, packet );

// send flow entry from tail switch
for ( dlist_element *e = get_last_element( hops ); e != NULL; e = e->prev, hop_count-- ) {
uint16_t idle_timer = ( uint16_t ) ( sliceable_switch->idle_timeout + hop_count );
if ( e->next != NULL ) {
modify_flow_entry( e->data, packet, idle_timer, in_vid );
}
else {
modify_flow_entry( e->data, packet, idle_timer, out_vid );
}
const uint16_t hard_timeout = 0;
const uint16_t priority = UINT16_MAX;
path *p = create_path( match, priority, sliceable_switch->idle_timeout, hard_timeout );
assert( p != NULL );
for ( dlist_element *e = get_first_element( hops ); e != NULL; e = e->next ) {
pathresolver_hop *rh = e->data;
hop *h = create_hop( rh->dpid, rh->in_port_no, rh->out_port_no, NULL );
assert( h != NULL );
append_hop_to_path( p, h );
} // for(;;)

// send packet out for tail switch
dlist_element *e = get_last_element( hops );
pathresolver_hop *last_hop = e->data;
output_packet_from_last_switch( last_hop, packet, out_vid );
packet_out_params *params = xmalloc( sizeof( struct packet_out_params ) );
params->packet = duplicate_buffer( packet );
params->out_datapath_id = last_hop->dpid;
params->out_port_no = last_hop->out_port_no;
params->out_vid = out_vid;

bool ret = setup_path( p, handle_setup, params, NULL, NULL );
if ( ret != true ) {
error( "Failed to set up path." );
}

delete_path( p );

// free them
free_hop_list( hops );
Expand Down Expand Up @@ -799,6 +779,8 @@ main( int argc, char *argv[] ) {

// Initialize Trema world
init_trema( &argc, &argv );
// Init path management library (libpath)
init_path();
switch_options options;
init_switch_options( &options, &argc, &argv );
init_topology_service_interface_options( &argc, &argv );
Expand All @@ -811,6 +793,8 @@ main( int argc, char *argv[] ) {

// Finalize sliceable_switch
delete_sliceable_switch( sliceable_switch );
// Finalize path management library (libpath)
finalize_path();

return 0;
}
Expand Down
4 changes: 4 additions & 0 deletions sliceable_switch/sliceable_switch.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,10 @@ run {
path "../apps/topology/topology_discovery"
}

run {
path "../apps/flow_manager/flow_manager"
}

run {
path "../apps/sliceable_switch/sliceable_switch"
options "-s", "../apps/sliceable_switch/slice.db", "-f", "../apps/sliceable_switch/filter.db"
Expand Down
4 changes: 4 additions & 0 deletions sliceable_switch/sliceable_switch_null.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ run {
path "../apps/topology/topology_discovery"
}

run {
path "../apps/flow_manager/flow_manager"
}

run {
path "../apps/sliceable_switch/sliceable_switch"
options "-s", "../apps/sliceable_switch/slice.db", "-f", "../apps/sliceable_switch/filter.db"
Expand Down
4 changes: 4 additions & 0 deletions sliceable_switch/sliceable_switch_rest_null.conf
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@ run {
path "../apps/topology/topology_discovery"
}

run {
path "../apps/flow_manager/flow_manager"
}

run {
path "../apps/sliceable_switch/sliceable_switch"
options "-s", "/home/sliceable_switch/db/slice.db", "-f", "/home/sliceable_switch/db/filter.db"
Expand Down

0 comments on commit ac2adec

Please sign in to comment.