Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
emulab-devel
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
143
Issues
143
List
Boards
Labels
Service Desk
Milestones
Merge Requests
6
Merge Requests
6
Operations
Operations
Incidents
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
emulab
emulab-devel
Commits
59b243a2
Commit
59b243a2
authored
Apr 08, 2016
by
Gary Wong
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Automatically configure RF links on sliver creation/deletion.
parent
5e5cb550
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
1 deletion
+18
-1
protogeni/lib/GeniCM.pm.in
protogeni/lib/GeniCM.pm.in
+18
-1
No files found.
protogeni/lib/GeniCM.pm.in
View file @
59b243a2
...
@@ -124,6 +124,7 @@ my $TARINSTALL = "/usr/local/bin/install-tarfile";
...
@@ -124,6 +124,7 @@ my $TARINSTALL = "/usr/local/bin/install-tarfile";
my
$
IMAGE_SETUP
=
"$TB/sbin/image_setup"
;
my
$
IMAGE_SETUP
=
"$TB/sbin/image_setup"
;
my
$
IMAGE_IMPORT
=
"$TB/sbin/image_import"
;
my
$
IMAGE_IMPORT
=
"$TB/sbin/image_import"
;
my
$
SHAREVLAN
=
"$TB/sbin/sharevlan"
;
my
$
SHAREVLAN
=
"$TB/sbin/sharevlan"
;
my
$
RFLINKS
=
"$TB/bin/rflinks"
;
my
$
FWNAME
=
"fw"
;
my
$
FWNAME
=
"fw"
;
my
$
API_VERSION
=
1
;
my
$
API_VERSION
=
1
;
my
$
PROTOGENI_LOCALUSER
=
@
PROTOGENI_LOCALUSER
@;
my
$
PROTOGENI_LOCALUSER
=
@
PROTOGENI_LOCALUSER
@;
...
@@ -4546,7 +4547,13 @@ sub SliverWorkAux($$$$$$$$)
...
@@ -4546,7 +4547,13 @@ sub SliverWorkAux($$$$$$$$)
}
}
GeniXML
::
SetText
(
"vlantag"
,
$
linkref
,
$
tag
);
GeniXML
::
SetText
(
"vlantag"
,
$
linkref
,
$
tag
);
}
}
if
(
!$isupdate ) {
if
(
system
(
"$RFLINKS $pid $eid"
)
)
{
print
STDERR
"Failed to add RF links!
\n
"
;
}
}
#
Set
up
plab
nodes
all
at
once
.
#
Set
up
plab
nodes
all
at
once
.
if
($
needplabslice
&&
@
plabnodes
&&
!$impotent) {
if
($
needplabslice
&&
@
plabnodes
&&
!$impotent) {
my
@
node_ids
=
map
{
$
_
->
node_id
()
}
@
plabnodes
;
my
@
node_ids
=
map
{
$
_
->
node_id
()
}
@
plabnodes
;
...
@@ -4730,6 +4737,11 @@ sub SliverWorkAux($$$$$$$$)
...
@@ -4730,6 +4737,11 @@ sub SliverWorkAux($$$$$$$$)
print
STDERR
"Could not tear down vlans
\n
"
;
print
STDERR
"Could not tear down vlans
\n
"
;
}
}
system
(
"$RFLINKS -r $pid $eid"
);
if
(
$?
)
{
print
STDERR
"Failed to remove RF links
\n
"
;
}
#
Remove
any
residual
state
.
#
Remove
any
residual
state
.
if
($
experiment
->
RemovePhysicalState
(
1
))
{
if
($
experiment
->
RemovePhysicalState
(
1
))
{
print
STDERR
"Could not remove physical state!
\n
"
;
print
STDERR
"Could not remove physical state!
\n
"
;
...
@@ -5086,6 +5098,11 @@ sub DeleteSliverAux($$$)
...
@@ -5086,6 +5098,11 @@ sub DeleteSliverAux($$$)
my
$
eid
=
$
experiment
->
eid
();
my
$
eid
=
$
experiment
->
eid
();
if
(
!$impotent) {
if
(
!$impotent) {
system
(
"$RFLINKS -r $pid $eid"
);
if
($?)
{
print
STDERR
"Could not tear down RF links!
\n
"
;
}
system
(
"$SNMPIT -C -r $pid $eid"
);
system
(
"$SNMPIT -C -r $pid $eid"
);
if
($?)
{
if
($?)
{
print
STDERR
"Could not tear down vlans
\n
"
;
print
STDERR
"Could not tear down vlans
\n
"
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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