afonso/core-extra
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

updated corefx to use explicit id names for grpc

Browse source
This commit is contained in:
Blake J. Harnden 2019-05-28 14:49:25 -07:00
parent b3aaa870eb
commit 6b93f60056
1 changed files with 62 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

120
corefx/src/main/java/com/core/client/grpc/CoreGrpcClient.java
View file

@ -193,7 +193,7 @@ public class CoreGrpcClient implements ICoreClient {
try { try {
CoreProto.CreateSessionResponse response = blockingStub.createSession(request); CoreProto.CreateSessionResponse response = blockingStub.createSession(request);
SessionOverview overview = new SessionOverview(); SessionOverview overview = new SessionOverview();
overview.setId(response.getId()); overview.setId(response.getSessionId());
overview.setState(response.getStateValue()); overview.setState(response.getStateValue());
overview.setNodes(0); overview.setNodes(0);
return overview; return overview;
@ -204,7 +204,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean deleteSession(Integer sessionId) throws IOException { public boolean deleteSession(Integer sessionId) throws IOException {
CoreProto.DeleteSessionRequest request = CoreProto.DeleteSessionRequest.newBuilder().setId(sessionId).build(); CoreProto.DeleteSessionRequest request = CoreProto.DeleteSessionRequest.newBuilder()
.setSessionId(sessionId).build();
try { try {
return blockingStub.deleteSession(request).getResult(); return blockingStub.deleteSession(request).getResult();
} catch (StatusRuntimeException ex) { } catch (StatusRuntimeException ex) {
@ -234,7 +235,7 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public Session getSession(Integer sessionId) throws IOException { public Session getSession(Integer sessionId) throws IOException {
logger.info("getting session: {}", sessionId); logger.info("getting session: {}", sessionId);
CoreProto.GetSessionRequest request = CoreProto.GetSessionRequest.newBuilder().setId(sessionId).build(); CoreProto.GetSessionRequest request = CoreProto.GetSessionRequest.newBuilder().setSessionId(sessionId).build();
try { try {
CoreProto.GetSessionResponse response = blockingStub.getSession(request); CoreProto.GetSessionResponse response = blockingStub.getSession(request);
Session session = new Session(); Session session = new Session();
@ -256,10 +257,10 @@ public class CoreGrpcClient implements ICoreClient {
session.getNodes().add(node); session.getNodes().add(node);
} }
for (CoreProto.Link linkProto : response.getSession().getLinksList()) { for (CoreProto.Link linkProto : response.getSession().getLinksList()) {
logger.info("adding link: {} - {}", linkProto.getNodeOne(), linkProto.getNodeTwo()); logger.info("adding link: {} - {}", linkProto.getNodeOneId(), linkProto.getNodeTwoId());
CoreLink link = new CoreLink(); CoreLink link = new CoreLink();
link.setNodeOne(linkProto.getNodeOne()); link.setNodeOne(linkProto.getNodeOneId());
link.setNodeTwo(linkProto.getNodeTwo()); link.setNodeTwo(linkProto.getNodeTwoId());
CoreProto.Interface interfaceOneProto = linkProto.getInterfaceOne(); CoreProto.Interface interfaceOneProto = linkProto.getInterfaceOne();
CoreInterface interfaceOne = new CoreInterface(); CoreInterface interfaceOne = new CoreInterface();
interfaceOne.setId(interfaceOneProto.getId()); interfaceOne.setId(interfaceOneProto.getId());
@ -354,11 +355,14 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean setState(SessionState state) throws IOException { public boolean setState(SessionState state) throws IOException {
CoreProto.SetSessionStateRequest request = CoreProto.SetSessionStateRequest.newBuilder() CoreProto.SetSessionStateRequest request = CoreProto.SetSessionStateRequest.newBuilder()
.setId(sessionId) .setSessionId(sessionId)
.setStateValue(state.getValue()) .setStateValue(state.getValue())
.build(); .build();
try { try {
CoreProto.SetSessionStateResponse response = blockingStub.setSessionState(request); CoreProto.SetSessionStateResponse response = blockingStub.setSessionState(request);
if (response.getResult()) {
sessionState = state;
}
return response.getResult(); return response.getResult();
} catch (StatusRuntimeException ex) { } catch (StatusRuntimeException ex) {
throw new IOException(ex); throw new IOException(ex);
@ -409,7 +413,7 @@ public class CoreGrpcClient implements ICoreClient {
allDefaults.add(serviceDefaults); allDefaults.add(serviceDefaults);
} }
CoreProto.SetServiceDefaultsRequest request = CoreProto.SetServiceDefaultsRequest.newBuilder() CoreProto.SetServiceDefaultsRequest request = CoreProto.SetServiceDefaultsRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.addAllDefaults(allDefaults) .addAllDefaults(allDefaults)
.build(); .build();
try { try {
@ -446,8 +450,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean setService(CoreNode node, String serviceName, CoreService service) throws IOException { public boolean setService(CoreNode node, String serviceName, CoreService service) throws IOException {
CoreProto.SetNodeServiceRequest request = CoreProto.SetNodeServiceRequest.newBuilder() CoreProto.SetNodeServiceRequest request = CoreProto.SetNodeServiceRequest.newBuilder()
.setId(node.getId()) .setNodeId(node.getId())
.setSession(sessionId) .setSessionId(sessionId)
.setService(serviceName) .setService(serviceName)
.build(); .build();
request.getShutdownList().addAll(service.getShutdown()); request.getShutdownList().addAll(service.getShutdown());
@ -463,8 +467,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public String getServiceFile(CoreNode node, String serviceName, String fileName) throws IOException { public String getServiceFile(CoreNode node, String serviceName, String fileName) throws IOException {
CoreProto.GetNodeServiceFileRequest request = CoreProto.GetNodeServiceFileRequest.newBuilder() CoreProto.GetNodeServiceFileRequest request = CoreProto.GetNodeServiceFileRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.setService(serviceName) .setService(serviceName)
.build(); .build();
try { try {
@ -478,8 +482,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean startService(CoreNode node, String serviceName) throws IOException { public boolean startService(CoreNode node, String serviceName) throws IOException {
CoreProto.ServiceActionRequest request = CoreProto.ServiceActionRequest.newBuilder() CoreProto.ServiceActionRequest request = CoreProto.ServiceActionRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.setService(serviceName) .setService(serviceName)
.setAction(CoreProto.ServiceAction.SERVICE_START) .setAction(CoreProto.ServiceAction.SERVICE_START)
.build(); .build();
@ -493,8 +497,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean stopService(CoreNode node, String serviceName) throws IOException { public boolean stopService(CoreNode node, String serviceName) throws IOException {
CoreProto.ServiceActionRequest request = CoreProto.ServiceActionRequest.newBuilder() CoreProto.ServiceActionRequest request = CoreProto.ServiceActionRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.setService(serviceName) .setService(serviceName)
.setAction(CoreProto.ServiceAction.SERVICE_STOP) .setAction(CoreProto.ServiceAction.SERVICE_STOP)
.build(); .build();
@ -508,8 +512,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean restartService(CoreNode node, String serviceName) throws IOException { public boolean restartService(CoreNode node, String serviceName) throws IOException {
CoreProto.ServiceActionRequest request = CoreProto.ServiceActionRequest.newBuilder() CoreProto.ServiceActionRequest request = CoreProto.ServiceActionRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.setService(serviceName) .setService(serviceName)
.setAction(CoreProto.ServiceAction.SERVICE_RESTART) .setAction(CoreProto.ServiceAction.SERVICE_RESTART)
.build(); .build();
@ -523,8 +527,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean validateService(CoreNode node, String serviceName) throws IOException { public boolean validateService(CoreNode node, String serviceName) throws IOException {
CoreProto.ServiceActionRequest request = CoreProto.ServiceActionRequest.newBuilder() CoreProto.ServiceActionRequest request = CoreProto.ServiceActionRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.setService(serviceName) .setService(serviceName)
.setAction(CoreProto.ServiceAction.SERVICE_VALIDATE) .setAction(CoreProto.ServiceAction.SERVICE_VALIDATE)
.build(); .build();
@ -538,8 +542,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean setServiceFile(CoreNode node, String serviceName, ServiceFile serviceFile) throws IOException { public boolean setServiceFile(CoreNode node, String serviceName, ServiceFile serviceFile) throws IOException {
CoreProto.SetNodeServiceFileRequest request = CoreProto.SetNodeServiceFileRequest.newBuilder() CoreProto.SetNodeServiceFileRequest request = CoreProto.SetNodeServiceFileRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.setService(serviceName) .setService(serviceName)
.setFile(serviceFile.getName()) .setFile(serviceFile.getName())
.setData(ByteString.copyFromUtf8(serviceFile.getData())) .setData(ByteString.copyFromUtf8(serviceFile.getData()))
@ -555,7 +559,7 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public List<ConfigGroup> getEmaneConfig(CoreNode node) throws IOException { public List<ConfigGroup> getEmaneConfig(CoreNode node) throws IOException {
CoreProto.GetEmaneConfigRequest request = CoreProto.GetEmaneConfigRequest.newBuilder() CoreProto.GetEmaneConfigRequest request = CoreProto.GetEmaneConfigRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.build(); .build();
try { try {
CoreProto.GetEmaneConfigResponse response = blockingStub.getEmaneConfig(request); CoreProto.GetEmaneConfigResponse response = blockingStub.getEmaneConfig(request);
@ -568,7 +572,7 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public List<String> getEmaneModels() throws IOException { public List<String> getEmaneModels() throws IOException {
CoreProto.GetEmaneModelsRequest request = CoreProto.GetEmaneModelsRequest.newBuilder() CoreProto.GetEmaneModelsRequest request = CoreProto.GetEmaneModelsRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.build(); .build();
try { try {
CoreProto.GetEmaneModelsResponse response = blockingStub.getEmaneModels(request); CoreProto.GetEmaneModelsResponse response = blockingStub.getEmaneModels(request);
@ -582,7 +586,7 @@ public class CoreGrpcClient implements ICoreClient {
public boolean setEmaneConfig(CoreNode node, List<ConfigOption> options) throws IOException { public boolean setEmaneConfig(CoreNode node, List<ConfigOption> options) throws IOException {
Map<String, String> config = configOptionListToMap(options); Map<String, String> config = configOptionListToMap(options);
CoreProto.SetEmaneConfigRequest request = CoreProto.SetEmaneConfigRequest.newBuilder() CoreProto.SetEmaneConfigRequest request = CoreProto.SetEmaneConfigRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.putAllConfig(config) .putAllConfig(config)
.build(); .build();
try { try {
@ -596,8 +600,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public List<ConfigGroup> getEmaneModelConfig(Integer id, String model) throws IOException { public List<ConfigGroup> getEmaneModelConfig(Integer id, String model) throws IOException {
CoreProto.GetEmaneModelConfigRequest request = CoreProto.GetEmaneModelConfigRequest.newBuilder() CoreProto.GetEmaneModelConfigRequest request = CoreProto.GetEmaneModelConfigRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(id) .setNodeId(id)
.setModel(model) .setModel(model)
.build(); .build();
try { try {
@ -612,8 +616,8 @@ public class CoreGrpcClient implements ICoreClient {
public boolean setEmaneModelConfig(Integer id, String model, List<ConfigOption> options) throws IOException { public boolean setEmaneModelConfig(Integer id, String model, List<ConfigOption> options) throws IOException {
Map<String, String> config = configOptionListToMap(options); Map<String, String> config = configOptionListToMap(options);
CoreProto.SetEmaneModelConfigRequest request = CoreProto.SetEmaneModelConfigRequest.newBuilder() CoreProto.SetEmaneModelConfigRequest request = CoreProto.SetEmaneModelConfigRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(id) .setNodeId(id)
.setModel(model) .setModel(model)
.putAllConfig(config) .putAllConfig(config)
.build(); .build();
@ -633,7 +637,7 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public void saveSession(File file) throws IOException { public void saveSession(File file) throws IOException {
CoreProto.SaveXmlRequest request = CoreProto.SaveXmlRequest.newBuilder() CoreProto.SaveXmlRequest request = CoreProto.SaveXmlRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.build(); .build();
try { try {
CoreProto.SaveXmlResponse response = blockingStub.saveXml(request); CoreProto.SaveXmlResponse response = blockingStub.saveXml(request);
@ -654,7 +658,7 @@ public class CoreGrpcClient implements ICoreClient {
try { try {
CoreProto.OpenXmlResponse response = blockingStub.openXml(request); CoreProto.OpenXmlResponse response = blockingStub.openXml(request);
SessionOverview sessionOverview = new SessionOverview(); SessionOverview sessionOverview = new SessionOverview();
sessionOverview.setId(response.getSession()); sessionOverview.setId(response.getSessionId());
return sessionOverview; return sessionOverview;
} catch (StatusRuntimeException ex) { } catch (StatusRuntimeException ex) {
throw new IOException(ex); throw new IOException(ex);
@ -664,7 +668,7 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public List<ConfigGroup> getSessionConfig() throws IOException { public List<ConfigGroup> getSessionConfig() throws IOException {
CoreProto.GetSessionOptionsRequest request = CoreProto.GetSessionOptionsRequest.newBuilder() CoreProto.GetSessionOptionsRequest request = CoreProto.GetSessionOptionsRequest.newBuilder()
.setId(sessionId) .setSessionId(sessionId)
.build(); .build();
try { try {
CoreProto.GetSessionOptionsResponse response = blockingStub.getSessionOptions(request); CoreProto.GetSessionOptionsResponse response = blockingStub.getSessionOptions(request);
@ -678,7 +682,7 @@ public class CoreGrpcClient implements ICoreClient {
public boolean setSessionConfig(List<ConfigOption> configOptions) throws IOException { public boolean setSessionConfig(List<ConfigOption> configOptions) throws IOException {
Map<String, String> config = configOptionListToMap(configOptions); Map<String, String> config = configOptionListToMap(configOptions);
CoreProto.SetSessionOptionsRequest request = CoreProto.SetSessionOptionsRequest.newBuilder() CoreProto.SetSessionOptionsRequest request = CoreProto.SetSessionOptionsRequest.newBuilder()
.setId(sessionId) .setSessionId(sessionId)
.putAllConfig(config) .putAllConfig(config)
.build(); .build();
try { try {
@ -693,7 +697,7 @@ public class CoreGrpcClient implements ICoreClient {
public boolean createNode(CoreNode node) throws IOException { public boolean createNode(CoreNode node) throws IOException {
CoreProto.Node protoNode = nodeToProto(node); CoreProto.Node protoNode = nodeToProto(node);
CoreProto.AddNodeRequest request = CoreProto.AddNodeRequest.newBuilder() CoreProto.AddNodeRequest request = CoreProto.AddNodeRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setNode(protoNode) .setNode(protoNode)
.build(); .build();
try { try {
@ -717,8 +721,8 @@ public class CoreGrpcClient implements ICoreClient {
.setY(node.getPosition().getY().floatValue()) .setY(node.getPosition().getY().floatValue())
.build(); .build();
CoreProto.EditNodeRequest request = CoreProto.EditNodeRequest.newBuilder() CoreProto.EditNodeRequest request = CoreProto.EditNodeRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.setPosition(position) .setPosition(position)
.build(); .build();
try { try {
@ -746,10 +750,10 @@ public class CoreGrpcClient implements ICoreClient {
CoreProto.Link.Builder builder = CoreProto.Link.newBuilder() CoreProto.Link.Builder builder = CoreProto.Link.newBuilder()
.setTypeValue(link.getType()); .setTypeValue(link.getType());
if (link.getNodeOne() != null) { if (link.getNodeOne() != null) {
builder.setNodeOne(link.getNodeOne()); builder.setNodeOneId(link.getNodeOne());
} }
if (link.getNodeTwo() != null) { if (link.getNodeTwo() != null) {
builder.setNodeTwo(link.getNodeTwo()); builder.setNodeTwoId(link.getNodeTwo());
} }
if (link.getInterfaceOne() != null) { if (link.getInterfaceOne() != null) {
builder.setInterfaceOne(interfaceToProto(link.getInterfaceOne())); builder.setInterfaceOne(interfaceToProto(link.getInterfaceOne()));
@ -762,7 +766,7 @@ public class CoreGrpcClient implements ICoreClient {
} }
CoreProto.Link protoLink = builder.build(); CoreProto.Link protoLink = builder.build();
CoreProto.AddLinkRequest request = CoreProto.AddLinkRequest.newBuilder() CoreProto.AddLinkRequest request = CoreProto.AddLinkRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setLink(protoLink) .setLink(protoLink)
.build(); .build();
try { try {
@ -776,18 +780,18 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean editLink(CoreLink link) throws IOException { public boolean editLink(CoreLink link) throws IOException {
CoreProto.EditLinkRequest.Builder builder = CoreProto.EditLinkRequest.newBuilder() CoreProto.EditLinkRequest.Builder builder = CoreProto.EditLinkRequest.newBuilder()
.setSession(sessionId); .setSessionId(sessionId);
if (link.getNodeOne() != null) { if (link.getNodeOne() != null) {
builder.setNodeOne(link.getNodeOne()); builder.setNodeOneId(link.getNodeOne());
} }
if (link.getNodeTwo() != null) { if (link.getNodeTwo() != null) {
builder.setNodeTwo(link.getNodeTwo()); builder.setNodeTwoId(link.getNodeTwo());
} }
if (link.getInterfaceOne() != null) { if (link.getInterfaceOne() != null) {
builder.setInterfaceOne(link.getInterfaceOne().getId()); builder.setInterfaceOneId(link.getInterfaceOne().getId());
} }
if (link.getInterfaceTwo() != null) { if (link.getInterfaceTwo() != null) {
builder.setInterfaceTwo(link.getInterfaceTwo().getId()); builder.setInterfaceTwoId(link.getInterfaceTwo().getId());
} }
if (link.getOptions() != null) { if (link.getOptions() != null) {
CoreProto.LinkOptions protoOptions = linkOptionsToProto(link.getOptions()); CoreProto.LinkOptions protoOptions = linkOptionsToProto(link.getOptions());
@ -822,7 +826,7 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public List<Hook> getHooks() throws IOException { public List<Hook> getHooks() throws IOException {
CoreProto.GetHooksRequest request = CoreProto.GetHooksRequest.newBuilder().setSession(sessionId).build(); CoreProto.GetHooksRequest request = CoreProto.GetHooksRequest.newBuilder().setSessionId(sessionId).build();
try { try {
CoreProto.GetHooksResponse response = blockingStub.getHooks(request); CoreProto.GetHooksResponse response = blockingStub.getHooks(request);
List<Hook> hooks = new ArrayList<>(); List<Hook> hooks = new ArrayList<>();
@ -842,8 +846,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public WlanConfig getWlanConfig(CoreNode node) throws IOException { public WlanConfig getWlanConfig(CoreNode node) throws IOException {
CoreProto.GetWlanConfigRequest request = CoreProto.GetWlanConfigRequest.newBuilder() CoreProto.GetWlanConfigRequest request = CoreProto.GetWlanConfigRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.build(); .build();
try { try {
CoreProto.GetWlanConfigResponse response = blockingStub.getWlanConfig(request); CoreProto.GetWlanConfigResponse response = blockingStub.getWlanConfig(request);
@ -874,8 +878,8 @@ public class CoreGrpcClient implements ICoreClient {
protoConfig.put("jitter", config.getJitter()); protoConfig.put("jitter", config.getJitter());
protoConfig.put("range", config.getRange()); protoConfig.put("range", config.getRange());
CoreProto.SetWlanConfigRequest request = CoreProto.SetWlanConfigRequest.newBuilder() CoreProto.SetWlanConfigRequest request = CoreProto.SetWlanConfigRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.putAllConfig(protoConfig) .putAllConfig(protoConfig)
.build(); .build();
try { try {
@ -895,7 +899,7 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public Map<Integer, MobilityConfig> getMobilityConfigs() throws IOException { public Map<Integer, MobilityConfig> getMobilityConfigs() throws IOException {
CoreProto.GetMobilityConfigsRequest request = CoreProto.GetMobilityConfigsRequest.newBuilder() CoreProto.GetMobilityConfigsRequest request = CoreProto.GetMobilityConfigsRequest.newBuilder()
.setSession(sessionId).build(); .setSessionId(sessionId).build();
try { try {
CoreProto.GetMobilityConfigsResponse response = blockingStub.getMobilityConfigs(request); CoreProto.GetMobilityConfigsResponse response = blockingStub.getMobilityConfigs(request);
@ -940,8 +944,8 @@ public class CoreGrpcClient implements ICoreClient {
protoConfig.put("script_start", config.getStartScript()); protoConfig.put("script_start", config.getStartScript());
protoConfig.put("script_stop", config.getStopScript()); protoConfig.put("script_stop", config.getStopScript());
CoreProto.SetMobilityConfigRequest request = CoreProto.SetMobilityConfigRequest.newBuilder() CoreProto.SetMobilityConfigRequest request = CoreProto.SetMobilityConfigRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.putAllConfig(protoConfig) .putAllConfig(protoConfig)
.build(); .build();
try { try {
@ -955,8 +959,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public MobilityConfig getMobilityConfig(CoreNode node) throws IOException { public MobilityConfig getMobilityConfig(CoreNode node) throws IOException {
CoreProto.GetMobilityConfigRequest request = CoreProto.GetMobilityConfigRequest.newBuilder() CoreProto.GetMobilityConfigRequest request = CoreProto.GetMobilityConfigRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.build(); .build();
try { try {
CoreProto.GetMobilityConfigResponse response = blockingStub.getMobilityConfig(request); CoreProto.GetMobilityConfigResponse response = blockingStub.getMobilityConfig(request);
@ -984,8 +988,8 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean mobilityAction(CoreNode node, String action) throws IOException { public boolean mobilityAction(CoreNode node, String action) throws IOException {
CoreProto.MobilityActionRequest request = CoreProto.MobilityActionRequest.newBuilder() CoreProto.MobilityActionRequest request = CoreProto.MobilityActionRequest.newBuilder()
.setSession(sessionId) .setSessionId(sessionId)
.setId(node.getId()) .setNodeId(node.getId())
.setAction(CoreProto.MobilityAction.valueOf(action)) .setAction(CoreProto.MobilityAction.valueOf(action))
.build(); .build();
try { try {
@ -999,7 +1003,7 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public LocationConfig getLocationConfig() throws IOException { public LocationConfig getLocationConfig() throws IOException {
CoreProto.GetSessionLocationRequest request = CoreProto.GetSessionLocationRequest.newBuilder() CoreProto.GetSessionLocationRequest request = CoreProto.GetSessionLocationRequest.newBuilder()
.setId(sessionId) .setSessionId(sessionId)
.build(); .build();
try { try {
CoreProto.GetSessionLocationResponse response = blockingStub.getSessionLocation(request); CoreProto.GetSessionLocationResponse response = blockingStub.getSessionLocation(request);
@ -1020,7 +1024,7 @@ public class CoreGrpcClient implements ICoreClient {
@Override @Override
public boolean setLocationConfig(LocationConfig config) throws IOException { public boolean setLocationConfig(LocationConfig config) throws IOException {
CoreProto.SetSessionLocationRequest.Builder builder = CoreProto.SetSessionLocationRequest.newBuilder() CoreProto.SetSessionLocationRequest.Builder builder = CoreProto.SetSessionLocationRequest.newBuilder()
.setId(sessionId); .setSessionId(sessionId);
if (config.getScale() != null) { if (config.getScale() != null) {
builder.setScale(config.getScale().floatValue()); builder.setScale(config.getScale().floatValue());
} }