홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Hyunsun Moon
Committed by Gerrit Code Review
dbd7ffd6 1 parent 8798bbe6

Allow cordvtn to work without XOS for now 

Change-Id: I6c9bb199879ecdb0b68538475135cac424136ab3
Inline Side-by-side
Showing 2 changed files with 4 additions and 2 deletions
...@@ -193,7 +193,6 @@ public class CordVtnConfig extends Config<ApplicationId> { ...@@ -193,7 +193,6 @@ public class CordVtnConfig extends Config<ApplicationId> {
193 public XosAccess xosAccess() { 193 public XosAccess xosAccess() {
194 JsonNode jsonNode = object.get(XOS); 194 JsonNode jsonNode = object.get(XOS);
195 if (jsonNode == null) { 195 if (jsonNode == null) {
196 - log.error("Failed to get XOS configurations");
197 return null; 196 return null;
198 } 197 }
199 198
......
...@@ -779,7 +779,10 @@ public class CordVtn extends AbstractProvider implements CordVtnService, HostPro ...@@ -779,7 +779,10 @@ public class CordVtn extends AbstractProvider implements CordVtnService, HostPro
779 * @param xosAccess xos access 779 * @param xosAccess xos access
780 */ 780 */
781 private void setXosAccess(XosAccess xosAccess) { 781 private void setXosAccess(XosAccess xosAccess) {
782 - checkNotNull(xosAccess, "XOS access is not configured"); 782 + if (xosAccess == null) {
783 + log.warn("XOS access is not configured");
784 + return;
785 + }
783 786
784 log.debug("Set XOS access with Endpoint: {} User: {} Passwd: {}", 787 log.debug("Set XOS access with Endpoint: {} User: {} Passwd: {}",
785 xosAccess.endpoint(), 788 xosAccess.endpoint(),
......