Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
46657907
Commit
46657907
authored
Jul 12, 2012
by
Jonathon Duerig
Browse files
Accept both old and new shared-vlan namespaces in requests.
parent
2e837c31
Changes
1
Hide whitespace changes
Inline
Side-by-side
protogeni/lib/GeniXML.pm.in
View file @
46657907
...
...
@@ -46,7 +46,8 @@ our $RSPEC_3_NS = "http://www.geni.net/resources/rspec/3";
our
$
EMULAB_NS
=
"http://www.protogeni.net/resources/rspec/ext/emulab/1"
;
our
$
XSI_NS
=
"http://www.w3.org/2001/XMLSchema-instance"
;
our
$
STITCH_NS
=
"http://hpn.east.isi.edu/rspec/ext/stitch/0.1/"
;
our
$
SHAREDVLAN_NS
=
"http://www.protogeni.net/resources/rspec/ext/shared-vlan/1"
;
our
$
SHAREDVLAN_NS
=
"http://www.geni.net/resources/rspec/ext/shared-vlan/1"
;
our
$
SHAREDVLAN_PG_NS
=
"http://www.protogeni.net/resources/rspec/ext/shared-vlan/1"
;
$
REQUEST_2_URL
=
"http://www.protogeni.net/resources/rspec/2/request.xsd"
;
$
MANIFEST_2_URL
=
"http://www.protogeni.net/resources/rspec/2/manifest.xsd"
;
...
...
@@ -675,7 +676,10 @@ sub GetSharedLanName($)
if
(
! IsVersion0($iface)) {
my
$
interface_name
=
FindNodesNS
(
"n:link_shared_vlan"
,
$
iface
,
$
SHAREDVLAN_NS
)->
pop
();
if
(
! defined($interface_name)) {
$
interface_name
=
FindNodeNS
(
"n:link_shared_vlan"
,
$
iface
,
$
SHAREDVLAN_PG_NS
)->
pop
();
}
if
(
defined
($
interface_name
))
{
my
$
name
=
GetText
(
"name"
,
$
interface_name
);
if
(
defined
($
name
)
and
$
name
ne
""
)
{
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment