summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
e67348a)
Change-Id: I72eead5325882b63960cdb877477f2ca3d0a6f63
Issue-ID: VFC-884
Signed-off-by: LiZi <li.zi30@zte.com.cn>
# connector:
# type: http
# port: 8080
# connector:
# type: http
# port: 8080
# Update MSB config
sed -i "s|msbServiceUrl:.*|msbServiceUrl: http://$MSB_ADDR|" conf/console.yml
# Update MSB config
sed -i "s|msbServiceUrl:.*|msbServiceUrl: http://$MSB_ADDR|" conf/console.yml
+sed -i "s|serviceIp:.*|serviceIp: $SERVICE_IP|" conf/console.yml
@NotEmpty
private String msbServiceUrl;
@NotEmpty
private String msbServiceUrl;
+
+ @NotEmpty
+ private String serviceIp;
@JsonProperty
public String getTemplate() {
@JsonProperty
public String getTemplate() {
public void setMsbServiceUrl(String msbServiceUrl) {
this.msbServiceUrl = msbServiceUrl;
}
public void setMsbServiceUrl(String msbServiceUrl) {
this.msbServiceUrl = msbServiceUrl;
}
+
+ @JsonProperty
+ public String getServiceIp() {
+ return serviceIp;
+ }
+
+ @JsonProperty
+ public void setServiceIp(String serviceIp) {
+ this.serviceIp = serviceIp;
+ }
}
\ No newline at end of file
}
\ No newline at end of file
import org.onap.sfc.entity.MsbRegisterEntity;
import org.onap.sfc.entity.NodeEntity;
import org.onap.sfc.entity.portpair.ServiceFunctionParameter;
import org.onap.sfc.entity.MsbRegisterEntity;
import org.onap.sfc.entity.NodeEntity;
import org.onap.sfc.entity.portpair.ServiceFunctionParameter;
+import org.onap.sfc.service.ConfigInfo;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
import java.net.InetAddress;
import java.net.UnknownHostException;
import java.util.ArrayList;
entity.setVisualRange("1");
ArrayList<NodeEntity> nodes = new ArrayList<NodeEntity>();
NodeEntity node = new NodeEntity();
entity.setVisualRange("1");
ArrayList<NodeEntity> nodes = new ArrayList<NodeEntity>();
NodeEntity node = new NodeEntity();
- node.setIp(getLocalIp());
+ node.setIp(ConfigInfo.getConfig().getServiceIp());
node.setPort("8411");
node.setTtl("1");
nodes.add(node);
node.setPort("8411");
node.setTtl("1");
nodes.add(node);
package org.onap.sfc;
import org.junit.Before;
package org.onap.sfc;
import org.junit.Before;
+import org.junit.Ignore;
import org.junit.Test;
import org.onap.sfc.entity.MsbRegisterEntity;
import org.onap.sfc.utils.SfcDriverUtil;
public class TestMsbRegister {
import org.junit.Test;
import org.onap.sfc.entity.MsbRegisterEntity;
import org.onap.sfc.utils.SfcDriverUtil;
public class TestMsbRegister {
@Test
public void test_registerMsb()
{
@Test
public void test_registerMsb()
{