Commit 87d32cdd authored by Leigh B Stoller's avatar Leigh B Stoller

Add definitions for fixlannodes option added to test version of

libvtop.
parent 5217b9db
#!/usr/bin/perl -w #!/usr/bin/perl -w
# #
# Copyright (c) 2005-2011 University of Utah and the Flux Group. # Copyright (c) 2005-2011, 2013 University of Utah and the Flux Group.
# #
# {{{EMULAB-LICENSE # {{{EMULAB-LICENSE
# #
...@@ -28,7 +28,7 @@ use Exporter; ...@@ -28,7 +28,7 @@ use Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK use vars qw(@ISA @EXPORT @EXPORT_OK
$VTOP_FLAGS_UPDATE $VTOP_FLAGS_VERBOSE $VTOP_FLAGS_QUIET $VTOP_FLAGS_UPDATE $VTOP_FLAGS_VERBOSE $VTOP_FLAGS_QUIET
$VTOP_FLAGS_FIXNODES $VTOP_FLAGS_IMPOTENT $VTOP_FLAGS_ALLOCONLY $VTOP_FLAGS_FIXNODES $VTOP_FLAGS_IMPOTENT $VTOP_FLAGS_ALLOCONLY
$VTOP_FLAGS_REGRESSION); $VTOP_FLAGS_REGRESSION $VTOP_FLAGS_FIXLANNODES);
@ISA = "Exporter"; @ISA = "Exporter";
@EXPORT = qw( ); @EXPORT = qw( );
...@@ -47,6 +47,7 @@ $VTOP_FLAGS_IMPOTENT = 0x0; ...@@ -47,6 +47,7 @@ $VTOP_FLAGS_IMPOTENT = 0x0;
$VTOP_FLAGS_REGRESSION = 0x0; $VTOP_FLAGS_REGRESSION = 0x0;
$VTOP_FLAGS_QUIET = 0x0; $VTOP_FLAGS_QUIET = 0x0;
$VTOP_FLAGS_ALLOCONLY = 0x0; $VTOP_FLAGS_ALLOCONLY = 0x0;
$VTOP_FLAGS_FIXLANNODES = 0x0;
@EXPORT_OK = qw($VTOP_FLAGS_UPDATE $VTOP_FLAGS_VERBOSE $VTOP_FLAGS_FIXNODES @EXPORT_OK = qw($VTOP_FLAGS_UPDATE $VTOP_FLAGS_VERBOSE $VTOP_FLAGS_FIXNODES
$VTOP_FLAGS_IMPOTENT $VTOP_FLAGS_REGRESSION $VTOP_FLAGS_QUIET $VTOP_FLAGS_IMPOTENT $VTOP_FLAGS_REGRESSION $VTOP_FLAGS_QUIET
...@@ -71,6 +72,7 @@ sub Init($$$) ...@@ -71,6 +72,7 @@ sub Init($$$)
$VTOP_FLAGS_REGRESSION = $libvtop_test::VTOP_FLAGS_REGRESSION; $VTOP_FLAGS_REGRESSION = $libvtop_test::VTOP_FLAGS_REGRESSION;
$VTOP_FLAGS_QUIET = $libvtop_test::VTOP_FLAGS_QUIET; $VTOP_FLAGS_QUIET = $libvtop_test::VTOP_FLAGS_QUIET;
$VTOP_FLAGS_ALLOCONLY = $libvtop_test::VTOP_FLAGS_ALLOCONLY; $VTOP_FLAGS_ALLOCONLY = $libvtop_test::VTOP_FLAGS_ALLOCONLY;
$VTOP_FLAGS_FIXLANNODES = $libvtop_test::VTOP_FLAGS_FIXLANNODES;
} }
else { else {
require libvtop_stable; require libvtop_stable;
...@@ -82,6 +84,7 @@ sub Init($$$) ...@@ -82,6 +84,7 @@ sub Init($$$)
$VTOP_FLAGS_REGRESSION = $libvtop_stable::VTOP_FLAGS_REGRESSION; $VTOP_FLAGS_REGRESSION = $libvtop_stable::VTOP_FLAGS_REGRESSION;
$VTOP_FLAGS_QUIET = $libvtop_stable::VTOP_FLAGS_QUIET; $VTOP_FLAGS_QUIET = $libvtop_stable::VTOP_FLAGS_QUIET;
$VTOP_FLAGS_ALLOCONLY = $libvtop_stable::VTOP_FLAGS_ALLOCONLY; $VTOP_FLAGS_ALLOCONLY = $libvtop_stable::VTOP_FLAGS_ALLOCONLY;
$VTOP_FLAGS_FIXLANNODES = $libvtop_stable::VTOP_FLAGS_FIXLANNODES;
} }
return 0; return 0;
} }
......
...@@ -28,7 +28,7 @@ use Exporter; ...@@ -28,7 +28,7 @@ use Exporter;
use vars qw(@ISA @EXPORT @EXPORT_OK use vars qw(@ISA @EXPORT @EXPORT_OK
$VTOP_FLAGS_UPDATE $VTOP_FLAGS_VERBOSE $VTOP_FLAGS_QUIET $VTOP_FLAGS_UPDATE $VTOP_FLAGS_VERBOSE $VTOP_FLAGS_QUIET
$VTOP_FLAGS_FIXNODES $VTOP_FLAGS_IMPOTENT $VTOP_FLAGS_ALLOCONLY $VTOP_FLAGS_FIXNODES $VTOP_FLAGS_IMPOTENT $VTOP_FLAGS_ALLOCONLY
$VTOP_FLAGS_REGRESSION); $VTOP_FLAGS_REGRESSION $VTOP_FLAGS_FIXLANNODES);
@ISA = "Exporter"; @ISA = "Exporter";
@EXPORT = qw( ); @EXPORT = qw( );
...@@ -82,10 +82,11 @@ $VTOP_FLAGS_IMPOTENT = 0x08; ...@@ -82,10 +82,11 @@ $VTOP_FLAGS_IMPOTENT = 0x08;
$VTOP_FLAGS_REGRESSION = 0x10; $VTOP_FLAGS_REGRESSION = 0x10;
$VTOP_FLAGS_QUIET = 0x20; $VTOP_FLAGS_QUIET = 0x20;
$VTOP_FLAGS_ALLOCONLY = 0x40; $VTOP_FLAGS_ALLOCONLY = 0x40;
$VTOP_FLAGS_FIXLANNODES = 0x80;
@EXPORT_OK = qw($VTOP_FLAGS_UPDATE $VTOP_FLAGS_VERBOSE $VTOP_FLAGS_FIXNODES @EXPORT_OK = qw($VTOP_FLAGS_UPDATE $VTOP_FLAGS_VERBOSE $VTOP_FLAGS_FIXNODES
$VTOP_FLAGS_IMPOTENT $VTOP_FLAGS_REGRESSION $VTOP_FLAGS_QUIET $VTOP_FLAGS_IMPOTENT $VTOP_FLAGS_REGRESSION $VTOP_FLAGS_QUIET
$VTOP_FLAGS_ALLOCONLY); $VTOP_FLAGS_ALLOCONLY $VTOP_FLAGS_FIXLANNODES);
# #
# Create an object representing the stuff we need to create the vtop file. # Create an object representing the stuff we need to create the vtop file.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment