홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Hyunsun Moon
Committed by Gerrit Code Review
f1c03464 1 parent 5bb38129

CORD-248 Added host management network type 

And changed OLT_AGENT to ACCESS_AGENT

Change-Id: I8bfdb9171ca73aec6bd271ca13b2234a6935ac30
Inline Side-by-side
Showing 2 changed files with 11 additions and 12 deletions
......@@ -26,12 +26,13 @@ public interface VtnServiceApi {
enum NetworkType {
PRIVATE,
PUBLIC,
MANAGEMENT
MANAGEMENT_HOSTS,
MANAGEMENT_LOCAL
}
enum ServiceType {
VSG,
OLT_AGENT,
ACCESS_AGENT,
MANAGEMENT,
DEFAULT
}
......
......@@ -39,12 +39,8 @@ import java.util.Set;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkArgument;
import static org.onosproject.xosclient.api.VtnServiceApi.NetworkType.PRIVATE;
import static org.onosproject.xosclient.api.VtnServiceApi.NetworkType.PUBLIC;
import static org.onosproject.xosclient.api.VtnServiceApi.NetworkType.MANAGEMENT;
import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.DEFAULT;
import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.OLT_AGENT;
import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.VSG;
import static org.onosproject.xosclient.api.VtnServiceApi.NetworkType.*;
import static org.onosproject.xosclient.api.VtnServiceApi.ServiceType.*;
/**
* Provides CORD VTN service and service dependency APIs.
......@@ -180,8 +176,10 @@ public final class DefaultVtnServiceApi extends XosApi implements VtnServiceApi
String name = netName.toUpperCase();
if (name.contains(PUBLIC.name())) {
return PUBLIC;
} else if (name.contains(MANAGEMENT.name())) {
return MANAGEMENT;
} else if (name.contains(MANAGEMENT_HOSTS.name())) {
return MANAGEMENT_HOSTS;
} else if (name.contains("MANAGEMENT")) {
return MANAGEMENT_LOCAL;
} else {
return PRIVATE;
}
......@@ -194,8 +192,8 @@ public final class DefaultVtnServiceApi extends XosApi implements VtnServiceApi
String name = netName.toUpperCase();
if (name.contains(VSG.name())) {
return VSG;
} else if (name.contains(OLT_AGENT.name())) {
return OLT_AGENT;
} else if (name.contains(ACCESS_AGENT.name())) {
return ACCESS_AGENT;
} else if (name.contains(ServiceType.MANAGEMENT.name())) {
return ServiceType.MANAGEMENT;
} else {
......