Merge ~rafaeldtinoco/ubuntu/+source/fence-agents:lp1865523-bionic into ubuntu/+source/fence-agents:ubuntu/bionic-devel

[Rafael David Tinoco]

Alright... I need someone to review this before uploading to Ubuntu Bionic. This is a "tricky" situation because based on all my previous tests I realized that fence_scsi was completely broken in Ubuntu Bionic.

The BUG is this:
https://bugs.launchpad.net/ubuntu/+source/pacemaker/+bug/1865523

I was only able to make fence_scsi to work using Pacemaker 1.1.19-0 (vanilla, from upstream).

The way I fixed fence_scsi was this:

I packaged pacemaker in latest 1.1.X version and kept it "vanilla" so I could bisect fence-agents. At that moment I realized that bisecting was going to be hard because there were multiple issues, not only one. I backported the latest fence-agents together with Pacemaker 1.1.19-0 and saw that it worked.

From then on, I bisected the following intervals:

4.3.0 .. 4.4.0 (eoan - working)
4.2.0 .. 4.3.0
4.1.0 .. 4.2.0
4.0.25 .. 4.1.0 (bionic - not working)

In each of those intervals I discovered issues. For example, Using 4.3.0 I faced problems so I had to backport fixes that were in between 4.4.0 and 4.3.0. Then, backporting 4.2.0, I faced issues so I had to backport fixes from the 4.3.0 <-> 4.2.0 interval. I did this until I was at 4.0.25 version, current Bionic fence-agents version.

This method, used whenever we want to keep the min possible difference in a SRU, has given me the following patches, ordered by date and interdependence:

+ d/p/lp1865523-02-fix-for-ignored-options.patch:
  - change agents opt names so pacemaker has better compat

+ d/p/lp1865523-03-Maintain-ABI-compatibility.patch:
  - keep ABI compatibility: deal with old and new agent opt names

+ d/p/lp1865523-05-fence_scsi-fix-plug-parameter.patch:
  - use "plug" argument instead of "nodename"
  - keep previous "nodename" if no "plug" is given

+ d/p/lp1865523-06-fence_scsi-fix-python3-encoding.patch:
  - encodes before calculating hash

+ d/p/lp1865523-08-fence_scsi-node-ID-new-format.patch:
  - detect node ID using new format (plug + nodename)

As the world isn't perfect, of course that, because of those patches, I needed some others. The SRU idea is always trying to keep patch as simpler as we can (to both: fix the issue without introducing new problems AND guarantee good maintainability).

I had to add the following patches because of that:

+ d/p/lp1865523-00-fencing-add-consistency-cmdline-stdin.patch:
  - makes sure cmdline and stdin accept same args

+ d/p/lp1865523-01-fence_scsi-add-FIPS-support.patch:
  - handle hashlib FIPS exceptions in place of generic error

+ d/p/lp1865523-04-fence_scsi-Remove-period.patch:
  - minor string correction

+ d/p/lp1865523-07-fence_scsi-fix-incorrect-SCSI-key.patch:
  - issue calculating SCSI key on > 10 nodes

With these changes I'm able to build the package as long as I'm not doing the build tests. For the build tests, I had to update the XML definitions for the fence agents that I have fixed. And that is what I did with the latest patch:

+ d/p/lp1865523-09-fence-metadata-update.xml:
  - updates all agents XML definitions for build tests

[Rafael David Tinoco (rafaeldtinoco)]

I still have to finish fixing Pacemaker for the public bug (instead of using Vanilla 1.1.19). It is possible that I have to fix one thing or another in this package, bug, meanwhile, I thought about asking for a review so things are easier in the next push if there is a need for one.

Comments #3 and #4 show my fence_scsi fully working:

https://bugs.launchpad.net/ubuntu/+source/pacemaker/+bug/1865523/comments/3
https://bugs.launchpad.net/ubuntu/+source/pacemaker/+bug/1865523/comments/4

[Rafael David Tinoco (rafaeldtinoco)]

I have a PPA at:

https://launchpad.net/~ubuntu-server-ha/+archive/ubuntu/staging-bionic

This is the HA staging PPA and will be given to others (until the full Pacemaker + Fence Agents SRU isn't finished) in order to provide fence_scsi support (as the current one does not work).

[Christian Ehrhardt  (paelzer)]

That is a lot of work and I appreciate that.
I read through the bug and MP description now, the approach to all of this LGTM.

Looking at actual patches, changelog and builds now ...

[Christian Ehrhardt  (paelzer)]

SRU would be 4.0.25-2ubuntu1.1

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

other than that the changelog LGTM

[Christian Ehrhardt  (paelzer)]

+ + d/p/lp1865523-00-fencing-add-consistency-cmdline-stdin.patch:
+ - makes sure cmdline and stdin accept same args

This is a high amount of changes.
They look correct, but I'm afraid it is too much.
Plenty of old arguments got now deprecated - if fence is e.g. putting out warnings that might break people.
E.g. people used to use ipaddr and after the SRU they would get a deprecation warning.

Can we break this down to just those changes we actually need or are these massively intertwined?
If it can be reduced to just a few arguments it might be more review-able to check for the consequences e.g. of marking things deprecated.

+ + d/p/lp1865523-01-fence_scsi-add-FIPS-support.patch:
+ - handle hashlib FIPS exceptions in place of generic error

Sounds bad to refer to FIPS support.
Would we hit this bug (then keep it) or was this just needed to have patches apply for context (then remove this patch and modify the other).

+ + d/p/lp1865523-02-fix-for-ignored-options.patch:
+ - change agents opt names so pacemaker has better compat

This is guly, it is all whitespace but adding "on_target".
The upstream patch is different.
In general whenever you are not 100% as-upstreams patch please use "backport" instead of "upstream" in the origin tag and explain why you changed it.
If you have reduced the big patch to just what is needed that is fine, but please explain what/why.
That is true for all patches in this series

+ + d/p/lp1865523-03-Maintain-ABI-compatibility.patch:
+ - keep ABI compatibility: deal with old and new agent opt names

Odd, but ok (same tag/explain changes as above thou)

+ + d/p/lp1865523-04-fence_scsi-Remove-period.patch:
+ - minor string correction

THe patch says "existing version works fine", but I'm still scared can you make an A/B tests of orig and changed version please ?

+ + d/p/lp1865523-05-fence_scsi-fix-plug-parameter.patch:
+ - use "plug" argument instead of "nodename"
+ - keep previous "nodename" if no "plug" is given

I was scared first but glad that it had compat code in the patch.

+ + d/p/lp1865523-06-fence_scsi-fix-python3-encoding.patch:
+ - encodes before calculating hash

The shebang is variable
  1 #!@PYTHON@ -tt
Would this be a problem for python2?

+ + d/p/lp1865523-07-fence_scsi-fix-incorrect-SCSI-key.patch:
+ - issue calculating SCSI key on > 10 nodes
+ + d/p/lp1865523-08-fence_scsi-node-ID-new-format.patch:
+ - detect node ID using new format (plug + nodename)

These LGTM

+ + d/p/lp1865523-09-fence-metadata-update.xml:
+ - updates all agents XML definitions for build tests

That one really should get some more description and patch-tags.
I know it is the regen due to Ubuntu-patches, but still make it clear in the patch please.

review: Needs Fixing

[Christian Ehrhardt  (paelzer)]

This will need re-review later for sure, adding another review slot to not be solely on me and to have another pair of eyes on it then.

[Rafael David Tinoco (rafaeldtinoco)]

Thanks for this first review @paelzer! I mostly agree with all the concerns you brought and have thought about the same things on more than half of your highlights. I'm going to this use "working" version to check on pacemaker and revisit this to address the concerns that can be addressed.

[Rafael David Tinoco (rafaeldtinoco)]

> SRU would be 4.0.25-2ubuntu1.1

need to put this "check" in my "checklist" =). dch -i is no good here.

[Rafael David Tinoco (rafaeldtinoco)]

A PPA can be currently found at : https://launchpad.net/~ubuntu-server-ha/+archive/ubuntu/staging

[Christian Ehrhardt  (paelzer)]

Ok, ping me back when you want my re-review then ...

[Rafael David Tinoco (rafaeldtinoco)]

@paelzer, for your next review I have uploaded:

Uploading to ppa (via ftp to ppa.launchpad.net):
  Uploading fence-agents_4.0.25-2ubuntu1+staging~2.dsc: done.
  Uploading fence-agents_4.0.25-2ubuntu1+staging~2.debian.tar.xz: done.
  Uploading fence-agents_4.0.25-2ubuntu1+staging~2_source.buildinfo: done.
  Uploading fence-agents_4.0.25-2ubuntu1+staging~2_source.changes: done.

in:

https://launchpad.net/~ubuntu-server-ha/+archive/ubuntu/staging

I have already tested and it works the same way as the previous one.

I'm posting the answer to your questions in the next comment.

[Rafael David Tinoco (rafaeldtinoco)]

+ + d/p/lp1865523-00-fencing-add-consistency-cmdline-stdin.patch:
+ - makes sure cmdline and stdin accept same args

This is a high amount of changes. They look correct, but I'm afraid it is too
much. Plenty of old arguments got now deprecated - if fence is e.g. putting out
warnings that might break people. E.g. people used to use ipaddr and after the
SRU they would get a deprecation warning.

Can we break this down to just those changes we actually need or are these
massively intertwined? If it can be reduced to just a few arguments it might be
more review-able to check for the consequences e.g. of marking things
deprecated.

RESPONSE:

