shaba/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 17:34:18 +03:00
Code Releases Activity

secret: add iscsi to possible usage types

Browse Source 
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-03-21 12:53:52 +01:00 committed by Osier Yang
parent 8110a8249d
commit adba070122
6 changed files with 53 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
docs/formatsecret.html.in
View File

@ -66,6 +66,18 @@
device</a>. <span class="since">Since 0.9.7</span>.
</p>
<h3>Usage type "iscsi"</h3>
<p>
This secret is associated with an iSCSI target for CHAP authentication.
The <code>&lt;usage type='iscsi'&gt;</code> element must contain
a single <code>target</code> element that specifies a usage name
for the secret. The iSCSI secret can then be used by UUID or by
this usage name via the <code>&lt;auth&gt;</code> element of
a <a href="domain.html#elementsDisks">disk
device</a>. <span class="since">Since 1.0.4</span>.
</p>
<h2><a name="example">Example</a></h2>
<pre>

10
docs/schemas/secret.rng
View File

@ -41,6 +41,7 @@
<choice>
<ref name='usagevolume'/>
<ref name='usageceph'/>
<ref name='usageiscsi'/>
<!-- More choices later -->
</choice>
</element>
@ -67,4 +68,13 @@
</element>
</define>
<define name='usageiscsi'>
<attribute name='type'>
<value>iscsi</value>
</attribute>
<element name='target'>
<ref name='genericName'/>
</element>
</define>
</grammar>

1
include/libvirt/libvirt.h.in
View File

@ -3649,6 +3649,7 @@ typedef enum {
VIR_SECRET_USAGE_TYPE_NONE = 0,
VIR_SECRET_USAGE_TYPE_VOLUME = 1,
VIR_SECRET_USAGE_TYPE_CEPH = 2,
VIR_SECRET_USAGE_TYPE_ISCSI = 3,
#ifdef VIR_ENUM_SENTINELS
VIR_SECRET_USAGE_TYPE_LAST

22
src/conf/secret_conf.c
View File

@ -36,7 +36,7 @@
#define VIR_FROM_THIS VIR_FROM_SECRET
VIR_ENUM_IMPL(virSecretUsageType, VIR_SECRET_USAGE_TYPE_LAST,
"none", "volume", "ceph")
"none", "volume", "ceph", "iscsi")
void
virSecretDefFree(virSecretDefPtr def)
@ -57,6 +57,10 @@ virSecretDefFree(virSecretDefPtr def)
VIR_FREE(def->usage.ceph);
break;
case VIR_SECRET_USAGE_TYPE_ISCSI:
VIR_FREE(def->usage.target);
break;
default:
VIR_ERROR(_("unexpected secret usage type %d"), def->usage_type);
break;
@ -108,6 +112,15 @@ virSecretDefParseUsage(xmlXPathContextPtr ctxt,
}
break;
case VIR_SECRET_USAGE_TYPE_ISCSI:
def->usage.target = virXPathString("string(./usage/target)", ctxt);
if (!def->usage.target) {
virReportError(VIR_ERR_INTERNAL_ERROR, "%s",
_("iSCSI usage specified, but target is missing"));
return -1;
}
break;
default:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected secret usage type %d"),
@ -262,6 +275,13 @@ virSecretDefFormatUsage(virBufferPtr buf,
}
break;
case VIR_SECRET_USAGE_TYPE_ISCSI:
if (def->usage.target != NULL) {
virBufferEscapeString(buf, " <target>%s</target>\n",
def->usage.target);
}
break;
default:
virReportError(VIR_ERR_INTERNAL_ERROR,
_("unexpected secret usage type %d"),

1
src/conf/secret_conf.h
View File

@ -39,6 +39,7 @@ struct _virSecretDef {
union {
char *volume; /* May be NULL */
char *ceph;
char *target;
} usage;
};

8
src/secret/secret_driver.c
View File

@ -149,6 +149,11 @@ secretFindByUsage(virSecretDriverStatePtr driver, int usageType, const char *usa
if (STREQ(s->def->usage.ceph, usageID))
return s;
break;
case VIR_SECRET_USAGE_TYPE_ISCSI:
if (STREQ(s->def->usage.target, usageID))
return s;
break;
}
}
return NULL;
@ -614,6 +619,9 @@ secretUsageIDForDef(virSecretDefPtr def)
case VIR_SECRET_USAGE_TYPE_CEPH:
return def->usage.ceph;
case VIR_SECRET_USAGE_TYPE_ISCSI:
return def->usage.target;
default:
return NULL;
}