Skip to content
Snippets Groups Projects
Commit b3ec8863 authored by abat's avatar abat
Browse files

Merge into master from pull request #3538:

Register Vendor Actions on Floodlight startup (https://github.com/bigswitch/bigswitchcontroller/pull/3538)
parents e4116001 1979a2b1
No related branches found
No related tags found
No related merge requests found
package com.bigswitch.floodlight.vendor;
import net.floodlightcontroller.core.web.serializers.IPv4Serializer;
import net.floodlightcontroller.packet.IPv4;
import org.jboss.netty.buffer.ChannelBuffer;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
public class OFActionTunnelDstIP extends OFActionBigSwitchVendor {
public final static int MINIMUM_LENGTH_TUNNEL_DST = 16;
public final static int SET_TUNNEL_DST_SUBTYPE = 2;
......@@ -20,6 +23,7 @@ public class OFActionTunnelDstIP extends OFActionBigSwitchVendor {
this.dstIPAddr = dstIPAddr;
}
@JsonSerialize(using=IPv4Serializer.class)
public int getTunnelDstIP() {
return this.dstIPAddr;
}
......
......@@ -114,6 +114,8 @@ import org.sdnplatform.sync.error.SyncException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.bigswitch.floodlight.vendor.OFVendorActions;
/**
......@@ -2176,6 +2178,9 @@ public class Controller implements IFloodlightProviderService,
// Configure openflowj to be able to parse the role request/reply
// vendor messages.
OFNiciraVendorExtensions.initialize();
// Register the standard Vendor actions that we support
OFVendorActions.registerStandardVendorActions();
}
/**
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment