Charles Chan
Committed by Gerrit Code Review

Cleanup interface constant

Change-Id: Ief110d6db88889e5c01c43b5d410330114c65ad9
......@@ -220,7 +220,10 @@ public class SegmentRoutingManager implements SegmentRoutingService {
private static int numOfHandlerScheduled = 0;
private KryoNamespace.Builder kryoBuilder = null;
/**
* Segment Routing App ID.
*/
public static final String SR_APP_ID = "org.onosproject.segmentrouting";
/**
* The starting value of per-subnet VLAN ID assignment.
*/
......
......@@ -22,11 +22,6 @@ import java.util.List;
*/
public interface SegmentRoutingService {
/**
* Segment Routing App ID.
*/
String SR_APP_ID = "org.onosproject.segmentrouting";
/**
* Highest flow priority.
*/
int HIGHEST_PRIORITY = 0xffff;
......@@ -54,8 +49,6 @@ public interface SegmentRoutingService {
*/
int FLOOD_PRIORITY = 5;
long OFPP_MAX = 0xffffff00L;
/**
* Returns all tunnels.
*
......
......@@ -27,7 +27,7 @@ import org.onosproject.TestApplicationId;
import org.onosproject.net.DeviceId;
import org.onosproject.net.config.Config;
import org.onosproject.net.config.ConfigApplyDelegate;
import org.onosproject.segmentrouting.SegmentRoutingService;
import org.onosproject.segmentrouting.SegmentRoutingManager;
import java.util.Set;
import static org.hamcrest.Matchers.is;
......@@ -40,7 +40,7 @@ import static org.junit.Assert.assertFalse;
*/
public class SegmentRoutingAppConfigTest {
private static final ApplicationId APP_ID =
new TestApplicationId(SegmentRoutingService.SR_APP_ID);
new TestApplicationId(SegmentRoutingManager.SR_APP_ID);
private SegmentRoutingAppConfig config;
private SegmentRoutingAppConfig invalidConfig;
......@@ -80,7 +80,7 @@ public class SegmentRoutingAppConfigTest {
@Before
public void setUp() throws Exception {
ApplicationId subject = APP_ID;
String key = SegmentRoutingService.SR_APP_ID;
String key = SegmentRoutingManager.SR_APP_ID;
ObjectMapper mapper = new ObjectMapper();
JsonNode jsonNode = mapper.readTree(JSON_STRING);
JsonNode invalidJsonNode = mapper.readTree(INVALID_JSON_STRING);
......