Commit 320b1cb5 authored by Robert Ricci's avatar Robert Ricci

When adding "shared" feature, use constructor that explicitly allows

us to mark it as violateable. This should make no difference, as the
one being used before was implicitly setting the flag since the weight
was 1.0 .
parent 428c9226
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* XML Parser for RSpec ptop files * XML Parser for RSpec ptop files
*/ */
static const char rcsid[] = "$Id: parse_advertisement_rspec.cc,v 1.4 2009-07-16 22:37:30 gtw Exp $"; static const char rcsid[] = "$Id: parse_advertisement_rspec.cc,v 1.5 2009-07-20 08:14:00 ricci Exp $";
#ifdef WITH_XML #ifdef WITH_XML
...@@ -344,7 +344,9 @@ bool populate_nodes_rspec(DOMElement *root, tb_pgraph &pg, tb_sgraph &sg, ...@@ -344,7 +344,9 @@ bool populate_nodes_rspec(DOMElement *root, tb_pgraph &pg, tb_sgraph &sg,
if( !strcmp( exclusive, "false" ) ) if( !strcmp( exclusive, "false" ) )
p->features.push_front( tb_node_featuredesire( feature, p->features.push_front( tb_node_featuredesire( feature,
1.0 ) ); 1.0,
true,
featuredesire::FD_TYPE_NORMAL) );
} }
/* /*
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* XML Parser for RSpec ptop files * XML Parser for RSpec ptop files
*/ */
static const char rcsid[] = "$Id: parse_request_rspec.cc,v 1.10 2009-07-17 21:59:55 ricci Exp $"; static const char rcsid[] = "$Id: parse_request_rspec.cc,v 1.11 2009-07-20 08:14:00 ricci Exp $";
#ifdef WITH_XML #ifdef WITH_XML
...@@ -385,7 +385,8 @@ bool populate_nodes_rspec(DOMElement *root, tb_vgraph &vg) { ...@@ -385,7 +385,8 @@ bool populate_nodes_rspec(DOMElement *root, tb_vgraph &vg) {
fstring desirename( "shared" ); fstring desirename( "shared" );
if( !strcmp( exclusive, "false" ) ) { if( !strcmp( exclusive, "false" ) ) {
tb_node_featuredesire node_fd( desirename, 1.0 ); tb_node_featuredesire node_fd( desirename, 1.0,
true, featuredesire::FD_TYPE_NORMAL);
node_fd.add_desire_user( 1.0 ); node_fd.add_desire_user( 1.0 );
v->desires.push_front( node_fd ); v->desires.push_front( node_fd );
} }
...@@ -543,7 +544,8 @@ bool populate_links_rspec(DOMElement *root, tb_vgraph &vg) { ...@@ -543,7 +544,8 @@ bool populate_links_rspec(DOMElement *root, tb_vgraph &vg) {
//This section has a whole bunch of defaults for tags that were present earlier //This section has a whole bunch of defaults for tags that were present earlier
// but are not in Protogeni. We will eventually decide whether or not we want them. // but are not in Protogeni. We will eventually decide whether or not we want them.
bool allow_delayed = true; bool allow_delayed = true;
bool allow_trivial = false; //bool allow_trivial = false;
bool allow_trivial = true;
bool fix_src_iface = false; bool fix_src_iface = false;
bool fix_dst_iface = false; bool fix_dst_iface = false;
fstring fixed_src_iface = ""; fstring fixed_src_iface = "";
......
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