New version for this patch:

    Description: fencing: Add consistency between command-line and STDIN arguments

        [Rafael David Tinoco]
        1. To normalize fence agents arguments names. There are multiple
           online documentation available pointing out different argument
           names for the agents.
        2. To normalize fence agents arguments between command line AND
           stdin. "fenced" sends parameters through stdin when executing
           an agent, they have to be the same.
        3. Deprecated attributes don't cause harm, they serve only as a
           guidance for metadata parsers AND for the XSL lint verification.
           Both attributes (deprecated vs obsoletes) are valid.
        4. Change in arguments processing (by converting '-' to '_') makes
           smoother needed fixes in other patches of this same patchset.
        5. All metadata changes (tests/data/metadata/*.xml) will have to be
           re-done at the end of this patchset, so they were removed from this
           patch on purpose.

Unfortunately this patch was a result of a bisection and it is needed because of
the normalization it does between stdin & cmdline (as the agents might be called
by both, using the same argument names).

I think items 1-5 answer your concerns. Let me know if they don't, please. They
are part of commit log message now.

[Rafael David Tinoco (rafaeldtinoco)]

+ + d/p/lp1865523-01-fence_scsi-add-FIPS-support.patch:
+ - handle hashlib FIPS exceptions in place of generic error

Sounds bad to refer to FIPS support. Would we hit this bug (then keep it) or was
this just needed to have patches apply for context (then remove this patch and
modify the other).

> Trying to make cherry-picks smoother with this one... but:

>>> import hashlib
>>> hashlib.md5()
<md5 HASH object @ 0x7f5f1a699de0>
>>> hashlib.md5(usedforsecurity=False)
Traceback (most recent call last):
  File "<stdin>", line 1, in <module>
TypeError: openssl_md5() takes no keyword arguments

So I'm removing this one and adjusting the others.

[Rafael David Tinoco (rafaeldtinoco)]

+ + d/p/lp1865523-02-fix-for-ignored-options.patch:
+ - change agents opt names so pacemaker has better compat

This is guly, it is all whitespace but adding "on_target". The upstream patch is
different. In general whenever you are not 100% as-upstreams patch please use
"backport" instead of "upstream" in the origin tag and explain why you changed
it. If you have reduced the big patch to just what is needed that is fine, but
please explain what/why. That is true for all patches in this series

RESPONSE:

Yep. This one is the continuation of the consistency between cmdline and stdin
patch. Not sure what happened here for it to be so messy, I have fixed it.

-> check cherry-pick/backport keywords in all patches.

RESPONSE:

Reviewed all of them.

[Rafael David Tinoco (rafaeldtinoco)]

+ + d/p/lp1865523-04-fence_scsi-Remove-period.patch:
+ - minor string correction

THe patch says "existing version works fine", but I'm still scared can you make
an A/B tests of orig and changed version please ?

RESPONSE:

> That's because corosync-cmapctl accepts "." at the end of the command:

(k)rafaeldtinoco@clubionic01:~$ sudo corosync-cmapctl nodelist.hehe
-1

(k)rafaeldtinoco@clubionic01:~$ sudo corosync-cmapctl nodelist.a
-1

(k)rafaeldtinoco@clubionic01:~$ sudo corosync-cmapctl nodelista
-1

(k)rafaeldtinoco@clubionic01:~$ sudo corosync-cmapctl nodelist.
nodelist.local_node_pos (u32) = 0
nodelist.node.0.name (str) = clubionic01
nodelist.node.0.nodeid (u32) = 1
nodelist.node.0.ring0_addr (str) = 10.250.3.10
nodelist.node.1.name (str) = clubionic02
nodelist.node.1.nodeid (u32) = 2
nodelist.node.1.ring0_addr (str) = 10.250.3.11
nodelist.node.2.name (str) = clubionic03
nodelist.node.2.nodeid (u32) = 3
nodelist.node.2.ring0_addr (str) = 10.250.3.12

(k)rafaeldtinoco@clubionic01:~$ sudo corosync-cmapctl nodelist
nodelist.local_node_pos (u32) = 0
nodelist.node.0.name (str) = clubionic01
nodelist.node.0.nodeid (u32) = 1
nodelist.node.0.ring0_addr (str) = 10.250.3.10
nodelist.node.1.name (str) = clubionic02
nodelist.node.1.nodeid (u32) = 2
nodelist.node.1.ring0_addr (str) = 10.250.3.11
nodelist.node.2.name (str) = clubionic03
nodelist.node.2.nodeid (u32) = 3
nodelist.node.2.ring0_addr (str) = 10.250.3.12

But I prefer to have this change as a "dot" at the end of the argument can't seem right.

[Rafael David Tinoco (rafaeldtinoco)]

+ + d/p/lp1865523-05-fence_scsi-fix-plug-parameter.patch:
+ - use "plug" argument instead of "nodename"
+ - keep previous "nodename" if no "plug" is given

I was scared first but glad that it had compat code in the patch.

RESPONSE:

> Plug argument did not exist before this patchset for fence_scsi.
> fence_scsi *does not* work currently.

> bisection brought me to this patch.

> fence_scsi gets a "--plug=[nodename] option" to work with current pacemaker

> fence_scsi keeps the behavior for those communicating with the fence agent
  using --nodename argument.

[Rafael David Tinoco (rafaeldtinoco)]

+ + d/p/lp1865523-06-fence_scsi-fix-python3-encoding.patch:
+ - encodes before calculating hash

The shebang is variable
  1 #!@PYTHON@ -tt
Would this be a problem for python2?

> No BUT this patch patches the FIPS change I had to remove. I'll adapt it
and it will be fine.

[Rafael David Tinoco (rafaeldtinoco)]

+ + d/p/lp1865523-09-fence-metadata-update.xml:
+ - updates all agents XML definitions for build tests

That one really should get some more description and patch-tags. I know it is
the regen due to Ubuntu-patches, but still make it clear in the patch please.

RESPONSE:

Err, I forgot to add patch notes. Now its better.

[Christian Ehrhardt  (paelzer)]

Thanks for addressing all my concerns!
I know it must have been a lot of work.

I was going through your replies one by one and comparing the related patches/commits.
There are still a few questions left, but we are much much closer to an upload!
Please don't feel slowed down by the review loop.

- Thanks for dropping #1 and cleaning #2 patch content

- Headers are now much better in general, thanks as well for that

- thanks for explaining the suffix "."
  In general upstreams commit messages are a bit too short.
  You adding some reasoning and statements why it should be safe
  helps a lot to not look at them in a bad way. This will surely help
  SRU review as well.
  -> I still don't see how lp1865523-04-fence_scsi-Remove-period.patch
     is stricly needed to SRU-fix the problem, but it is an ok fix
     to have. Did this change come up as real issue in your testing?
     Or did you just see it and thought it would be nice to have?
     I agree it seems a good change, but if it works both ways why
     not keep the update smaller - newer version already have it
     so the future is good?

- patch lp1865523-05-fence_scsi-fix-plug-parameter.patch adds a parm
  then lp1865523-07-fence_scsi-fix-incorrect-SCSI-key.patch and
  lp1865523-08-fence_scsi-node-ID-new-format.patch fix it up.
  I wonder (= I'm not sure and it is up to you) if that would read
  more nicely if we'd squash those three - keep all three patch
  headers and descriptions and explain that this is one functional
  change and its two fixups.
  Benefits:
   - looks (and is) less change/noise overall
   - one doesn't stare at a bad fix, to then look at the fix and
     then the fix of the fix. It would just look like the change it
     should have been all the time.

- I wondered if with all these changes
  https://code.launchpad.net/~rafaeldtinoco/ubuntu/+source/pacemaker/+git/pacemaker/+merge/380337
  at the new version of pacemaker it should in d/control
  bump the recommends to be version dependent to the new
  4.0.25-2ubuntu1.1. I'm unsure on this since a recommends isn't
  as strict if a versioned dep makes sense there, but it would
  reflect reality correctly. I checked other packages and the doc,
  versioned recommends does exist - so why not making this "correct"?
  What do you think?

## SRU Template 1 ##

This section in regression risks is odd to me:
"* This fix has a potential of breaking other "nowadays working" fencing agent. If that happens, I suggest that ones affected revert previous to previous package AND open a bug against either pacemaker and/or fence-agents."

On one hand every fix has that chance and OTOH chances are quite high after all your testing that if such a thing happens it won't be spotted in -proposed. And after having it in -updates all the users can use is the one in -release as they can't go to any version. It feels a bit odd, I'd feel better with something like:

"This is a quite complex change and I'd appreciate leaving it in -proposed for a while longer for a higher chance to detect issues. Furthermore there was no update since bionic release, so users could in the worst-case (and only then) report a bug and downgrade to the former versio...

review: Needs Information

[Rafael David Tinoco (rafaeldtinoco)]

> I was going through your replies one by one and comparing the related
> patches/commits. There are still a few questions left, but we are much much
> closer to an upload! Please don't feel slowed down by the review loop.

Not at all @paelzer. I learned to see benefit on reviews, especially yours.

> I still don't see how lp1865523-04-fence_scsi-Remove-period.patch
> is stricly needed to SRU-fix the problem, but it is an ok fix
> to have. Did this change come up as real issue in your testing?
> Or did you just see it and thought it would be nice to have?
> I agree it seems a good change, but if it works both ways why
> not keep the update smaller - newer version already have it
> so the future is good?

I can remove it. It was put there just so other patches were clean cherry-picks.
OTOH, I have done extensive tests with it on.. but since there are some requests
from you at the bottom, maybe I should re-do the tests without.

> patch lp1865523-05-fence_scsi-fix-plug-parameter.patch adds a parm
> then lp1865523-07-fence_scsi-fix-incorrect-SCSI-key.patch and
> lp1865523-08-fence_scsi-node-ID-new-format.patch fix it up.
> I wonder (= I'm not sure and it is up to you) if that would read
> more nicely if we'd squash those three - keep all three patch
> headers and descriptions and explain that this is one functional
> change and its two fixups.

Yes, I like the idea. Somehow in the past we had a "rule" at SEG for 1:1 patch
with upstream and that is why i always do like that. But, like you said, for
things that are fixing/re-fixing and correlated I think it's a good approach!

> 4.0.25-2ubuntu1.1. I'm unsure on this since a recommends isn't
> as strict if a versioned dep makes sense there, but it would
> reflect reality correctly. I checked other packages and the doc,
> versioned recommends does exist - so why not making this "correct"?
> What do you think?

To be honest ? For HA I think that should be "mandatory". Whenever there is a
behavior fix that includes 2 or more packages, we should do a X<->Y map and
make dependencies to reflect that need. I'll do it.

> ## SRU Template 1 ##

> "this is a quite complex change and i'd appreciate leaving it in -proposed for
> a while longer for a higher chance to detect issues. Furthermore there was no
> update since bionic release, so users could in the worst-case (and only then)
> report a bug and downgrade to the former version"

Done. I think it's better indeed.

> ## SRU Template 2 ##

> The section "The way I fixed fence_scsi was this:" belongs under "Other Info"
> and not regression potential (IMHO).

+1. Done!

57872b8... by Rafael David Tinoco on 2020-03-16

* Fix fence_scsi agent arguments and node detection (LP: #1865523):
  + d/p/lp1865523-01-fencing-add-consistency-cmdline-stdin.patch AND
  + d/p/lp1865523-02-fix-for-ignored-options.patch
    - "fenced" sends commands through stdin
    - makes sure cmdline and stdin accept same args
    - normalize agents argument names (for pacemaker to work)
  + d/p/lp1865523-03-Maintain-ABI-compatibility.patch:
    - deal with old and new arguments from stdin
  + d/p/lp1865523-04-fence_scsi-Remove-period.patch:
    - minor string correction fixes fencing behavior
  + d/p/lp1865523-05-fence_scsi-fix-python3-encoding.patch:
    - encodes before calculating hash
  + d/p/lp1865523-06-fence_scsi-fixes-around-node-id.patch
    - use "plug" argument instead of "nodename" (external callers need)
    - keep previous "nodename" if no "plug" is given
    - issue calculating SCSI key on > 10 nodes
    - detect node ID using new format (plug + nodename)
  + d/p/lp1865523-07-fence-metadata-update.xml:
    - updates all agents XML definitions for build tests

[Rafael David Tinoco (rafaeldtinoco)]

I have re-tested the functionality and this new merge works.

[Christian Ehrhardt  (paelzer)]

It still is complex, but I think we made it way better than is started.
Thanks for all the effort +1 for proposing this to the SRU Team as the next bar to pass :-)

review: Approve

[Rafael David Tinoco (rafaeldtinoco)]

Thanks for reviewing this @paelzer and.. regarding the SRU.. considering that fence_scsi was not working *at all*, and we have no actual view on which resource and/or fence agents are working or not (we can only best guess from the bugs we have currently opened at launchpad) I would say that its "complex" but "needed" =).

I'll start seeking tests for Focal and have Eoan & Bionic also tested for the most important resource / fencing agents. That might give us another set of SRUs like this... hopefully not =).

Cheers o/

e205fc5... by Rafael David Tinoco on 2020-03-16

changelog

[Rafael David Tinoco (rafaeldtinoco)]

@paelzer FYIO, I brought the period patch back because I got misbehaviours when testing without it. I got one node being fenced in place of another and that definitely is not good =o). It could be because I was using GFS2 and fencing in the same disk.. but, still, I prefer to keep it as my tests show having that patch is good.

With that, I'm uploading this change for SRU review.

Thank you!

-rafaeldtinoco

[Rafael David Tinoco (rafaeldtinoco)]

This has already been uploaded:

commit 6d8eb863433a71d15aa98a6dc79466f46f7e9a55 (HEAD, tag: pkg/import/4.0.25-2ubuntu1.1, tag: import/4.0.25-2ubuntu1.1, pkg/ubuntu/bionic-proposed, pkg/ubuntu/bionic-devel)
Author: Rafael David Tinoco <email address hidden>
Date: Mon Mar 16 18:55:29 2020 +0000

    Import patches-unapplied version 4.0.25-2ubuntu1.1 to ubuntu/bionic-proposed

    Imported using git-ubuntu import.

    Changelog parent: 8a0a613f10870df8c28abdf2c10673eb210d5c88

    New changelog entries:
      * Fix fence_scsi agent arguments and node detection (LP: #1865523):
        + d/p/lp1865523-01-fencing-add-consistency-cmdline-stdin.patch AND
        + d/p/lp1865523-02-fix-for-ignored-options.patch
          - "fenced" sends commands through stdin
          - makes sure cmdline and stdin accept same args
          - normalize agents argument names (for pacemaker to work)
        + d/p/lp1865523-03-Maintain-ABI-compatibility.patch:
          - deal with old and new arguments from stdin
        + d/p/lp1865523-04-fence_scsi-Remove-period.patch:
          - minor string correction fixes fencing behavior
        + d/p/lp1865523-05-fence_scsi-fix-python3-encoding.patch:
          - encodes before calculating hash
        + d/p/lp1865523-06-fence_scsi-fixes-around-node-id.patch
          - use "plug" argument instead of "nodename" (external callers need)
          - keep previous "nodename" if no "plug" is given
          - issue calculating SCSI key on > 10 nodes
          - detect node ID using new format (plug + nodename)
        + d/p/lp1865523-07-fence-metadata-update.xml:
          - updates all agents XML definitions for build tests

diff --git a/debian/changelog b/debian/changelog
index 9e83205..41a81e0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+fence-agents (4.0.25-2ubuntu1.1) bionic; urgency=medium
+
+  * Fix fence_scsi agent arguments and node detection (LP: #1865523):
+    + d/p/lp1865523-01-fencing-add-consistency-cmdline-stdin.patch AND
+    + d/p/lp1865523-02-fix-for-ignored-options.patch
+      - "fenced" sends commands through stdin
+      - makes sure cmdline and stdin accept same args
+      - normalize agents argument names (for pacemaker to work)
+    + d/p/lp1865523-03-Maintain-ABI-compatibility.patch:
+      - deal with old and new arguments from stdin
+    + d/p/lp1865523-04-fence_scsi-Remove-period.patch:
+      - minor string correction fixes fencing behavior
+    + d/p/lp1865523-05-fence_scsi-fix-python3-encoding.patch:
+      - encodes before calculating hash
+    + d/p/lp1865523-06-fence_scsi-fixes-around-node-id.patch
+      - use "plug" argument instead of "nodename" (external callers need)
+      - keep previous "nodename" if no "plug" is given
+      - issue calculating SCSI key on > 10 nodes
+      - detect node ID using new format (plug + nodename)
+    + d/p/lp1865523-07-fence-metadata-update.xml:
+      - updates all agents XML definitions for build tests
+
+ -- Rafael David Tinoco <[e-mail]>  Mon, 16 Mar 2020 18:55:29 +0000
+
 fence-agents (4.0.25-2ubuntu1) bionic; urgency=medium
 
   * debian/patches/zvm-stdint: Add missing header for zvm agent on
diff --git a/debian/patches/lp1865523-01-fencing-add-consistency-cmdline-stdin.patch b/debian/patches/lp1865523-01-fencing-add-consistency-cmdline-stdin.patch
new file mode 100644
index 0000000..b07fc2a
--- /dev/null
+++ b/debian/patches/lp1865523-01-fencing-add-consistency-cmdline-stdin.patch
@@ -0,0 +1,158 @@
+Description: fencing: Add consistency between command-line and STDIN arguments
+
+    [Rafael David Tinoco]
+    1. To normalize fence agents arguments names. There are multiple
+       online documentation available pointing out different argument
+       names for the agents.
+    2. To normalize fence agents arguments between command line AND
+       stdin. "fenced" sends parameters through stdin when executing
+       an agent, they have to be the same.
+    3. Deprecated attributes don't cause harm, they serve only as a
+       guidance for metadata parsers AND for the XSL lint verification.
+       Both attributes (deprecated vs obsoletes) are valid.
+    4. Change in arguments processing (by converting '-' to '_') makes
+       smoother needed fixes in other patches of this same patchset.
+    5. All metadata changes (tests/data/metadata/*.xml) will have to be
+       re-done at the end of this patchset, so they were removed from this
+       patch on purpose.
+
+Author: Marek 'marx' Grac <[e-mail]>
+Origin: backport, https://github.com/ClusterLabs/fence-agents/commit/de490e0590
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865523
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-03-13
+---
+ fence/agents/lib/fence2man.xsl |  6 +++++
+ fence/agents/lib/fencing.py.py | 49 ++++++++++++++++++++++++----------
+ fence/agents/lib/metadata.rng  |  3 ++-
+ 3 files changed, 43 insertions(+), 15 deletions(-)
+
+--- a/fence/agents/lib/fence2man.xsl
++++ b/fence/agents/lib/fence2man.xsl
+@@ -2,6 +2,7 @@
+ <xsl:output method="text" indent="no"/>
+ <xsl:template match="parameter">
+ <xsl:param name="show" />
++<xsl:if test="not(@deprecated)">
+ .TP
+ <xsl:if test="$show = 'getopt'">.B <xsl:value-of select="getopt/@mixed" /></xsl:if>
+ <xsl:if test="$show = 'stdin'">.B <xsl:value-of select="@name"/></xsl:if>
+@@ -19,6 +20,11 @@
+ </xsl:if>
+ <xsl:if test="not(content/@default)"><xsl:if test="@required = 1"> This parameter is always required.</xsl:if></xsl:if>
+ <xsl:if test="content/@default"> (Default Value: <xsl:value-of select="content/@default"/>)</xsl:if>
++<xsl:if test="$show = 'stdin'">
++<xsl:if test="@obsoletes"> Obsoletes: <xsl:value-of select="@obsoletes" /></xsl:if>
++</xsl:if>
++
++</xsl:if>
+ </xsl:template>
+ 
+ <xsl:template match="action">
+--- a/fence/agents/lib/fencing.py.py
++++ b/fence/agents/lib/fencing.py.py
+@@ -551,7 +551,12 @@
+ 
+ def metadata(avail_opt, docs):
+ 	# avail_opt has to be unique, if there are duplicities then they should be removed
+-	sorted_list = [(key, all_opt[key]) for key in list(set(avail_opt))]
++	sorted_list = [(key, all_opt[key]) for key in list(set(avail_opt)) if "longopt" in all_opt[key]]
++	# Find keys that are going to replace inconsistent names
++	mapping = dict([(opt["longopt"].replace("-", "_"), key) for (key, opt) in sorted_list if (key != opt["longopt"].replace("-", "_"))])
++	new_options = [(key, all_opt[mapping[key]]) for key in mapping]
++	sorted_list.extend(new_options)
++
+ 	sorted_list.sort(key=lambda x: (x[1]["order"], x[0]))
+ 
+ 	print("<?xml version=\"1.0\" ?>")
+@@ -562,34 +567,43 @@
+ 	print("<longdesc>" + docs["longdesc"] + "</longdesc>")
+ 	print("<vendor-url>" + docs["vendorurl"] + "</vendor-url>")
+ 	print("<parameters>")
+-	for option, _ in sorted_list:
+-		if "help" in all_opt[option] and len(all_opt[option]["help"]) > 0:
+-			print("\t<parameter name=\"" + option + "\" unique=\"0\" required=\"" + all_opt[option]["required"] + "\">")
++	for (key, opt) in sorted_list:
++		info = ""
++		if key in all_opt:
++			if key != all_opt[key].get('longopt', key).replace("-", "_"):
++				info = "deprecated=\"1\""
++		else:
++			info = "obsoletes=\"%s\"" % (mapping.get(key))
++
++		if "help" in opt and len(opt["help"]) > 0:
++			if info != "":
++				info = " " + info
++			print("\t<parameter name=\"" + key + "\" unique=\"0\" required=\"" + opt["required"] + "\"" + info + ">")
+ 
+ 			default = ""
+-			if "default" in all_opt[option]:
+-				default = "default=\"" + _encode_html_entities(str(all_opt[option]["default"])) + "\" "
++			if "default" in opt:
++				default = "default=\"" + _encode_html_entities(str(opt["default"])) + "\" "
+ 
+-			mixed = all_opt[option]["help"]
++			mixed = opt["help"]
+ 			## split it between option and help text
+ 			res = re.compile(r"^(.*?--\S+)\s+", re.IGNORECASE | re.S).search(mixed)
+ 			if None != res:
+ 				mixed = res.group(1)
+ 			mixed = _encode_html_entities(mixed)
+ 
+-			if not "shortdesc" in all_opt[option]:
+-				shortdesc = re.sub("\s\s+", " ", all_opt[option]["help"][31:])
++			if not "shortdesc" in opt:
++				shortdesc = re.sub("\s\s+", " ", opt["help"][31:])
+ 			else:
+-				shortdesc = all_opt[option]["shortdesc"]
++				shortdesc = opt["shortdesc"]
+ 
+ 			print("\t\t<getopt mixed=\"" + mixed + "\" />")
+-			if "choices" in all_opt[option]:
++			if "choices" in opt:
+ 				print("\t\t<content type=\"select\" "+default+" >")
+-				for choice in all_opt[option]["choices"]:
++				for choice in opt["choices"]:
+ 					print("\t\t\t<option value=\"%s\" />" % (choice))
+ 				print("\t\t</content>")
+-			elif all_opt[option]["getopt"].count(":") > 0:
+-				t = all_opt[option].get("type", "string")
++			elif opt["getopt"].count(":") > 0:
++				t = opt.get("type", "string")
+ 				print("\t\t<content type=\"%s\" " % (t) +default+" />")
+ 			else:
+ 				print("\t\t<content type=\"boolean\" "+default+" />")
+@@ -1297,14 +1311,21 @@
+ def _parse_input_stdin(avail_opt):
+ 	opt = {}
+ 	name = ""
++
++	mapping_longopt_names = dict([(all_opt[o].get("longopt"), o) for o in avail_opt])
++
+ 	for line in sys.stdin.readlines():
+ 		line = line.strip()
+ 		if (line.startswith("#")) or (len(line) == 0):
+ 			continue
+ 
+ 		(name, value) = (line + "=").split("=", 1)
++		name = name.replace("-", "_");
+ 		value = value[:-1]
+ 
++		if name in mapping_longopt_names:
++			name = mapping_longopt_names[name]
++
+ 		if avail_opt.count(name) == 0 and name in ["nodename"]:
+ 			continue
+ 		elif avail_opt.count(name) == 0:
+--- a/fence/agents/lib/metadata.rng
++++ b/fence/agents/lib/metadata.rng
+@@ -19,7 +19,8 @@
+ 			<attribute name="name" />
+ 			<attribute name="unique"> <ref name="boolean-values" /> </attribute>
+ 			<attribute name="required"> <ref name="boolean-values" />  </attribute>
+-
++			<optional><attribute name="deprecated"> <ref name="boolean-values" /></attribute></optional>
++			<optional><attribute name="obsoletes" /> </optional>
+ 			<element name="getopt">
+ 				<attribute name="mixed" />
+ 			</element>
diff --git a/debian/patches/lp1865523-02-fix-for-ignored-options.patch b/debian/patches/lp1865523-02-fix-for-ignored-options.patch
new file mode 100644
index 0000000..b9f1dc6
--- /dev/null
+++ b/debian/patches/lp1865523-02-fix-for-ignored-options.patch
@@ -0,0 +1,115 @@
+Description: fix for ignored options
+
+    [Rafael David Tinoco]
+    1. All metadata changes (tests/data/metadata/*.xml) will have to be
+       re-done at the end of this patchset, so they were removed from this
+       patch on purpose.
+
+Origin: backport, https://github.com/ClusterLabs/fence-agents/commit/eae9d029b7
+Bug: https://github.com/ClusterLabs/fence-agents/pull/146
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865523
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-03-13
+---
+ fence/agents/compute/fence_compute.py | 20 ++++++++++----------
+ fence/agents/scsi/fence_scsi.py       |  4 ++--
+ 2 files changed, 12 insertions(+), 12 deletions(-)
+
+--- a/fence/agents/compute/fence_compute.py
++++ b/fence/agents/compute/fence_compute.py
+@@ -339,7 +339,7 @@
+ 	fail_usage("Couldn't obtain a supported connection to nova, tried: %s" % repr(versions))
+ 
+ def define_new_opts():
+-	all_opt["endpoint-type"] = {
++	all_opt["endpoint_type"] = {
+ 		"getopt" : "e:",
+ 		"longopt" : "endpoint-type",
+ 		"help" : "-e, --endpoint-type=[endpoint] Nova Endpoint type (publicURL, internalURL, adminURL)",
+@@ -348,7 +348,7 @@
+ 		"default" : "internalURL",
+ 		"order": 1,
+ 	}
+-	all_opt["tenant-name"] = {
++	all_opt["tenant_name"] = {
+ 		"getopt" : "t:",
+ 		"longopt" : "tenant-name",
+ 		"help" : "-t, --tenant-name=[tenant]     Keystone Admin Tenant",
+@@ -357,7 +357,7 @@
+ 		"default" : "",
+ 		"order": 1,
+ 	}
+-	all_opt["auth-url"] = {
++	all_opt["auth_url"] = {
+ 		"getopt" : "k:",
+ 		"longopt" : "auth-url",
+ 		"help" : "-k, --auth-url=[url]           Keystone Admin Auth URL",
+@@ -366,7 +366,7 @@
+ 		"default" : "",
+ 		"order": 1,
+ 	}
+-	all_opt["region-name"] = {
++	all_opt["region_name"] = {
+ 		"getopt" : "",
+ 		"longopt" : "region-name",
+ 		"help" : "--region-name=[region]         Region Name",
+@@ -392,7 +392,7 @@
+ 		"shortdesc" : "DNS domain in which hosts live",
+ 		"order": 5,
+ 	}
+-	all_opt["record-only"] = {
++	all_opt["record_only"] = {
+ 		"getopt" : "r:",
+ 		"longopt" : "record-only",
+ 		"help" : "--record-only                  Record the target as needing evacuation but as yet do not intiate it",
+@@ -401,7 +401,7 @@
+ 		"default" : "False",
+ 		"order": 5,
+ 	}
+-	all_opt["instance-filtering"] = {
++	all_opt["instance_filtering"] = {
+ 		"getopt" : "",
+ 		"longopt" : "instance-filtering",
+ 		"help" : "--instance-filtering           Allow instances created from images and flavors with evacuable=true to be evacuated (or all if no images/flavors have been tagged)",
+@@ -410,7 +410,7 @@
+ 		"default" : "True",
+ 		"order": 5,
+ 	}
+-	all_opt["no-shared-storage"] = {
++	all_opt["no_shared_storage"] = {
+ 		"getopt" : "",
+ 		"longopt" : "no-shared-storage",
+ 		"help" : "--no-shared-storage            Disable functionality for shared storage",
+@@ -424,9 +424,9 @@
+ 	global override_status
+ 	atexit.register(atexit_handler)
+ 
+-	device_opt = ["login", "passwd", "tenant-name", "auth-url", "fabric_fencing", "on_target",
+-		"no_login", "no_password", "port", "domain", "no-shared-storage", "endpoint-type",
+-		"record-only", "instance-filtering", "insecure", "region-name"]
++	device_opt = ["login", "passwd", "tenant_name", "auth_url", "fabric_fencing",
++		"no_login", "no_password", "port", "domain", "no_shared_storage", "endpoint_type",
++		"record_only", "instance_filtering", "insecure", "region_name"]
+ 	define_new_opts()
+ 	all_opt["shell_timeout"]["default"] = "180"
+ 
+--- a/fence/agents/scsi/fence_scsi.py
++++ b/fence/agents/scsi/fence_scsi.py
+@@ -332,7 +332,7 @@
+ 		"shortdesc" : "Log output (stdout and stderr) to file",
+ 		"order": 5
+ 	}
+-	all_opt["corosync-cmap_path"] = {
++	all_opt["corosync_cmap_path"] = {
+ 		"getopt" : ":",
+ 		"longopt" : "corosync-cmap-path",
+ 		"help" : "--corosync-cmap-path=[path]    Path to corosync-cmapctl binary",
+@@ -416,7 +416,7 @@
+ 	atexit.register(atexit_handler)
+ 
+ 	device_opt = ["no_login", "no_password", "devices", "nodename", "key",\
+-	"aptpl", "fabric_fencing", "on_target", "corosync-cmap_path",\
++	"aptpl", "fabric_fencing", "on_target", "corosync_cmap_path",\
+ 	"sg_persist_path", "sg_turs_path", "logfile", "vgs_path", "force_on"]
+ 
+ 	define_new_opts()
diff --git a/debian/patches/lp1865523-03-Maintain-ABI-compatibility.patch b/debian/patches/lp1865523-03-Maintain-ABI-compatibility.patch
new file mode 100644
index 0000000..2c8a0f1
--- /dev/null
+++ b/debian/patches/lp1865523-03-Maintain-ABI-compatibility.patch
@@ -0,0 +1,30 @@
+Description: Maintain ABI compatibility for external agents
+
+    [Rafael David Tinoco]
+    1. Keep compatibility after changing fencing arguments from '-' to '_' in
+       previous patches. This is the change that allows other components to
+       continue passing stding arguments with '-' without breaking
+       functionalities (XML also accepts both versions).
+
+Origin: upstream, https://github.com/ClusterLabs/fence-agents/commit/c6f29a6531
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865523
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-03-13
+---
+ fence/agents/lib/fencing.py.py | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+--- a/fence/agents/lib/fencing.py.py
++++ b/fence/agents/lib/fencing.py.py
+@@ -1326,6 +1326,11 @@
+ 		if name in mapping_longopt_names:
+ 			name = mapping_longopt_names[name]
+ 
++		if name.replace("-", "_") in mapping_longopt_names:
++			name = mapping_longopt_names[name.replace("-", "_")]
++		elif name.replace("_", "-") in mapping_longopt_names:
++			name = mapping_longopt_names[name.replace("_", "-")]
++
+ 		if avail_opt.count(name) == 0 and name in ["nodename"]:
+ 			continue
+ 		elif avail_opt.count(name) == 0:
diff --git a/debian/patches/lp1865523-04-fence_scsi-Remove-period.patch b/debian/patches/lp1865523-04-fence_scsi-Remove-period.patch
new file mode 100644
index 0000000..d167010
--- /dev/null
+++ b/debian/patches/lp1865523-04-fence_scsi-Remove-period.patch
@@ -0,0 +1,26 @@
+Description: Low: fence_scsi: Remove period from cmd string
+
+Changes `corosync-cmapctl nodelist.` to `corosync-cmapctl nodelist`.
+Existing version works fine in my testing, so this is a simple typo
+cleanup.
+
+Origin: upstream, https://github.com/ClusterLabs/fence-agents/commit/746fd55b0
+Bug: https://github.com/ClusterLabs/fence-agents/pull/193
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865523
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-03-13
+---
+ fence/agents/scsi/fence_scsi.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/fence/agents/scsi/fence_scsi.py
++++ b/fence/agents/scsi/fence_scsi.py
+@@ -186,7 +186,7 @@
+ 
+ 
+ def get_node_id(options):
+-	cmd = options["--corosync-cmap-path"] + " nodelist."
++	cmd = options["--corosync-cmap-path"] + " nodelist"
+ 
+ 	match = re.search(r".(\d).ring._addr \(str\) = " + options["--nodename"] + "\n", run_cmd(options, cmd)["out"])
+ 	return match.group(1) if match else fail_usage("Failed: unable to parse output of corosync-cmapctl or node does not exist")
diff --git a/debian/patches/lp1865523-05-fence_scsi-fix-python3-encoding.patch b/debian/patches/lp1865523-05-fence_scsi-fix-python3-encoding.patch
new file mode 100644
index 0000000..60a46b5
--- /dev/null
+++ b/debian/patches/lp1865523-05-fence_scsi-fix-python3-encoding.patch
@@ -0,0 +1,35 @@
+Description: fence_scsi: fix python3 encoding error #206
+
+File "/usr/sbin/fence_scsi", line 184, in get_cluster_id
+  return hashlib.md5(match.group(1)).hexdigest()
+TypeError: Unicode-objects must be encoded before hashing
+
+    [Rafael David Tinoco]
+    1. Original version of this patch depends on "fence_scsi: add FIPS support"
+       commit, not backported in this patchset. This version address the same
+       issue without the FIPS workaround.
+
+Origin: backport, https://github.com/ClusterLabs/fence-agents/commit/335aca4e54
+Bug: https://github.com/ClusterLabs/fence-agents/pull/207
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865523
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-03-13
+---
+ fence/agents/scsi/fence_scsi.py | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+--- a/fence/agents/scsi/fence_scsi.py
++++ b/fence/agents/scsi/fence_scsi.py
+@@ -182,8 +182,11 @@
+ 	cmd = options["--corosync-cmap-path"] + " totem.cluster_name"
+ 
+ 	match = re.search(r"\(str\) = (\S+)\n", run_cmd(options, cmd)["out"])
+-	return hashlib.md5(match.group(1)).hexdigest() if match else fail_usage("Failed: cannot get cluster name")
+ 
++	if not match:
++		fail_usage("Failed: cannot get cluster name")
++
++	return hashlib.md5(match.group(1).encode('ascii')).hexdigest()
+ 
+ def get_node_id(options):
+ 	cmd = options["--corosync-cmap-path"] + " nodelist"
diff --git a/debian/patches/lp1865523-06-fence_scsi-fixes-around-node-id.patch b/debian/patches/lp1865523-06-fence_scsi-fixes-around-node-id.patch
new file mode 100644
index 0000000..cdb8a4c
--- /dev/null
+++ b/debian/patches/lp1865523-06-fence_scsi-fixes-around-node-id.patch
@@ -0,0 +1,123 @@
+Description: fence_scsi: fix plug-parameter and keep support for nodename to
+ avoid regressions
+
+    [Rafael David Tinoco]
+    1. All metadata changes (tests/data/metadata/*.xml) will have to be
+       re-done at the end of this patchset, so they were removed from this
+       patch on purpose.
+
+Origin: backport, https://github.com/ClusterLabs/fence-agents/commit/bec154345
+Bug: https://github.com/ClusterLabs/fence-agents/pull/196
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865523
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-03-13
+
+AND
+
+Description: fence_scsi: fix incorrect SCSI key when node ID is 10 or higher
+
+The last four digits of the SCSI key will be zero padded digit
+between 0000-0009.
+
+Origin: upstream, https://github.com/ClusterLabs/fence-agents/commit/f77297b654
+Bug: https://github.com/ClusterLabs/fence-agents/pull/249
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865523
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-03-13
+
+AND
+
+Description: fence_scsi: detect node ID using new format, and fallback to old
+ format before failing
+
+Origin: upstream, https://github.com/ClusterLabs/fence-agents/commit/1c4a64ca80
+Bug: https://github.com/ClusterLabs/fence-agents/pull/273
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865523
+Reviewed-by: Rafael David Tinoco <[e-mail]>
+Last-Update: 2020-03-13
+
+---
+ fence/agents/scsi/fence_scsi.py | 35 ++++++++++++++++++++++++---------
+ 1 file changed, 26 insertions(+), 9 deletions(-)
+
+--- a/fence/agents/scsi/fence_scsi.py
++++ b/fence/agents/scsi/fence_scsi.py
+@@ -190,8 +190,14 @@
+ 
+ def get_node_id(options):
+ 	cmd = options["--corosync-cmap-path"] + " nodelist"
++	out = run_cmd(options, cmd)["out"]
++
++	match = re.search(r".(\d+).name \(str\) = " + options["--plug"] + "\n", out)
++
++	# try old format before failing
++	if not match:
++		match = re.search(r".(\d+).ring._addr \(str\) = " + options["--plug"] + "\n", out)
+ 
+-	match = re.search(r".(\d).ring._addr \(str\) = " + options["--nodename"] + "\n", run_cmd(options, cmd)["out"])
+ 	return match.group(1) if match else fail_usage("Failed: unable to parse output of corosync-cmapctl or node does not exist")
+ 
+ 
+@@ -299,13 +305,11 @@
+ 		"order": 1
+ 	}
+ 	all_opt["nodename"] = {
+-		"getopt" : "n:",
++		"getopt" : ":",
+ 		"longopt" : "nodename",
+-		"help" : "-n, --nodename=[nodename]      Name of the node to be fenced",
++		"help" : "",
+ 		"required" : "0",
+-		"shortdesc" : "Name of the node to be fenced. The node name is used to \
+-generate the key value used for the current operation. This option will be \
+-ignored when used with the -k option.",
++		"shortdesc" : "",
+ 		"order": 1
+ 	}
+ 	all_opt["key"] = {
+@@ -418,14 +422,19 @@
+ 
+ 	atexit.register(atexit_handler)
+ 
+-	device_opt = ["no_login", "no_password", "devices", "nodename", "key",\
+-	"aptpl", "fabric_fencing", "on_target", "corosync_cmap_path",\
++	device_opt = ["no_login", "no_password", "devices", "nodename", "port",\
++	"no_port", "key", "aptpl", "fabric_fencing", "on_target", "corosync_cmap_path",\
+ 	"sg_persist_path", "sg_turs_path", "logfile", "vgs_path", "force_on"]
+ 
+ 	define_new_opts()
+ 
+ 	all_opt["delay"]["getopt"] = "H:"
+ 
++	all_opt["port"]["help"] = "-n, --plug=[nodename]          Name of the node to be fenced"
++	all_opt["port"]["shortdesc"] = "Name of the node to be fenced. The node name is used to \
++generate the key value used for the current operation. This option will be \
++ignored when used with the -k option."
++
+ 	#fence_scsi_check
+ 	if os.path.basename(sys.argv[0]) == "fence_scsi_check":
+ 		sys.exit(scsi_check())
+@@ -434,6 +443,9 @@
+ 
+ 	options = check_input(device_opt, process_input(device_opt), other_conditions=True)
+ 
++	# hack to remove list/list-status actions which are not supported
++	options["device_opt"] = [ o for o in options["device_opt"] if o != "separator" ]
++
+ 	docs = {}
+ 	docs["shortdesc"] = "Fence agent for SCSI persistent reservation"
+ 	docs["longdesc"] = "fence_scsi is an I/O fencing agent that uses SCSI-3 \
+@@ -470,7 +482,12 @@
+ 	if options["--action"] == "monitor":
+ 		sys.exit(do_action_monitor(options))
+ 
+-	if not (("--nodename" in options and options["--nodename"])\
++	# workaround to avoid regressions
++	if "--nodename" in options and options["--nodename"]:
++		options["--plug"] = options["--nodename"]
++		del options["--nodename"]
++
++	if not (("--plug" in options and options["--plug"])\
+ 	or ("--key" in options and options["--key"])):
+ 		fail_usage("Failed: nodename or key is required", stop_after_error)
+ 
diff --git a/debian/patches/lp1865523-07-fence-metadata-update.xml b/debian/patches/lp1865523-07-fence-metadata-update.xml
new file mode 100644
index 0000000..d017d6f
--- /dev/null
+++ b/debian/patches/lp1865523-07-fence-metadata-update.xml
@@ -0,0 +1,5441 @@
+Description: update metadata for all fence agents
+
+Because of the following patches:
+
+  1. fence_scsi: fix plug-parameter and keep support for nodename to
+     avoid regressions.
+  2. fix for ignored options.
+  3. fencing: Add consistency between command-line and STDIN arguments.
+
+included in this patchset, in order for the build to work there is a
+need of updating all existing XML files describing each fence agent
+metadata.
+
+Despite the size of this change, the real reason of so many metadata
+changes is:
+
+  1. Inclusion of the "plug" argument (or XML element)
+  2. Renaming of all arguments containing "-" by "_"
+
+and both changes accept previous and newer argument forms, keeping
+compatibility with any other external tools calling the fence-agent
+directly - and passing arguments either through stdin or cmdline -
+and, specially, with pacemaker included in this same release.
+
+Signed-off-by: Rafael David Tinoco <[e-mail]>
+
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1865523
+Forwarded: not-needed
+Last-Update: 2020-03-13
+---
+ tests/data/metadata/fence_alom.xml           | 56 ++++++++++++++---
+ tests/data/metadata/fence_amt.xml            | 42 +++++++++++--
+ tests/data/metadata/fence_apc.xml            | 56 ++++++++++++++---
+ tests/data/metadata/fence_apc_snmp.xml       | 42 +++++++++++--
+ tests/data/metadata/fence_azure_arm.xml      | 35 +++++++++--
+ tests/data/metadata/fence_bladecenter.xml    | 56 ++++++++++++++---
+ tests/data/metadata/fence_brocade.xml        | 56 ++++++++++++++---
+ tests/data/metadata/fence_cisco_mds.xml      | 42 +++++++++++--
+ tests/data/metadata/fence_cisco_ucs.xml      | 42 +++++++++++--
+ tests/data/metadata/fence_compute.xml        | 51 ++++++++++++----
+ tests/data/metadata/fence_docker.xml         | 21 ++++++-
+ tests/data/metadata/fence_drac.xml           | 49 ++++++++++++---
+ tests/data/metadata/fence_drac5.xml          | 56 ++++++++++++++---
+ tests/data/metadata/fence_dummy.xml          |  7 ++-
+ tests/data/metadata/fence_eaton_snmp.xml     | 42 +++++++++++--
+ tests/data/metadata/fence_emerson.xml        | 42 +++++++++++--
+ tests/data/metadata/fence_eps.xml            | 49 ++++++++++++---
+ tests/data/metadata/fence_hds_cb.xml         | 56 ++++++++++++++---
+ tests/data/metadata/fence_hpblade.xml        | 56 ++++++++++++++---
+ tests/data/metadata/fence_ibmblade.xml       | 42 +++++++++++--
+ tests/data/metadata/fence_idrac.xml          | 49 ++++++++++++---
+ tests/data/metadata/fence_ifmib.xml          | 42 +++++++++++--
+ tests/data/metadata/fence_ilo.xml            | 49 ++++++++++++---
+ tests/data/metadata/fence_ilo2.xml           | 49 ++++++++++++---
+ tests/data/metadata/fence_ilo3.xml           | 49 ++++++++++++---
+ tests/data/metadata/fence_ilo3_ssh.xml       | 56 ++++++++++++++---
+ tests/data/metadata/fence_ilo4.xml           | 49 ++++++++++++---
+ tests/data/metadata/fence_ilo4_ssh.xml       | 56 ++++++++++++++---
+ tests/data/metadata/fence_ilo_moonshot.xml   | 56 ++++++++++++++---
+ tests/data/metadata/fence_ilo_mp.xml         | 56 ++++++++++++++---
+ tests/data/metadata/fence_ilo_ssh.xml        | 56 ++++++++++++++---
+ tests/data/metadata/fence_imm.xml            | 49 ++++++++++++---
+ tests/data/metadata/fence_intelmodular.xml   | 42 +++++++++++--
+ tests/data/metadata/fence_ipdu.xml           | 42 +++++++++++--
+ tests/data/metadata/fence_ipmilan.xml        | 49 ++++++++++++---
+ tests/data/metadata/fence_ironic.xml         | 55 ++++++++++++++---
+ tests/data/metadata/fence_kdump.xml          | 51 ++++++++++------
+ tests/data/metadata/fence_ldom.xml           | 56 ++++++++++++++---
+ tests/data/metadata/fence_lpar.xml           | 56 ++++++++++++++---
+ tests/data/metadata/fence_mpath.xml          | 14 ++++-
+ tests/data/metadata/fence_netio.xml          | 42 +++++++++++--
+ tests/data/metadata/fence_ovh.xml            | 35 +++++++++--
+ tests/data/metadata/fence_powerman.xml       | 21 ++++++-
+ tests/data/metadata/fence_pve.xml            | 49 ++++++++++++---
+ tests/data/metadata/fence_raritan.xml        | 42 +++++++++++--
+ tests/data/metadata/fence_rcd_serial.xml     |  7 ++-
+ tests/data/metadata/fence_rhevm.xml          | 42 +++++++++++--
+ tests/data/metadata/fence_rsa.xml            | 56 ++++++++++++++---
+ tests/data/metadata/fence_rsb.xml            | 56 ++++++++++++++---
+ tests/data/metadata/fence_sanbox2.xml        | 49 ++++++++++++---
+ tests/data/metadata/fence_sbd.xml            | 14 ++++-
+ tests/data/metadata/fence_scsi.xml           | 18 ++++--
+ tests/data/metadata/fence_tripplite_snmp.xml | 42 +++++++++++--
+ tests/data/metadata/fence_vbox.xml           | 63 +++++++++++++++++---
+ tests/data/metadata/fence_virsh.xml          | 63 +++++++++++++++++---
+ tests/data/metadata/fence_vmware.xml         | 49 ++++++++++++---
+ tests/data/metadata/fence_vmware_soap.xml    | 42 +++++++++++--
+ tests/data/metadata/fence_wti.xml            | 56 ++++++++++++++---
+ tests/data/metadata/fence_xenapi.xml         | 35 +++++++++--
+ tests/data/metadata/fence_zvmip.xml          | 42 +++++++++++--
+ 60 files changed, 2299 insertions(+), 403 deletions(-)
+
+--- a/tests/data/metadata/fence_alom.xml
++++ b/tests/data/metadata/fence_alom.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;sc\\&gt;\\ &apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;sc\\&gt;\\ &apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="22"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="0" deprecated="1">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean" default="1"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean" default="1"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -68,6 +98,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -78,7 +113,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_amt.xml
++++ b/tests/data/metadata/fence_amt.xml
+@@ -29,7 +29,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -47,17 +52,32 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+@@ -72,7 +92,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+@@ -126,7 +151,12 @@
+ 		<content type="integer" default="1"  />
+ 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+ 	</parameter>
+-	<parameter name="sudo" unique="0" required="0">
++	<parameter name="sudo" unique="0" required="0" deprecated="1">
++		<getopt mixed="--use-sudo" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
++	</parameter>
++	<parameter name="use_sudo" unique="0" required="0" obsoletes="sudo">
+ 		<getopt mixed="--use-sudo" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
+--- a/tests/data/metadata/fence_apc.xml
++++ b/tests/data/metadata/fence_apc.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;\n&gt;&apos;, &apos;\napc&gt;&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;\n&gt;&apos;, &apos;\napc&gt;&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -73,6 +103,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical switch number on device</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -83,7 +118,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_apc_snmp.xml
++++ b/tests/data/metadata/fence_apc_snmp.xml
+@@ -24,7 +24,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -34,22 +39,37 @@
+ 		<content type="integer" default="161"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -98,6 +118,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Specifies SNMP version to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -108,7 +133,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_azure_arm.xml
++++ b/tests/data/metadata/fence_azure_arm.xml
+@@ -8,26 +8,46 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="resourceGroup" unique="0" required="1">
+ 		<getopt mixed="--resourceGroup=[name]" />
+ 		<content type="string"  />
+@@ -53,7 +73,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_bladecenter.xml
++++ b/tests/data/metadata/fence_bladecenter.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;system&gt;&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;system&gt;&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -68,6 +98,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -78,7 +113,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_brocade.xml
++++ b/tests/data/metadata/fence_brocade.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="off"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;&gt; &apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;&gt; &apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -68,6 +98,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -78,7 +113,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_cisco_mds.xml
++++ b/tests/data/metadata/fence_cisco_mds.xml
+@@ -23,7 +23,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -33,22 +38,37 @@
+ 		<content type="integer" default="161"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -97,6 +117,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Specifies SNMP version to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -107,7 +132,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_cisco_ucs.xml
++++ b/tests/data/metadata/fence_cisco_ucs.xml
+@@ -18,7 +18,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -28,7 +33,7 @@
+ 		<content type="integer" default="80"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -38,17 +43,32 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Disable TLS negotiation and force SSL3.0. This should only be used for devices that do not support TLS1.0 and up.</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -73,6 +93,11 @@
+ 		<content type="string" default=""  />
+ 		<shortdesc lang="en">Additional path needed to access suborganization</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -83,7 +108,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_compute.xml
++++ b/tests/data/metadata/fence_compute.xml
+@@ -8,46 +8,66 @@
+ 		<content type="string" default="off"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="auth-url" unique="0" required="0">
++	<parameter name="auth_url" unique="0" required="0">
+ 		<getopt mixed="-k, --auth-url=[url]" />
+ 		<content type="string" default=""  />
+ 		<shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
+ 	</parameter>
+-	<parameter name="endpoint-type" unique="0" required="0">
++	<parameter name="endpoint_type" unique="0" required="0">
+ 		<getopt mixed="-e, --endpoint-type=[endpoint]" />
+ 		<content type="string" default="internalURL"  />
+ 		<shortdesc lang="en">Nova Endpoint type</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="region-name" unique="0" required="0">
++	<parameter name="region_name" unique="0" required="0">
+ 		<getopt mixed="--region-name=[region]" />
+ 		<content type="boolean" default=""  />
+ 		<shortdesc lang="en">Region Name</shortdesc>
+ 	</parameter>
+-	<parameter name="tenant-name" unique="0" required="0">
++	<parameter name="tenant_name" unique="0" required="0">
+ 		<getopt mixed="-t, --tenant-name=[tenant]" />
+ 		<content type="string" default=""  />
+ 		<shortdesc lang="en">Keystone Admin Tenant</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="insecure" unique="0" required="0">
+ 		<getopt mixed="--insecure" />
+ 		<content type="boolean" default="False"  />
+@@ -58,17 +78,17 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">DNS domain in which hosts live</shortdesc>
+ 	</parameter>
+-	<parameter name="instance-filtering" unique="0" required="0">
++	<parameter name="instance_filtering" unique="0" required="0">
+ 		<getopt mixed="--instance-filtering" />
+ 		<content type="boolean" default="True"  />
+ 		<shortdesc lang="en">Allow instances to be evacuated</shortdesc>
+ 	</parameter>
+-	<parameter name="no-shared-storage" unique="0" required="0">
++	<parameter name="no_shared_storage" unique="0" required="0">
+ 		<getopt mixed="--no-shared-storage" />
+ 		<content type="boolean" default="False"  />
+ 		<shortdesc lang="en">Disable functionality for dealing with shared storage</shortdesc>
+ 	</parameter>
+-	<parameter name="record-only" unique="0" required="0">
++	<parameter name="record_only" unique="0" required="0">
+ 		<getopt mixed="--record-only" />
+ 		<content type="string" default="False"  />
+ 		<shortdesc lang="en">Only record the target as needing evacuation</shortdesc>
+@@ -83,7 +103,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+@@ -135,7 +160,7 @@
+ 	</parameter>
+ </parameters>
+ <actions>
+-	<action name="on" on_target="1" automatic="1"/>
++	<action name="on" automatic="1"/>
+ 	<action name="off" />
+ 	<action name="status" />
+ 	<action name="list" />
+--- a/tests/data/metadata/fence_docker.xml
++++ b/tests/data/metadata/fence_docker.xml
+@@ -18,7 +18,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -36,7 +41,12 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -86,7 +96,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_drac.xml
++++ b/tests/data/metadata/fence_drac.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;\\[username\\]# &apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;\\[username\\]# &apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -23,7 +28,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -33,26 +43,46 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+ 	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -63,7 +93,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_drac5.xml
++++ b/tests/data/metadata/fence_drac5.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;\\$&apos;, &apos;DRAC\\/MC:&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;\\$&apos;, &apos;DRAC\\/MC:&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -37,7 +42,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -47,27 +57,47 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -77,6 +107,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -87,7 +122,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_dummy.xml
++++ b/tests/data/metadata/fence_dummy.xml
+@@ -33,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_eaton_snmp.xml
++++ b/tests/data/metadata/fence_eaton_snmp.xml
+@@ -23,7 +23,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -33,22 +38,37 @@
+ 		<content type="integer" default="161"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -97,6 +117,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Specifies SNMP version to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -107,7 +132,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_emerson.xml
++++ b/tests/data/metadata/fence_emerson.xml
+@@ -23,7 +23,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -33,22 +38,37 @@
+ 		<content type="integer" default="161"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -97,6 +117,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Specifies SNMP version to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -107,7 +132,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_eps.xml
++++ b/tests/data/metadata/fence_eps.xml
+@@ -10,7 +10,7 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="hidden_page" unique="0" required="0">
++	<parameter name="hidden_page" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-c, --page=[page]" />
+ 		<content type="string" default="hidden.htm"  />
+ 		<shortdesc lang="en">Name of hidden page</shortdesc>
+@@ -25,7 +25,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -35,26 +40,51 @@
+ 		<content type="integer" default="80"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="page" unique="0" required="0" obsoletes="hidden_page">
++		<getopt mixed="-c, --page=[page]" />
++		<content type="string" default="hidden.htm"  />
++		<shortdesc lang="en">Name of hidden page</shortdesc>
++	</parameter>
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -65,7 +95,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_hds_cb.xml
++++ b/tests/data/metadata/fence_hds_cb.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;\\) :&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;\\) :&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -68,6 +98,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -78,7 +113,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_hpblade.xml
++++ b/tests/data/metadata/fence_hpblade.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;c7000oa&gt;&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;c7000oa&gt;&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -68,6 +98,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -78,7 +113,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ibmblade.xml
++++ b/tests/data/metadata/fence_ibmblade.xml
+@@ -23,7 +23,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -33,22 +38,37 @@
+ 		<content type="integer" default="161"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -97,6 +117,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Specifies SNMP version to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -107,7 +132,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_idrac.xml
++++ b/tests/data/metadata/fence_idrac.xml
+@@ -36,7 +36,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -51,7 +56,7 @@
+ 		<content type="boolean" default="0"  />
+ 		<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -64,17 +69,32 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+@@ -89,6 +109,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -99,7 +124,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+@@ -153,7 +183,12 @@
+ 		<content type="integer" default="1"  />
+ 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+ 	</parameter>
+-	<parameter name="sudo" unique="0" required="0">
++	<parameter name="sudo" unique="0" required="0" deprecated="1">
++		<getopt mixed="--use-sudo" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
++	</parameter>
++	<parameter name="use_sudo" unique="0" required="0" obsoletes="sudo">
+ 		<getopt mixed="--use-sudo" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
+--- a/tests/data/metadata/fence_ifmib.xml
++++ b/tests/data/metadata/fence_ifmib.xml
+@@ -25,7 +25,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -35,22 +40,37 @@
+ 		<content type="integer" default="161"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -99,6 +119,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Specifies SNMP version to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -109,7 +134,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ilo.xml
++++ b/tests/data/metadata/fence_ilo.xml
+@@ -19,7 +19,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -29,7 +34,7 @@
+ 		<content type="integer" default="443"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -39,22 +44,42 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Disable TLS negotiation and force SSL3.0. This should only be used for devices that do not support TLS1.0 and up.</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+ 	</parameter>
+-	<parameter name="ribcl" unique="0" required="0">
++	<parameter name="ribcl" unique="0" required="0" deprecated="1">
++		<getopt mixed="-r, --ribcl-version=[version]" />
++		<content type="string"  />
++		<shortdesc lang="en">Force ribcl version to use</shortdesc>
++	</parameter>
++	<parameter name="ribcl_version" unique="0" required="0" obsoletes="ribcl">
+ 		<getopt mixed="-r, --ribcl-version=[version]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Force ribcl version to use</shortdesc>
+@@ -79,6 +104,11 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Disable TLS negotiation and force TLS1.0. This should only be used for devices that do not support TLS1.1 and up.</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -89,7 +119,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ilo2.xml
++++ b/tests/data/metadata/fence_ilo2.xml
+@@ -19,7 +19,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -29,7 +34,7 @@
+ 		<content type="integer" default="443"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -39,22 +44,42 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Disable TLS negotiation and force SSL3.0. This should only be used for devices that do not support TLS1.0 and up.</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+ 	</parameter>
+-	<parameter name="ribcl" unique="0" required="0">
++	<parameter name="ribcl" unique="0" required="0" deprecated="1">
++		<getopt mixed="-r, --ribcl-version=[version]" />
++		<content type="string"  />
++		<shortdesc lang="en">Force ribcl version to use</shortdesc>
++	</parameter>
++	<parameter name="ribcl_version" unique="0" required="0" obsoletes="ribcl">
+ 		<getopt mixed="-r, --ribcl-version=[version]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Force ribcl version to use</shortdesc>
+@@ -79,6 +104,11 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Disable TLS negotiation and force TLS1.0. This should only be used for devices that do not support TLS1.1 and up.</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -89,7 +119,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ilo3.xml
++++ b/tests/data/metadata/fence_ilo3.xml
+@@ -36,7 +36,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -51,7 +56,7 @@
+ 		<content type="boolean" default="1"  />
+ 		<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -64,17 +69,32 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+@@ -89,6 +109,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -99,7 +124,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+@@ -153,7 +183,12 @@
+ 		<content type="integer" default="1"  />
+ 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+ 	</parameter>
+-	<parameter name="sudo" unique="0" required="0">
++	<parameter name="sudo" unique="0" required="0" deprecated="1">
++		<getopt mixed="--use-sudo" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
++	</parameter>
++	<parameter name="use_sudo" unique="0" required="0" obsoletes="sudo">
+ 		<getopt mixed="--use-sudo" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
+--- a/tests/data/metadata/fence_ilo3_ssh.xml
++++ b/tests/data/metadata/fence_ilo3_ssh.xml
+@@ -10,7 +10,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -30,7 +35,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -40,7 +50,7 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -53,22 +63,42 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="0" deprecated="1">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -78,6 +108,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -88,7 +123,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ilo4.xml
++++ b/tests/data/metadata/fence_ilo4.xml
+@@ -36,7 +36,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -51,7 +56,7 @@
+ 		<content type="boolean" default="1"  />
+ 		<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -64,17 +69,32 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+@@ -89,6 +109,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -99,7 +124,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+@@ -153,7 +183,12 @@
+ 		<content type="integer" default="1"  />
+ 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+ 	</parameter>
+-	<parameter name="sudo" unique="0" required="0">
++	<parameter name="sudo" unique="0" required="0" deprecated="1">
++		<getopt mixed="--use-sudo" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
++	</parameter>
++	<parameter name="use_sudo" unique="0" required="0" obsoletes="sudo">
+ 		<getopt mixed="--use-sudo" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
+--- a/tests/data/metadata/fence_ilo4_ssh.xml
++++ b/tests/data/metadata/fence_ilo4_ssh.xml
+@@ -10,7 +10,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -30,7 +35,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -40,7 +50,7 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -53,22 +63,42 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="0" deprecated="1">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -78,6 +108,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -88,7 +123,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ilo_moonshot.xml
++++ b/tests/data/metadata/fence_ilo_moonshot.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="22"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean" default="1"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean" default="1"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -68,6 +98,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -78,7 +113,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ilo_mp.xml
++++ b/tests/data/metadata/fence_ilo_mp.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="0" deprecated="1">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -68,6 +98,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -78,7 +113,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ilo_ssh.xml
++++ b/tests/data/metadata/fence_ilo_ssh.xml
+@@ -10,7 +10,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;MP&gt;&apos;, &apos;hpiLO-&gt;&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -30,7 +35,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -40,7 +50,7 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -53,22 +63,42 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="0" deprecated="1">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -78,6 +108,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -88,7 +123,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_imm.xml
++++ b/tests/data/metadata/fence_imm.xml
+@@ -36,7 +36,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -51,7 +56,7 @@
+ 		<content type="boolean" default="0"  />
+ 		<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -64,17 +69,32 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+@@ -89,6 +109,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -99,7 +124,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+@@ -153,7 +183,12 @@
+ 		<content type="integer" default="1"  />
+ 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+ 	</parameter>
+-	<parameter name="sudo" unique="0" required="0">
++	<parameter name="sudo" unique="0" required="0" deprecated="1">
++		<getopt mixed="--use-sudo" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
++	</parameter>
++	<parameter name="use_sudo" unique="0" required="0" obsoletes="sudo">
+ 		<getopt mixed="--use-sudo" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
+--- a/tests/data/metadata/fence_intelmodular.xml
++++ b/tests/data/metadata/fence_intelmodular.xml
+@@ -25,7 +25,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -35,22 +40,37 @@
+ 		<content type="integer" default="161"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -99,6 +119,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Specifies SNMP version to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -109,7 +134,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ipdu.xml
++++ b/tests/data/metadata/fence_ipdu.xml
+@@ -23,7 +23,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -33,22 +38,37 @@
+ 		<content type="integer" default="161"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -97,6 +117,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Specifies SNMP version to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -107,7 +132,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ipmilan.xml
++++ b/tests/data/metadata/fence_ipmilan.xml
+@@ -36,7 +36,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -51,7 +56,7 @@
+ 		<content type="boolean" default="0"  />
+ 		<shortdesc lang="en">Use Lanplus to improve security of connection</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="0">
++	<parameter name="login" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -64,17 +69,32 @@
+ 		</content>
+ 		<shortdesc lang="en">Method to fence</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+@@ -89,6 +109,11 @@
+ 		</content>
+ 		<shortdesc lang="en">Privilege level on IPMI device</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="0" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -99,7 +124,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+@@ -153,7 +183,12 @@
+ 		<content type="integer" default="1"  />
+ 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+ 	</parameter>
+-	<parameter name="sudo" unique="0" required="0">
++	<parameter name="sudo" unique="0" required="0" deprecated="1">
++		<getopt mixed="--use-sudo" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
++	</parameter>
++	<parameter name="use_sudo" unique="0" required="0" obsoletes="sudo">
+ 		<getopt mixed="--use-sudo" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
+--- a/tests/data/metadata/fence_ironic.xml
++++ b/tests/data/metadata/fence_ironic.xml
+@@ -8,36 +8,66 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="auth-url" unique="0" required="1">
++	<parameter name="auth-url" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="--auth-url=[authurl]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="auth_url" unique="0" required="1" obsoletes="auth-url">
++		<getopt mixed="--auth-url=[authurl]" />
++		<content type="string"  />
++		<shortdesc lang="en">Keystone Admin Auth URL</shortdesc>
++	</parameter>
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="tenant-name" unique="0" required="0">
++	<parameter name="tenant-name" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-t, --tenant-name=[tenant]" />
+ 		<content type="string" default="admin"  />
+ 		<shortdesc lang="en">Keystone Admin Tenant</shortdesc>
+ 	</parameter>
++	<parameter name="tenant_name" unique="0" required="0" obsoletes="tenant-name">
++		<getopt mixed="-t, --tenant-name=[tenant]" />
++		<content type="string" default="admin"  />
++		<shortdesc lang="en">Keystone Admin Tenant</shortdesc>
++	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -48,7 +78,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+@@ -78,11 +113,15 @@
+ 		<content type="second" default="5"  />
+ 		<shortdesc lang="en">Wait X seconds for cmd prompt after login</shortdesc>
+ 	</parameter>
+-	<parameter name="openstack-path" unique="0" required="0">
++	<parameter name="openstack-path" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="--openstack-path=[path]" />
+ 		<content type="string" default="/usr/bin/openstack"  />
+ 		<shortdesc lang="en">Path to the OpenStack binary</shortdesc>
+ 	</parameter>
++	<parameter name="openstack_path" unique="0" required="0" obsoletes="openstack-path">
++		<getopt mixed="--openstack-path=[path]" />
++		<shortdesc lang="en">Path to the OpenStack binary</shortdesc>
++	</parameter>
+ 	<parameter name="power_timeout" unique="0" required="0">
+ 		<getopt mixed="--power-timeout=[seconds]" />
+ 		<content type="second" default="20"  />
+--- a/tests/data/metadata/fence_kdump.xml
++++ b/tests/data/metadata/fence_kdump.xml
+@@ -1,37 +1,54 @@
+ <?xml version="1.0" ?>
+-<resource-agent name="fence_kdump" shortdesc="Fence agent for use with kdump">
+-<longdesc>The fence_kdump agent is intended to be used with with kdump service.</longdesc>
++<resource-agent name="fence_kdump" shortdesc="fencing agent for use with kdump crash recovery service">
++<longdesc>\fIfence_kdump\fP is an I/O fencing agent to be used with the kdump
++crash recovery service. When the \fIfence_kdump\fP agent is invoked,
++it will listen for a message from the failed node that acknowledges
++that the failed node it executing the kdump crash kernel.
++Note that \fIfence_kdump\fP is not a replacement for traditional
++fencing methods. The \fIfence_kdump\fP agent can only detect that a
++node has entered the kdump crash recovery service. This allows the
++kdump crash recovery service complete without being preempted by
++traditional power fencing methods.
++
++Note: the "off" action listen for message from failed node that
++acknowledges node has entered kdump crash recovery service. If a valid
++message is received from the failed node, the node is considered to be
++fenced and the agent returns success. Failure to receive a valid
++message from the failed node in the given timeout period results in
++fencing failure.</longdesc>
+ <vendor-url>http://www.kernel.org/pub/linux/utils/kernel/kexec/</vendor-url>
+ <parameters>
+ 	<parameter name="nodename" unique="0" required="0">
+-		<getopt mixed="-n, --nodename" />
++		<getopt mixed="-n, --nodename=\fINODE\fP" />
+ 		<content type="string" />
+-		<shortdesc lang="en">Name or IP address of node to be fenced</shortdesc>
++		<shortdesc lang="en">Name or IP address of node to be fenced. This option is required for
++the "off" action.</shortdesc>
+ 	</parameter>
+ 	<parameter name="ipport" unique="0" required="0">
+-		<getopt mixed="-p, --ipport" />
++		<getopt mixed="-p, --ipport=\fIPORT\fP" />
+ 		<content type="string" default="7410" />
+-		<shortdesc lang="en">Port number</shortdesc>
++		<shortdesc lang="en">IP port number that the \fIfence_kdump\fP agent will use to listen for
++messages.</shortdesc>
+ 	</parameter>
+ 	<parameter name="family" unique="0" required="0">
+-		<getopt mixed="-f, --family" />
++		<getopt mixed="-f, --family=\fIFAMILY\fP" />
+ 		<content type="string" default="auto" />
+-		<shortdesc lang="en">Network family</shortdesc>
++		<shortdesc lang="en">IP network family. Force the \fIfence_kdump\fP agent to use a specific
++family. The value for \fIFAMILY\fP can be "auto", "ipv4", or
++"ipv6".</shortdesc>
+ 	</parameter>
+ 	<parameter name="action" unique="0" required="0">
+-		<getopt mixed="-o, --action" />
++		<getopt mixed="-o, --action=\fIACTION\fP" />
+ 		<content type="string" default="off" />
+-		<shortdesc lang="en">Fencing action</shortdesc>
++		<shortdesc lang="en">Fencing action to perform. The value for \fIACTION\fP can be either
++"off" or "metadata".</shortdesc>
+ 	</parameter>
+ 	<parameter name="timeout" unique="0" required="0">
+-		<getopt mixed="-t, --timeout" />
++		<getopt mixed="-t, --timeout=\fITIMEOUT\fP" />
+ 		<content type="string" default="60" />
+-		<shortdesc lang="en">Timeout in seconds</shortdesc>
+-	</parameter>
+-	<parameter name="quiet" unique="0" required="0">
+-		<getopt mixed="-q, --quiet" />
+-		<content type="boolean"  />
+-		<shortdesc lang="en">Disable logging to stderr. Does not affect --verbose or --debug logging to syslog.</shortdesc>
++		<shortdesc lang="en">Number of seconds to wait for message from failed node. If no message
++is received within \fITIMEOUT\fP seconds, the \fIfence_kdump\fP agent
++returns failure.</shortdesc>
+ 	</parameter>
+ 	<parameter name="verbose" unique="0" required="0">
+ 		<getopt mixed="-v, --verbose" />
+--- a/tests/data/metadata/fence_ldom.xml
++++ b/tests/data/metadata/fence_ldom.xml
+@@ -10,7 +10,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;\\ $&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;\\ $&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -30,7 +35,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -40,27 +50,47 @@
+ 		<content type="integer" default="22"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean" default="1"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean" default="1"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -70,6 +100,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -80,7 +115,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_lpar.xml
++++ b/tests/data/metadata/fence_lpar.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;:~&gt;&apos;, &apos;]\\$&apos;, &apos;\\$ &apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;:~&gt;&apos;, &apos;]\\$&apos;, &apos;\\$ &apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -37,7 +42,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -47,7 +57,7 @@
+ 		<content type="integer" default="22"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -57,22 +67,42 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Managed system name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean" default="1"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean" default="1"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -82,6 +112,11 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -92,7 +127,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_mpath.xml
++++ b/tests/data/metadata/fence_mpath.xml
+@@ -29,7 +29,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+@@ -82,7 +87,12 @@
+ 		<content type="integer" default="1"  />
+ 		<shortdesc lang="en">Count of attempts to retry power on</shortdesc>
+ 	</parameter>
+-	<parameter name="sudo" unique="0" required="0">
++	<parameter name="sudo" unique="0" required="0" deprecated="1">
++		<getopt mixed="--use-sudo" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
++	</parameter>
++	<parameter name="use_sudo" unique="0" required="0" obsoletes="sudo">
+ 		<getopt mixed="--use-sudo" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use sudo (without password) when calling 3rd party software</shortdesc>
+--- a/tests/data/metadata/fence_netio.xml
++++ b/tests/data/metadata/fence_netio.xml
+@@ -18,7 +18,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -28,26 +33,46 @@
+ 		<content type="integer" default="1234"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -58,7 +83,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_ovh.xml
++++ b/tests/data/metadata/fence_ovh.xml
+@@ -13,26 +13,46 @@
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Reboot email</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -43,7 +63,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_powerman.xml
++++ b/tests/data/metadata/fence_powerman.xml
+@@ -18,7 +18,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="integer" default="10101"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+@@ -43,7 +53,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_pve.xml
++++ b/tests/data/metadata/fence_pve.xml
+@@ -18,7 +18,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP Address or Hostname of a node within the Proxmox cluster.</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP Address or Hostname of a node within the Proxmox cluster.</shortdesc>
+@@ -28,27 +33,52 @@
+ 		<content type="integer" default="8006"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string" default="root@pam"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Id of the virtual machine.</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Id of the virtual machine.</shortdesc>
+ 	</parameter>
+-	<parameter name="node_name" unique="0" required="0">
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string" default="root@pam"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
++	<parameter name="node_name" unique="0" required="0" deprecated="1">
++		<getopt mixed="-N, --nodename" />
++		<content type="string"  />
++		<shortdesc lang="en">Node on which machine is located. (Optional, will be automatically determined)</shortdesc>
++	</parameter>
++	<parameter name="nodename" unique="0" required="0" obsoletes="node_name">
+ 		<getopt mixed="-N, --nodename" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Node on which machine is located. (Optional, will be automatically determined)</shortdesc>
+@@ -63,7 +93,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_raritan.xml
++++ b/tests/data/metadata/fence_raritan.xml
+@@ -18,7 +18,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -28,26 +33,46 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+ 	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -58,7 +83,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_rcd_serial.xml
++++ b/tests/data/metadata/fence_rcd_serial.xml
+@@ -31,7 +31,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_rhevm.xml
++++ b/tests/data/metadata/fence_rhevm.xml
+@@ -18,7 +18,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="1">
++	<parameter name="ip" unique="0" required="1" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -28,7 +33,7 @@
+ 		<content type="integer" default="80"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+@@ -38,17 +43,32 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Disable TLS negotiation and force SSL3.0. This should only be used for devices that do not support TLS1.0 and up.</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="1">
++	<parameter name="plug" unique="0" required="1" obsoletes="port">
++		<getopt mixed="-n, --plug=[id]" />
++		<content type="string"  />
++		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
++	</parameter>
++	<parameter name="port" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-n, --plug=[id]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Physical plug number on device, UUID or identification of machine</shortdesc>
+@@ -73,6 +93,11 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Reuse cookies for authentication</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -83,7 +108,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_rsa.xml
++++ b/tests/data/metadata/fence_rsa.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;&gt;&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;&gt;&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="23"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />
++		<content type="string"  />
++		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
++	</parameter>
++	<parameter name="password" unique="0" required="0" obsoletes="passwd">
+ 		<getopt mixed="-p, --password=[password]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login password or passphrase</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd_script" unique="0" required="0">
++	<parameter name="password_script" unique="0" required="0" obsoletes="passwd_script">
+ 		<getopt mixed="-S, --password-script=[script]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Script to run to retrieve password</shortdesc>
+ 	</parameter>
+-	<parameter name="port" unique="0" required="0">
++	<parameter name="plug" unique="0" required="0" obsoletes="port">
+ 		<getopt mixed="-n, --plug=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
+ 	</parameter>
+-	<parameter name="secure" unique="0" required="0">
++	<parameter name="port" unique="0" required="0" deprecated="1">
++		<getopt mixed="-n, --plug=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device (together with --port-as-ip)</shortdesc>
++	</parameter>
++	<parameter name="secure" unique="0" required="0" deprecated="1">
++		<getopt mixed="-x, --ssh" />
++		<content type="boolean"  />
++		<shortdesc lang="en">Use SSH connection</shortdesc>
++	</parameter>
++	<parameter name="ssh" unique="0" required="0" obsoletes="secure">
+ 		<getopt mixed="-x, --ssh" />
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Use SSH connection</shortdesc>
+@@ -68,6 +98,11 @@
+ 		<content type="string" default="-F /dev/null"  />
+ 		<shortdesc lang="en">SSH options to use</shortdesc>
+ 	</parameter>
++	<parameter name="username" unique="0" required="1" obsoletes="login">
++		<getopt mixed="-l, --username=[name]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login name</shortdesc>
++	</parameter>
+ 	<parameter name="quiet" unique="0" required="0">
+ 		<getopt mixed="-q, --quiet" />
+ 		<content type="boolean"  />
+@@ -78,7 +113,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Verbose mode</shortdesc>
+ 	</parameter>
+-	<parameter name="debug" unique="0" required="0">
++	<parameter name="debug" unique="0" required="0" deprecated="1">
++		<getopt mixed="-D, --debug-file=[debugfile]" />
++		<content type="string"  />
++		<shortdesc lang="en">Write debug information to given file</shortdesc>
++	</parameter>
++	<parameter name="debug_file" unique="0" required="0" obsoletes="debug">
+ 		<getopt mixed="-D, --debug-file=[debugfile]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Write debug information to given file</shortdesc>
+--- a/tests/data/metadata/fence_rsb.xml
++++ b/tests/data/metadata/fence_rsb.xml
+@@ -8,7 +8,12 @@
+ 		<content type="string" default="reboot"  />
+ 		<shortdesc lang="en">Fencing action</shortdesc>
+ 	</parameter>
+-	<parameter name="cmd_prompt" unique="0" required="0">
++	<parameter name="cmd_prompt" unique="0" required="0" deprecated="1">
++		<getopt mixed="-c, --command-prompt=[prompt]" />
++		<content type="string" default="[&apos;to quit:&apos;]"  />
++		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
++	</parameter>
++	<parameter name="command_prompt" unique="0" required="0" obsoletes="cmd_prompt">
+ 		<getopt mixed="-c, --command-prompt=[prompt]" />
+ 		<content type="string" default="[&apos;to quit:&apos;]"  />
+ 		<shortdesc lang="en">Force Python regex for command prompt</shortdesc>
+@@ -28,7 +33,12 @@
+ 		<content type="boolean"  />
+ 		<shortdesc lang="en">Forces agent to use IPv6 addresses only</shortdesc>
+ 	</parameter>
+-	<parameter name="ipaddr" unique="0" required="0">
++	<parameter name="ip" unique="0" required="0" obsoletes="ipaddr">
++		<getopt mixed="-a, --ip=[ip]" />
++		<content type="string"  />
++		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
++	</parameter>
++	<parameter name="ipaddr" unique="0" required="0" deprecated="1">
+ 		<getopt mixed="-a, --ip=[ip]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">IP address or hostname of fencing device</shortdesc>
+@@ -38,27 +48,47 @@
+ 		<content type="integer" default="3172"  />
+ 		<shortdesc lang="en">TCP/UDP port to use for connection with device</shortdesc>
+ 	</parameter>
+-	<parameter name="login" unique="0" required="1">
++	<parameter name="login" unique="0" required="1" deprecated="1">
+ 		<getopt mixed="-l, --username=[name]" />
+ 		<content type="string"  />
+ 		<shortdesc lang="en">Login name</shortdesc>
+ 	</parameter>
+-	<parameter name="passwd" unique="0" required="0">
++	<parameter name="passwd" unique="0" required="0" deprecated="1">
++		<getopt mixed="-p, --password=[password]" />
++		<content type="string"  />
++		<shortdesc lang="en">Login password or passphrase</shortdesc>
++	</parameter>
++	<parameter name="passwd_script" unique="0" required="0" deprecated="1">
++		<getopt mixed="-S, --password-script=[script]" />