| commit | dbd7ffd662733e92ec0fbfcbcdc1611fdba13dfd | [log] [tgz] |
|---|---|---|
| author | Hyunsun Moon <hyunsun.moon@gmail.com> | Wed May 04 16:51:34 2016 -0700 |
| committer | Gerrit Code Review <gerrit@onlab.us> | Thu May 05 16:24:32 2016 +0000 |
| tree | af7a364891551bddac296e7178689debd74a056e | |
| parent | 8798bbe63339ad4985fea8b3f9687511f6facc04 [diff] |
Allow cordvtn to work without XOS for now Change-Id: I6c9bb199879ecdb0b68538475135cac424136ab3
diff --git a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java index 9f3a279..2055e34 100644 --- a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java +++ b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/api/CordVtnConfig.java
@@ -193,7 +193,6 @@ public XosAccess xosAccess() { JsonNode jsonNode = object.get(XOS); if (jsonNode == null) { - log.error("Failed to get XOS configurations"); return null; }
diff --git a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/impl/CordVtn.java b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/impl/CordVtn.java index 0a7b77d..f816cf9 100644 --- a/apps/cordvtn/src/main/java/org/onosproject/cordvtn/impl/CordVtn.java +++ b/apps/cordvtn/src/main/java/org/onosproject/cordvtn/impl/CordVtn.java
@@ -779,7 +779,10 @@ * @param xosAccess xos access */ private void setXosAccess(XosAccess xosAccess) { - checkNotNull(xosAccess, "XOS access is not configured"); + if (xosAccess == null) { + log.warn("XOS access is not configured"); + return; + } log.debug("Set XOS access with Endpoint: {} User: {} Passwd: {}", xosAccess.endpoint(),