X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?p=controller.git;a=blobdiff_plain;f=opendaylight%2Fmd-sal%2Fsal-netconf-connector%2Fsrc%2Fmain%2Fjava%2Forg%2Fopendaylight%2Fcontroller%2Fsal%2Fconnect%2Fnetconf%2FInventoryUtils.java;h=5c6702ae640f66d412aae775e80d044f84d08df5;hp=8350e39c210e1eb4c6a97f280eb16005521dc3c1;hb=405ea7ce68d22bd3d2501857c5253793b581b086;hpb=a5df932662bbaec4caeee5478d3003615ed3566b diff --git a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/InventoryUtils.java b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/InventoryUtils.java index 8350e39c21..5c6702ae64 100644 --- a/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/InventoryUtils.java +++ b/opendaylight/md-sal/sal-netconf-connector/src/main/java/org/opendaylight/controller/sal/connect/netconf/InventoryUtils.java @@ -1,9 +1,15 @@ +/* + * Copyright (c) 2014 Cisco Systems, Inc. and others. All rights reserved. + * + * This program and the accompanying materials are made available under the + * terms of the Eclipse Public License v1.0 which accompanies this distribution, + * and is available at http://www.eclipse.org/legal/epl-v10.html + */ package org.opendaylight.controller.sal.connect.netconf; import java.net.URI; import java.text.ParseException; import java.text.SimpleDateFormat; -import java.util.Calendar; import java.util.Date; import org.opendaylight.yangtools.yang.common.QName; @@ -12,28 +18,33 @@ import org.opendaylight.yangtools.yang.data.api.InstanceIdentifier; public class InventoryUtils { private static final URI INVENTORY_NAMESPACE = URI.create("urn:opendaylight:inventory"); - private static final Date INVENTORY_REVISION = date(); + private static final URI NETCONF_INVENTORY_NAMESPACE = URI.create("urn:opendaylight:netconf-node-inventory"); + private static final Date INVENTORY_REVISION = dateFromString("2013-08-19"); + private static final Date NETCONF_INVENTORY_REVISION = dateFromString("2014-01-08"); public static final QName INVENTORY_NODES = new QName(INVENTORY_NAMESPACE, INVENTORY_REVISION, "nodes"); public static final QName INVENTORY_NODE = new QName(INVENTORY_NAMESPACE, INVENTORY_REVISION, "node"); public static final QName INVENTORY_ID = new QName(INVENTORY_NAMESPACE, INVENTORY_REVISION, "id"); + public static final QName INVENTORY_CONNECTED = new QName(NETCONF_INVENTORY_NAMESPACE, NETCONF_INVENTORY_REVISION, + "connected"); + public static final QName NETCONF_INVENTORY_INITIAL_CAPABILITY = new QName(NETCONF_INVENTORY_NAMESPACE, + NETCONF_INVENTORY_REVISION, "initial-capability"); public static final InstanceIdentifier INVENTORY_PATH = InstanceIdentifier.builder().node(INVENTORY_NODES) .toInstance(); public static final QName NETCONF_INVENTORY_MOUNT = null; - - - - private static Date date() { + + /** + * Converts date in string format yyyy-MM-dd to java.util.Date. + * + * @return java.util.Date conformant to string formatted date yyyy-MM-dd. + */ + private static Date dateFromString(final String date) { SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd"); try { - return formatter.parse("2013-08-19"); + return formatter.parse(date); } catch (ParseException e) { - // TODO Auto-generated catch block e.printStackTrace(); } return null; } - - - }