Accepting request 576274 from Base:System

- Add NetApp vendor plugin (bsc#1080672) 
  + 0001-nvme-cli-add-NetApp-plugin.patch
  + 0002-nvme-cli-add-netapp-smdevices-man-page.patch (forwarded request 576273 from morbidrsa)

OBS-URL: https://build.opensuse.org/request/show/576274
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nvme-cli?expand=0&rev=23

0001-nvme-cli-add-NetApp-plugin.patch

@@ -0,0 +1,345 @@
+From: "Schremmer, Steven" <Steve.Schremmer@netapp.com>
+Date: Mon, 12 Feb 2018 19:27:32 +0000
+Subject: [PATCH nvme-cli 1/2] nvme-cli: add NetApp plugin
+Git-commit: 396677894203bedbe9d037b20d9197361899fa03 
+References: bsc#1080672
+
+Add smdevices command for NetApp E-Series devices.
+
+Signed-off-by: Steve Schremmer <steve.schremmer@netapp.com>
+---
+ Makefile      |    3 
+ netapp-nvme.c |  293 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+ netapp-nvme.h |   17 +++
+ 3 files changed, 312 insertions(+), 1 deletion(-)
+ create mode 100644 netapp-nvme.c
+ create mode 100644 netapp-nvme.h
+
+--- a/Makefile
++++ b/Makefile
+@@ -33,7 +33,8 @@ NVME_DPKG_VERSION=1~`lsb_release -sc`
+ 
+ OBJS := argconfig.o suffix.o parser.o nvme-print.o nvme-ioctl.o \
+ 	nvme-lightnvm.o fabrics.o json.o plugin.o intel-nvme.o \
+-	lnvm-nvme.o memblaze-nvme.o wdc-nvme.o nvme-models.o huawei-nvme.o
++	lnvm-nvme.o memblaze-nvme.o wdc-nvme.o nvme-models.o huawei-nvme.o \
++	netapp-nvme.o
+ 
+ nvme: nvme.c nvme.h $(OBJS) NVME-VERSION-FILE
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) nvme.c -o $(NVME) $(OBJS) $(LDFLAGS)
+--- /dev/null
++++ b/netapp-nvme.c
+@@ -0,0 +1,293 @@
++/*
++* Copyright (c) 2018 NetApp, Inc.
++*
++* This program is free software; you can redistribute it and/or
++* modify it under the terms of the GNU General Public License
++* as published by the Free Software Foundation; either version 2
++* of the License, or (at your option) any later version.
++*
++* This program is distributed in the hope that it will be useful,
++* but WITHOUT ANY WARRANTY; without even the implied warranty of
++* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++* GNU General Public License for more details.
++*
++*/
++
++#include <stdio.h>
++#include <dirent.h>
++#include <sys/stat.h>
++#include <stdlib.h>
++#include <fcntl.h>
++#include <unistd.h>
++#include <errno.h>
++#include <string.h>
++
++#include "nvme.h"
++#include "nvme-ioctl.h"
++#include "json.h"
++
++#include "suffix.h"
++
++#define CREATE_CMD
++#include "netapp-nvme.h"
++
++enum {
++	NNORMAL,
++	NJSON,
++	NCOLUMN,
++};
++
++static const char *dev_path = "/dev/";
++
++struct smdevice_info {
++	int			nsid;
++	struct nvme_id_ctrl	ctrl;
++	struct nvme_id_ns	ns;
++	char			dev[265];
++};
++
++#define ARRAY_LABEL_LEN		60
++#define VOLUME_LABEL_LEN	60
++
++/*
++ * Format of the string isn't tightly controlled yet. For now, squash UCS-2 into
++ * ASCII. dst buffer must be at least count + 1 bytes long
++ */
++static void netapp_convert_string(char *dst, char *src, unsigned int count)
++{
++	int i;
++
++	if (!dst || !src || !count)
++		return;
++
++	memset(dst, 0, count + 1);
++	for (i = 0; i < count; i++)
++		dst[i] = src[i * 2 + 1];
++}
++
++static void netapp_nguid_to_str(char *str, __u8 *nguid)
++{
++	int i;
++
++	memset(str, 0, 33);
++	for (i = 0; i < 16; i++)
++		str += sprintf(str, "%02x", nguid[i]);
++}
++
++static void netapp_smdevice_json(struct json_array *devices, char *devname,
++		char *arrayname, char *volname, int nsid, char *nguid,
++		char *ctrl, char *astate, char *size, long long lba,
++		long long nsze)
++{
++	struct json_object *device_attrs;
++
++	device_attrs = json_create_object();
++	json_object_add_value_string(device_attrs, "Device", devname);
++	json_object_add_value_string(device_attrs, "Array_Name", arrayname);
++	json_object_add_value_string(device_attrs, "Volume_Name", volname);
++	json_object_add_value_int(device_attrs, "NSID", nsid);
++	json_object_add_value_string(device_attrs, "Volume_ID", nguid);
++	json_object_add_value_string(device_attrs, "Controller", ctrl);
++	json_object_add_value_string(device_attrs, "Access_State", astate);
++	json_object_add_value_string(device_attrs, "Size", size);
++	json_object_add_value_int(device_attrs, "LBA_Data_Size", lba);
++	json_object_add_value_int(device_attrs, "Namespace_Size", nsze);
++
++	json_array_add_value_object(devices, device_attrs);
++}
++
++static void netapp_smdevices_print(struct smdevice_info *devices, int count, int format)
++{
++	struct json_object *root = NULL;
++	struct json_array *json_devices = NULL;
++	int i, slta;
++	char array_label[ARRAY_LABEL_LEN / 2 + 1];
++	char volume_label[VOLUME_LABEL_LEN / 2 + 1];
++	char nguid_str[33];
++	char basestr[] = "%s, Array Name %s, Volume Name %s, NSID %d, "
++			"Volume ID %s, Controller %c, Access State %s, %s\n";
++	char columnstr[] = "%-16s %-30s %-30s %4d %32s  %c   %-12s %9s\n";
++	char *formatstr = basestr; // default to "normal" output format
++
++	if (format == NCOLUMN) {
++		/* for column output, change output string and print column headers */
++		formatstr = columnstr;
++		printf("%-16s %-30s %-30s %-4s %-32s %-4s %-12s %-9s\n",
++			"Device", "Array Name", "Volume Name", "NSID",
++			"Volume ID", "Ctrl", "Access State", " Size");
++		printf("%-16s %-30s %-30s %-4s %-32s %-4s %-12s %-9s\n",
++			"----------------", "------------------------------",
++			"------------------------------", "----",
++			"--------------------------------", "----",
++			"------------", "---------");
++	}
++	else if (format == NJSON) {
++		/* prepare for json output */
++		root = json_create_object();
++		json_devices = json_create_array();
++	}
++
++	for (i = 0; i < count; i++) {
++		long long int lba = 1 << devices[i].ns.lbaf[(devices[i].ns.flbas & 0x0F)].ds;
++		double nsze = le64_to_cpu(devices[i].ns.nsze) * lba;
++		const char *s_suffix = suffix_si_get(&nsze);
++		char size[128];
++
++		sprintf(size, "%.2f%sB", nsze, s_suffix);
++		netapp_convert_string(array_label, (char *)&devices[i].ctrl.vs[20],
++					ARRAY_LABEL_LEN / 2);
++		slta = devices[i].ctrl.vs[0] & 0x1;
++		netapp_convert_string(volume_label, (char *)devices[i].ns.vs,
++					VOLUME_LABEL_LEN / 2);
++		netapp_nguid_to_str(nguid_str, devices[i].ns.nguid);
++		if (format == NJSON)
++			netapp_smdevice_json(json_devices, devices[i].dev,
++				array_label, volume_label, devices[i].nsid,
++				nguid_str, slta ? "A" : "B", "unknown", size,
++				lba, le64_to_cpu(devices[i].ns.nsze));
++		else
++			printf(formatstr, devices[i].dev, array_label,
++				volume_label, devices[i].nsid, nguid_str,
++				slta ? 'A' : 'B', "unknown", size);
++	}
++
++	if (format == NJSON) {
++		/* complete the json output */
++		json_object_add_value_array(root, "SMdevices", json_devices);
++		json_print_object(root, NULL);
++	}
++}
++
++static int netapp_smdevices_get_info(int fd, struct smdevice_info *item,
++				     const char *dev)
++{
++	int err;
++
++	err = nvme_identify_ctrl(fd, &item->ctrl);
++	if (err) {
++		fprintf(stderr, "Identify Controler failed to %s (%s)\n", dev,
++			strerror(err));
++		return 0;
++	}
++
++	if (strncmp("NetApp E-Series", item->ctrl.mn, 15) != 0)
++		return 0; // not the right model of controller
++
++	item->nsid = nvme_get_nsid(fd);
++	err = nvme_identify_ns(fd, item->nsid, 0, &item->ns);
++	if (err) {
++		fprintf(stderr, "Unable to identify namespace for %s (%s)\n",
++			dev, strerror(err));
++		return 0;
++	}
++	strncpy(item->dev, dev, sizeof(item->dev));
++
++	return 1;
++}
++
++static int netapp_nvme_filter(const struct dirent *d)
++{
++	char path[264];
++	struct stat bd;
++	int ctrl, ns, partition;
++
++	if (d->d_name[0] == '.')
++		return 0;
++
++	if (strstr(d->d_name, "nvme")) {
++		snprintf(path, sizeof(path), "%s%s", dev_path, d->d_name);
++		if (stat(path, &bd))
++			return 0;
++		if (!S_ISBLK(bd.st_mode))
++			return 0;
++		if (sscanf(d->d_name, "nvme%dn%d", &ctrl, &ns) != 2)
++			return 0;
++		if (sscanf(d->d_name, "nvme%dn%dp%d", &ctrl, &ns, &partition) == 3)
++			return 0;
++		return 1;
++	}
++	return 0;
++}
++
++static int netapp_output_format(char *format)
++{
++	if (!format)
++		return -EINVAL;
++	if (!strcmp(format, "normal"))
++		return NNORMAL;
++	if (!strcmp(format, "json"))
++		return NJSON;
++	if (!strcmp(format, "column"))
++		return NCOLUMN;
++	return -EINVAL;
++}
++
++/* handler for 'nvme netapp smdevices' */
++static int netapp_smdevices(int argc, char **argv, struct command *command,
++		struct plugin *plugin)
++{
++	const char *desc = "Display information about E-Series volumes.";
++	struct config {
++		char *output_format;
++	};
++	struct config cfg = {
++		.output_format = "normal",
++	};
++	struct dirent **devices;
++	int num, i, fd, ret, fmt;
++	struct smdevice_info *smdevices;
++	char path[264];
++	int num_smdevices = 0;
++
++	const struct argconfig_commandline_options opts[] = {
++		{"output-format", 'o', "FMT", CFG_STRING, &cfg.output_format,
++			required_argument, "Output Format: normal|json|column"},
++		{NULL}
++	};
++
++	ret = argconfig_parse(argc, argv, desc, opts, &cfg, sizeof(cfg));
++	if (ret < 0)
++		return ret;
++
++	fmt = netapp_output_format(cfg.output_format);
++	if (fmt != NNORMAL && fmt != NCOLUMN && fmt != NJSON) {
++		fprintf(stderr, "Unrecognized output format: %s\n", cfg.output_format);
++		return -EINVAL;
++	}
++
++	num = scandir(dev_path, &devices, netapp_nvme_filter, alphasort);
++	if (num <= 0) {
++		fprintf(stderr, "No NVMe devices detected.\n");
++		return num;
++	}
++
++	smdevices = calloc(num, sizeof(*smdevices));
++	if (!smdevices) {
++		fprintf(stderr, "Unable to allocate memory for devices.\n");
++		return ENOMEM;
++	}
++
++	for (i = 0; i < num; i++) {
++		snprintf(path, sizeof(path), "%s%s", dev_path,
++			devices[i]->d_name);
++		fd = open(path, O_RDONLY);
++		if (fd < 0) {
++			fprintf(stderr, "Unable to open %s: %s\n", path,
++				strerror(errno));
++			continue;
++		}
++
++		num_smdevices += netapp_smdevices_get_info(fd,
++						&smdevices[num_smdevices], path);
++		close(fd);
++	}
++
++	if (num_smdevices)
++		netapp_smdevices_print(smdevices, num_smdevices, fmt);
++
++	for (i = 0; i < num; i++)
++		free(devices[i]);
++	free(devices);
++	free(smdevices);
++	return 0;
++}
+--- /dev/null
++++ b/netapp-nvme.h
+@@ -0,0 +1,17 @@
++#undef CMD_INC_FILE
++#define CMD_INC_FILE netapp-nvme
++
++#if !defined(NETAPP_NVME) || defined(CMD_HEADER_MULTI_READ)
++#define NETAPP_NVME
++
++#include "cmd.h"
++
++PLUGIN(NAME("netapp", "NetApp vendor specific extensions"),
++	COMMAND_LIST(
++		ENTRY("smdevices", "NetApp SMdevices", netapp_smdevices)
++	)
++);
++
++#endif
++
++#include "define_cmd.h"

0002-nvme-cli-add-netapp-smdevices-man-page.patch

@@ -0,0 +1,989 @@
+From: "Schremmer, Steven" <Steve.Schremmer@netapp.com>
+Date: Mon, 12 Feb 2018 19:31:11 +0000
+Subject: [PATCH nvme-cli 2/2] nvme-cli: add netapp smdevices man page
+Git-commit: b1ce32f117b14b93699c4c38716007c856de647e 
+References: bsc#1080672
+
+Signed-off-by: Steve Schremmer <steve.schremmer@netapp.com>
+---
+ Documentation/nvme-netapp-smdevices.1    |  99 ++++
+ Documentation/nvme-netapp-smdevices.html | 816 +++++++++++++++++++++++++++++++
+ Documentation/nvme-netapp-smdevices.txt  |  37 ++
+ 3 files changed, 952 insertions(+)
+ create mode 100644 Documentation/nvme-netapp-smdevices.1
+ create mode 100644 Documentation/nvme-netapp-smdevices.html
+ create mode 100644 Documentation/nvme-netapp-smdevices.txt
+
+diff --git a/Documentation/nvme-netapp-smdevices.1 b/Documentation/nvme-netapp-smdevices.1
+new file mode 100644
+index 000000000000..fc98ed5ee473
+--- /dev/null
++++ b/Documentation/nvme-netapp-smdevices.1
+@@ -0,0 +1,99 @@
++'\" t
++.\"     Title: nvme-netapp-smdevices
++.\"    Author: [FIXME: author] [see http://www.docbook.org/tdg5/en/html/author]
++.\" Generator: DocBook XSL Stylesheets v1.79.2 <http://docbook.sf.net/>
++.\"      Date: 02/07/2018
++.\"    Manual: NVMe Manual
++.\"    Source: NVMe
++.\"  Language: English
++.\"
++.TH "NVME\-NETAPP\-SMDEVI" "1" "02/07/2018" "NVMe" "NVMe Manual"
++.\" -----------------------------------------------------------------
++.\" * Define some portability stuff
++.\" -----------------------------------------------------------------
++.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++.\" http://bugs.debian.org/507673
++.\" http://lists.gnu.org/archive/html/groff/2009-02/msg00013.html
++.\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
++.ie \n(.g .ds Aq \(aq
++.el       .ds Aq '
++.\" -----------------------------------------------------------------
++.\" * set default formatting
++.\" -----------------------------------------------------------------
++.\" disable hyphenation
++.nh
++.\" disable justification (adjust text to left margin only)
++.ad l
++.\" -----------------------------------------------------------------
++.\" * MAIN CONTENT STARTS HERE *
++.\" -----------------------------------------------------------------
++
++.SH "NAME"
++nvme-netapp-smdevices \- Display information for each NVMe path to an E\-Series volume
++.SH "SYNOPSIS"
++
++
++.sp
++.nf
++\fInvme netapp smdevices\fR [\-o <fmt> | \-\-output\-format=<fmt>]
++.fi
++.sp
++
++
++.SH "DESCRIPTION"
++
++.sp
++Display vendor\-specific information for each NVMe path to an E\-Series namespace currently connnected to the host\&. The E\-Series paths are identified from the NVMe nodes in /dev by sending an Identify Controller\&.
++
++.SH "OPTIONS"
++
++
++
++.PP
++\-o <fmt>, \-\-output\-format=<fmt>
++.RS 4
++
++
++
++
++Set the reporting format to
++\fInormal\fR
++(default),
++\fIcolumn\fR, or
++\fIjson\fR\&. Only one output format can be used at a time\&.
++
++.RE
++
++.SH "EXAMPLES"
++
++
++.sp
++.RS 4
++.ie n \{\
++\h'-04'\(bu\h'+03'\c
++.\}
++.el \{\
++.sp -1
++.IP \(bu 2.3
++.\}
++
++Display information, in a column\-based format, for each path to an E\-Series namespace\&.
++
++.sp
++.if n \{\
++.RS 4
++.\}
++.nf
++# nvme netapp smdevices \-o column
++.fi
++.if n \{\
++.RE
++.\}
++.sp
++.RE
++.SH "NVME"
++
++.sp
++Part of the nvme\-user suite
++
++
+diff --git a/Documentation/nvme-netapp-smdevices.html b/Documentation/nvme-netapp-smdevices.html
+new file mode 100644
+index 000000000000..687affb1542f
+--- /dev/null
++++ b/Documentation/nvme-netapp-smdevices.html
+@@ -0,0 +1,816 @@
++<?xml version="1.0" encoding="UTF-8"?>
++<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
++    "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
++<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
++<head>
++<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
++<meta name="generator" content="AsciiDoc" />
++<title>nvme-netapp-smdevices(1)</title>
++<style type="text/css">
++/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
++
++/* Default font. */
++body {
++  font-family: Georgia,serif;
++}
++
++/* Title font. */
++h1, h2, h3, h4, h5, h6,
++div.title, caption.title,
++thead, p.table.header,
++#toctitle,
++#author, #revnumber, #revdate, #revremark,
++#footer {
++  font-family: Arial,Helvetica,sans-serif;
++}
++
++body {
++  margin: 1em 5% 1em 5%;
++}
++
++a {
++  color: blue;
++  text-decoration: underline;
++}
++a:visited {
++  color: fuchsia;
++}
++
++em {
++  font-style: italic;
++  color: navy;
++}
++
++strong {
++  font-weight: bold;
++  color: #083194;
++}
++
++h1, h2, h3, h4, h5, h6 {
++  color: #527bbd;
++  margin-top: 1.2em;
++  margin-bottom: 0.5em;
++  line-height: 1.3;
++}
++
++h1, h2, h3 {
++  border-bottom: 2px solid silver;
++}
++h2 {
++  padding-top: 0.5em;
++}
++h3 {
++  float: left;
++}
++h3 + * {
++  clear: left;
++}
++h5 {
++  font-size: 1.0em;
++}
++
++div.sectionbody {
++  margin-left: 0;
++}
++
++hr {
++  border: 1px solid silver;
++}
++
++p {
++  margin-top: 0.5em;
++  margin-bottom: 0.5em;
++}
++
++ul, ol, li > p {
++  margin-top: 0;
++}
++ul > li     { color: #aaa; }
++ul > li > * { color: black; }
++
++.monospaced, code, pre {
++  font-family: "Courier New", Courier, monospace;
++  font-size: inherit;
++  color: navy;
++  padding: 0;
++  margin: 0;
++}
++pre {
++  white-space: pre-wrap;
++}
++
++#author {
++  color: #527bbd;
++  font-weight: bold;
++  font-size: 1.1em;
++}
++#email {
++}
++#revnumber, #revdate, #revremark {
++}
++
++#footer {
++  font-size: small;
++  border-top: 2px solid silver;
++  padding-top: 0.5em;
++  margin-top: 4.0em;
++}
++#footer-text {
++  float: left;
++  padding-bottom: 0.5em;
++}
++#footer-badges {
++  float: right;
++  padding-bottom: 0.5em;
++}
++
++#preamble {
++  margin-top: 1.5em;
++  margin-bottom: 1.5em;
++}
++div.imageblock, div.exampleblock, div.verseblock,
++div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
++div.admonitionblock {
++  margin-top: 1.0em;
++  margin-bottom: 1.5em;
++}
++div.admonitionblock {
++  margin-top: 2.0em;
++  margin-bottom: 2.0em;
++  margin-right: 10%;
++  color: #606060;
++}
++
++div.content { /* Block element content. */
++  padding: 0;
++}
++
++/* Block element titles. */
++div.title, caption.title {
++  color: #527bbd;
++  font-weight: bold;
++  text-align: left;
++  margin-top: 1.0em;
++  margin-bottom: 0.5em;
++}
++div.title + * {
++  margin-top: 0;
++}
++
++td div.title:first-child {
++  margin-top: 0.0em;
++}
++div.content div.title:first-child {
++  margin-top: 0.0em;
++}
++div.content + div.title {
++  margin-top: 0.0em;
++}
++
++div.sidebarblock > div.content {
++  background: #ffffee;
++  border: 1px solid #dddddd;
++  border-left: 4px solid #f0f0f0;
++  padding: 0.5em;
++}
++
++div.listingblock > div.content {
++  border: 1px solid #dddddd;
++  border-left: 5px solid #f0f0f0;
++  background: #f8f8f8;
++  padding: 0.5em;
++}
++
++div.quoteblock, div.verseblock {
++  padding-left: 1.0em;
++  margin-left: 1.0em;
++  margin-right: 10%;
++  border-left: 5px solid #f0f0f0;
++  color: #888;
++}
++
++div.quoteblock > div.attribution {
++  padding-top: 0.5em;
++  text-align: right;
++}
++
++div.verseblock > pre.content {
++  font-family: inherit;
++  font-size: inherit;
++}
++div.verseblock > div.attribution {
++  padding-top: 0.75em;
++  text-align: left;
++}
++/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
++div.verseblock + div.attribution {
++  text-align: left;
++}
++
++div.admonitionblock .icon {
++  vertical-align: top;
++  font-size: 1.1em;
++  font-weight: bold;
++  text-decoration: underline;
++  color: #527bbd;
++  padding-right: 0.5em;
++}
++div.admonitionblock td.content {
++  padding-left: 0.5em;
++  border-left: 3px solid #dddddd;
++}
++
++div.exampleblock > div.content {
++  border-left: 3px solid #dddddd;
++  padding-left: 0.5em;
++}
++
++div.imageblock div.content { padding-left: 0; }
++span.image img { border-style: none; vertical-align: text-bottom; }
++a.image:visited { color: white; }
++
++dl {
++  margin-top: 0.8em;
++  margin-bottom: 0.8em;
++}
++dt {
++  margin-top: 0.5em;
++  margin-bottom: 0;
++  font-style: normal;
++  color: navy;
++}
++dd > *:first-child {
++  margin-top: 0.1em;
++}
++
++ul, ol {
++    list-style-position: outside;
++}
++ol.arabic {
++  list-style-type: decimal;
++}
++ol.loweralpha {
++  list-style-type: lower-alpha;
++}
++ol.upperalpha {
++  list-style-type: upper-alpha;
++}
++ol.lowerroman {
++  list-style-type: lower-roman;
++}
++ol.upperroman {
++  list-style-type: upper-roman;
++}
++
++div.compact ul, div.compact ol,
++div.compact p, div.compact p,
++div.compact div, div.compact div {
++  margin-top: 0.1em;
++  margin-bottom: 0.1em;
++}
++
++tfoot {
++  font-weight: bold;
++}
++td > div.verse {
++  white-space: pre;
++}
++
++div.hdlist {
++  margin-top: 0.8em;
++  margin-bottom: 0.8em;
++}
++div.hdlist tr {
++  padding-bottom: 15px;
++}
++dt.hdlist1.strong, td.hdlist1.strong {
++  font-weight: bold;
++}
++td.hdlist1 {
++  vertical-align: top;
++  font-style: normal;
++  padding-right: 0.8em;
++  color: navy;
++}
++td.hdlist2 {
++  vertical-align: top;
++}
++div.hdlist.compact tr {
++  margin: 0;
++  padding-bottom: 0;
++}
++
++.comment {
++  background: yellow;
++}
++
++.footnote, .footnoteref {
++  font-size: 0.8em;
++}
++
++span.footnote, span.footnoteref {
++  vertical-align: super;
++}
++
++#footnotes {
++  margin: 20px 0 20px 0;
++  padding: 7px 0 0 0;
++}
++
++#footnotes div.footnote {
++  margin: 0 0 5px 0;
++}
++
++#footnotes hr {
++  border: none;
++  border-top: 1px solid silver;
++  height: 1px;
++  text-align: left;
++  margin-left: 0;
++  width: 20%;
++  min-width: 100px;
++}
++
++div.colist td {
++  padding-right: 0.5em;
++  padding-bottom: 0.3em;
++  vertical-align: top;
++}
++div.colist td img {
++  margin-top: 0.3em;
++}
++
++@media print {
++  #footer-badges { display: none; }
++}
++
++#toc {
++  margin-bottom: 2.5em;
++}
++
++#toctitle {
++  color: #527bbd;
++  font-size: 1.1em;
++  font-weight: bold;
++  margin-top: 1.0em;
++  margin-bottom: 0.1em;
++}
++
++div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
++  margin-top: 0;
++  margin-bottom: 0;
++}
++div.toclevel2 {
++  margin-left: 2em;
++  font-size: 0.9em;
++}
++div.toclevel3 {
++  margin-left: 4em;
++  font-size: 0.9em;
++}
++div.toclevel4 {
++  margin-left: 6em;
++  font-size: 0.9em;
++}
++
++span.aqua { color: aqua; }
++span.black { color: black; }
++span.blue { color: blue; }
++span.fuchsia { color: fuchsia; }
++span.gray { color: gray; }
++span.green { color: green; }
++span.lime { color: lime; }
++span.maroon { color: maroon; }
++span.navy { color: navy; }
++span.olive { color: olive; }
++span.purple { color: purple; }
++span.red { color: red; }
++span.silver { color: silver; }
++span.teal { color: teal; }
++span.white { color: white; }
++span.yellow { color: yellow; }
++
++span.aqua-background { background: aqua; }
++span.black-background { background: black; }
++span.blue-background { background: blue; }
++span.fuchsia-background { background: fuchsia; }
++span.gray-background { background: gray; }
++span.green-background { background: green; }
++span.lime-background { background: lime; }
++span.maroon-background { background: maroon; }
++span.navy-background { background: navy; }
++span.olive-background { background: olive; }
++span.purple-background { background: purple; }
++span.red-background { background: red; }
++span.silver-background { background: silver; }
++span.teal-background { background: teal; }
++span.white-background { background: white; }
++span.yellow-background { background: yellow; }
++
++span.big { font-size: 2em; }
++span.small { font-size: 0.6em; }
++
++span.underline { text-decoration: underline; }
++span.overline { text-decoration: overline; }
++span.line-through { text-decoration: line-through; }
++
++div.unbreakable { page-break-inside: avoid; }
++
++
++/*
++ * xhtml11 specific
++ *
++ * */
++
++div.tableblock {
++  margin-top: 1.0em;
++  margin-bottom: 1.5em;
++}
++div.tableblock > table {
++  border: 3px solid #527bbd;
++}
++thead, p.table.header {
++  font-weight: bold;
++  color: #527bbd;
++}
++p.table {
++  margin-top: 0;
++}
++/* Because the table frame attribute is overriden by CSS in most browsers. */
++div.tableblock > table[frame="void"] {
++  border-style: none;
++}
++div.tableblock > table[frame="hsides"] {
++  border-left-style: none;
++  border-right-style: none;
++}
++div.tableblock > table[frame="vsides"] {
++  border-top-style: none;
++  border-bottom-style: none;
++}
++
++
++/*
++ * html5 specific
++ *
++ * */
++
++table.tableblock {
++  margin-top: 1.0em;
++  margin-bottom: 1.5em;
++}
++thead, p.tableblock.header {
++  font-weight: bold;
++  color: #527bbd;
++}
++p.tableblock {
++  margin-top: 0;
++}
++table.tableblock {
++  border-width: 3px;
++  border-spacing: 0px;
++  border-style: solid;
++  border-color: #527bbd;
++  border-collapse: collapse;
++}
++th.tableblock, td.tableblock {
++  border-width: 1px;
++  padding: 4px;
++  border-style: solid;
++  border-color: #527bbd;
++}
++
++table.tableblock.frame-topbot {
++  border-left-style: hidden;
++  border-right-style: hidden;
++}
++table.tableblock.frame-sides {
++  border-top-style: hidden;
++  border-bottom-style: hidden;
++}
++table.tableblock.frame-none {
++  border-style: hidden;
++}
++
++th.tableblock.halign-left, td.tableblock.halign-left {
++  text-align: left;
++}
++th.tableblock.halign-center, td.tableblock.halign-center {
++  text-align: center;
++}
++th.tableblock.halign-right, td.tableblock.halign-right {
++  text-align: right;
++}
++
++th.tableblock.valign-top, td.tableblock.valign-top {
++  vertical-align: top;
++}
++th.tableblock.valign-middle, td.tableblock.valign-middle {
++  vertical-align: middle;
++}
++th.tableblock.valign-bottom, td.tableblock.valign-bottom {
++  vertical-align: bottom;
++}
++
++
++/*
++ * manpage specific
++ *
++ * */
++
++body.manpage h1 {
++  padding-top: 0.5em;
++  padding-bottom: 0.5em;
++  border-top: 2px solid silver;
++  border-bottom: 2px solid silver;
++}
++body.manpage h2 {
++  border-style: none;
++}
++body.manpage div.sectionbody {
++  margin-left: 3em;
++}
++
++@media print {
++  body.manpage div#toc { display: none; }
++}
++
++
++</style>
++<script type="text/javascript">
++/*<![CDATA[*/
++var asciidoc = {  // Namespace.
++
++/////////////////////////////////////////////////////////////////////
++// Table Of Contents generator
++/////////////////////////////////////////////////////////////////////
++
++/* Author: Mihai Bazon, September 2002
++ * http://students.infoiasi.ro/~mishoo
++ *
++ * Table Of Content generator
++ * Version: 0.4
++ *
++ * Feel free to use this script under the terms of the GNU General Public
++ * License, as long as you do not remove or alter this notice.
++ */
++
++ /* modified by Troy D. Hanson, September 2006. License: GPL */
++ /* modified by Stuart Rackham, 2006, 2009. License: GPL */
++
++// toclevels = 1..4.
++toc: function (toclevels) {
++
++  function getText(el) {
++    var text = "";
++    for (var i = el.firstChild; i != null; i = i.nextSibling) {
++      if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
++        text += i.data;
++      else if (i.firstChild != null)
++        text += getText(i);
++    }
++    return text;
++  }
++
++  function TocEntry(el, text, toclevel) {
++    this.element = el;
++    this.text = text;
++    this.toclevel = toclevel;
++  }
++
++  function tocEntries(el, toclevels) {
++    var result = new Array;
++    var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
++    // Function that scans the DOM tree for header elements (the DOM2
++    // nodeIterator API would be a better technique but not supported by all
++    // browsers).
++    var iterate = function (el) {
++      for (var i = el.firstChild; i != null; i = i.nextSibling) {
++        if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
++          var mo = re.exec(i.tagName);
++          if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
++            result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
++          }
++          iterate(i);
++        }
++      }
++    }
++    iterate(el);
++    return result;
++  }
++
++  var toc = document.getElementById("toc");
++  if (!toc) {
++    return;
++  }
++
++  // Delete existing TOC entries in case we're reloading the TOC.
++  var tocEntriesToRemove = [];
++  var i;
++  for (i = 0; i < toc.childNodes.length; i++) {
++    var entry = toc.childNodes[i];
++    if (entry.nodeName.toLowerCase() == 'div'
++     && entry.getAttribute("class")
++     && entry.getAttribute("class").match(/^toclevel/))
++      tocEntriesToRemove.push(entry);
++  }
++  for (i = 0; i < tocEntriesToRemove.length; i++) {
++    toc.removeChild(tocEntriesToRemove[i]);
++  }
++
++  // Rebuild TOC entries.
++  var entries = tocEntries(document.getElementById("content"), toclevels);
++  for (var i = 0; i < entries.length; ++i) {
++    var entry = entries[i];
++    if (entry.element.id == "")
++      entry.element.id = "_toc_" + i;
++    var a = document.createElement("a");
++    a.href = "#" + entry.element.id;
++    a.appendChild(document.createTextNode(entry.text));
++    var div = document.createElement("div");
++    div.appendChild(a);
++    div.className = "toclevel" + entry.toclevel;
++    toc.appendChild(div);
++  }
++  if (entries.length == 0)
++    toc.parentNode.removeChild(toc);
++},
++
++
++/////////////////////////////////////////////////////////////////////
++// Footnotes generator
++/////////////////////////////////////////////////////////////////////
++
++/* Based on footnote generation code from:
++ * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
++ */
++
++footnotes: function () {
++  // Delete existing footnote entries in case we're reloading the footnodes.
++  var i;
++  var noteholder = document.getElementById("footnotes");
++  if (!noteholder) {
++    return;
++  }
++  var entriesToRemove = [];
++  for (i = 0; i < noteholder.childNodes.length; i++) {
++    var entry = noteholder.childNodes[i];
++    if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
++      entriesToRemove.push(entry);
++  }
++  for (i = 0; i < entriesToRemove.length; i++) {
++    noteholder.removeChild(entriesToRemove[i]);
++  }
++
++  // Rebuild footnote entries.
++  var cont = document.getElementById("content");
++  var spans = cont.getElementsByTagName("span");
++  var refs = {};
++  var n = 0;
++  for (i=0; i<spans.length; i++) {
++    if (spans[i].className == "footnote") {
++      n++;
++      var note = spans[i].getAttribute("data-note");
++      if (!note) {
++        // Use [\s\S] in place of . so multi-line matches work.
++        // Because JavaScript has no s (dotall) regex flag.
++        note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
++        spans[i].innerHTML =
++          "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
++          "' title='View footnote' class='footnote'>" + n + "</a>]";
++        spans[i].setAttribute("data-note", note);
++      }
++      noteholder.innerHTML +=
++        "<div class='footnote' id='_footnote_" + n + "'>" +
++        "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
++        n + "</a>. " + note + "</div>";
++      var id =spans[i].getAttribute("id");
++      if (id != null) refs["#"+id] = n;
++    }
++  }
++  if (n == 0)
++    noteholder.parentNode.removeChild(noteholder);
++  else {
++    // Process footnoterefs.
++    for (i=0; i<spans.length; i++) {
++      if (spans[i].className == "footnoteref") {
++        var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
++        href = href.match(/#.*/)[0];  // Because IE return full URL.
++        n = refs[href];
++        spans[i].innerHTML =
++          "[<a href='#_footnote_" + n +
++          "' title='View footnote' class='footnote'>" + n + "</a>]";
++      }
++    }
++  }
++},
++
++install: function(toclevels) {
++  var timerId;
++
++  function reinstall() {
++    asciidoc.footnotes();
++    if (toclevels) {
++      asciidoc.toc(toclevels);
++    }
++  }
++
++  function reinstallAndRemoveTimer() {
++    clearInterval(timerId);
++    reinstall();
++  }
++
++  timerId = setInterval(reinstall, 500);
++  if (document.addEventListener)
++    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
++  else
++    window.onload = reinstallAndRemoveTimer;
++}
++
++}
++asciidoc.install();
++/*]]>*/
++</script>
++</head>
++<body class="manpage">
++<div id="header">
++<h1>
++nvme-netapp-smdevices(1) Manual Page
++</h1>
++<h2>NAME</h2>
++<div class="sectionbody">
++<p>nvme-netapp-smdevices -
++   Display information for each NVMe path to an E-Series volume
++</p>
++</div>
++</div>
++<div id="content">
++<div class="sect1">
++<h2 id="_synopsis">SYNOPSIS</h2>
++<div class="sectionbody">
++<div class="verseblock">
++<pre class="content"><em>nvme netapp smdevices</em> [-o &lt;fmt&gt; | --output-format=&lt;fmt&gt;]</pre>
++<div class="attribution">
++</div></div>
++</div>
++</div>
++<div class="sect1">
++<h2 id="_description">DESCRIPTION</h2>
++<div class="sectionbody">
++<div class="paragraph"><p>Display vendor-specific information for each NVMe path to an E-Series namespace
++currently connnected to the host.  The E-Series paths are identified from the
++NVMe nodes in /dev by sending an Identify Controller.</p></div>
++</div>
++</div>
++<div class="sect1">
++<h2 id="_options">OPTIONS</h2>
++<div class="sectionbody">
++<div class="dlist"><dl>
++<dt class="hdlist1">
++-o &lt;fmt&gt;
++</dt>
++<dt class="hdlist1">
++--output-format=&lt;fmt&gt;
++</dt>
++<dd>
++<p>
++              Set the reporting format to <em>normal</em> (default), <em>column</em>, or
++              <em>json</em>. Only one output format can be used at a time.
++</p>
++</dd>
++</dl></div>
++</div>
++</div>
++<div class="sect1">
++<h2 id="_examples">EXAMPLES</h2>
++<div class="sectionbody">
++<div class="ulist"><ul>
++<li>
++<p>
++Display information, in a column-based format, for each path to an E-Series
++namespace.
++</p>
++<div class="listingblock">
++<div class="content">
++<pre><code># nvme netapp smdevices -o column</code></pre>
++</div></div>
++</li>
++</ul></div>
++</div>
++</div>
++<div class="sect1">
++<h2 id="_nvme">NVME</h2>
++<div class="sectionbody">
++<div class="paragraph"><p>Part of the nvme-user suite</p></div>
++</div>
++</div>
++</div>
++<div id="footnotes"><hr /></div>
++<div id="footer">
++<div id="footer-text">
++Last updated
++ 2018-02-07 15:49:54 CST
++</div>
++</div>
++</body>
++</html>
+diff --git a/Documentation/nvme-netapp-smdevices.txt b/Documentation/nvme-netapp-smdevices.txt
+new file mode 100644
+index 000000000000..3eacbc27ceda
+--- /dev/null
++++ b/Documentation/nvme-netapp-smdevices.txt
+@@ -0,0 +1,37 @@
++nvme-netapp-smdevices(1)
++========================
++
++NAME
++----
++nvme-netapp-smdevices - Display information for each NVMe path to an E-Series volume
++
++SYNOPSIS
++--------
++[verse]
++'nvme netapp smdevices' [-o <fmt> | --output-format=<fmt>]
++
++DESCRIPTION
++-----------
++Display vendor-specific information for each NVMe path to an E-Series namespace
++currently connnected to the host.  The E-Series paths are identified from the
++NVMe nodes in /dev by sending an Identify Controller.
++
++OPTIONS
++-------
++-o <fmt>::
++--output-format=<fmt>::
++              Set the reporting format to 'normal' (default), 'column', or
++              'json'. Only one output format can be used at a time.
++
++EXAMPLES
++--------
++* Display information, in a column-based format, for each path to an E-Series
++namespace.
+++
++------------
++# nvme netapp smdevices -o column
++------------
++
++NVME
++----
++Part of the nvme-user suite
+-- 
+2.13.6
+

nvme-cli.changes

@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Feb 13 13:18:29 UTC 2018 - jthumshirn@suse.com
+
+- Add NetApp vendor plugin (bsc#1080672) 
+  + 0001-nvme-cli-add-NetApp-plugin.patch
+  + 0002-nvme-cli-add-netapp-smdevices-man-page.patch
+
 -------------------------------------------------------------------
 Wed Jan 10 10:17:08 UTC 2018 - jthumshirn@suse.com
 

nvme-cli.spec

@@ -29,6 +29,8 @@ BuildRequires:  libuuid-devel
 BuildRequires:  xmlto
 BuildRequires:  pkgconfig(libudev)
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+Patch1:         0001-nvme-cli-add-NetApp-plugin.patch
+Patch2:         0002-nvme-cli-add-netapp-smdevices-man-page.patch
 
 %description
 NVM Express (NVMe) is a direct attached storage interface. The
@@ -37,6 +39,8 @@ dependencies.
 
 %prep
 %setup -q -n %{name}-v%{version}
+%patch1 -p1
+%patch2 -p1
 
 %build
 echo %{version} > version