Update.

Author: Strabox

node/discovery/backend/discovery.go

@@ -43,9 +43,7 @@ type Discovery interface {
 
 	// ========================== External/Remote Services (Only Simulation) =======================
 	//
-	AvailableResourcesSim() types.Resources
-	//
-	MaximumResourcesSim() types.Resources
+	NodeInformationSim() (types.Resources, types.Resources, int)
 	//
 	RefreshOffersSim()
 	//

node/discovery/offering/offering_discovery.go

@@ -121,13 +121,16 @@ func (d *Discovery) AdvertiseNeighborOffers(fromTrader, toNeighborTrader, trader
 // ======================= External Services (Consumed during simulation ONLY) =========================
 
 // Simulation
-func (d *Discovery) AvailableResourcesSim() types.Resources {
-	return d.supplier.AvailableResources()
-}
-
-// Simulation
-func (d *Discovery) MaximumResourcesSim() types.Resources {
-	return d.supplier.MaximumResources()
+func (d *Discovery) NodeInformationSim() (types.Resources, types.Resources, int) {
+	numActiveOffers := 0
+	d.traders.Range(func(_, value interface{}) bool {
+		currentTrader, ok := value.(*trader.Trader)
+		if ok {
+			numActiveOffers = currentTrader.NumActiveOffers()
+		}
+		return true
+	})
+	return d.supplier.AvailableResources(), d.supplier.MaximumResources(), numActiveOffers
 }
 
 // Simulation

node/discovery/offering/trader/trader.go

@@ -351,6 +351,13 @@ func (t *Trader) RefreshOffersSim() {
 	}
 }
 
+//Simulation
+func (t *Trader) NumActiveOffers() int {
+	t.offersMutex.Lock()
+	defer t.offersMutex.Unlock()
+	return len(t.offers)
+}
+
 //Simulation
 func (t *Trader) SpreadOffersSim() {
 	// Advertise offers (if any) into the neighbors traders.

node/discovery/random/random_backend.go

@@ -168,22 +168,20 @@ func (d *Discovery) AdvertiseNeighborOffers(_, _, _ *types.Node) {
 
 // ============== External/Remote Services (Only Simulation) ================
 
-func (d *Discovery) AvailableResourcesSim() types.Resources {
+func (d *Discovery) NodeInformationSim() (types.Resources, types.Resources, int) {
 	d.resourcesMutex.Lock()
 	defer d.resourcesMutex.Unlock()
 	return types.Resources{
-		CPUClass: types.CPUClass(d.freeResources.CPUClass()),
-		CPUs:     d.freeResources.CPUs(),
-		Memory:   d.freeResources.Memory(),
-	}
-}
-
-func (d *Discovery) MaximumResourcesSim() types.Resources {
-	return types.Resources{
-		CPUClass: types.CPUClass(d.freeResources.CPUClass()),
-		CPUs:     d.maximumResources.CPUs(),
-		Memory:   d.maximumResources.Memory(),
-	}
+			CPUClass: types.CPUClass(d.freeResources.CPUClass()),
+			CPUs:     d.freeResources.CPUs(),
+			Memory:   d.freeResources.Memory(),
+		},
+		types.Resources{
+			CPUClass: types.CPUClass(d.freeResources.CPUClass()),
+			CPUs:     d.maximumResources.CPUs(),
+			Memory:   d.maximumResources.Memory(),
+		},
+		0
 }
 
 func (d *Discovery) RefreshOffersSim() {

node/discovery/swarm/swarm_discovery.go

@@ -296,24 +296,21 @@ func (d *Discovery) AdvertiseNeighborOffers(_, _, _ *types.Node) {
 // ======================= External Services (Consumed during simulation ONLY) =========================
 
 // Simulation
-func (d *Discovery) AvailableResourcesSim() types.Resources {
+func (d *Discovery) NodeInformationSim() (types.Resources, types.Resources, int) {
 	d.resourcesMutex.Lock()
 	defer d.resourcesMutex.Unlock()
 
 	return types.Resources{
-		CPUClass: types.CPUClass(d.availableResources.CPUClass()),
-		CPUs:     d.availableResources.CPUs(),
-		Memory:   d.availableResources.Memory(),
-	}
-}
-
-// Simulation
-func (d *Discovery) MaximumResourcesSim() types.Resources {
-	return types.Resources{
-		CPUClass: types.CPUClass(d.maximumResources.CPUClass()),
-		CPUs:     d.maximumResources.CPUs(),
-		Memory:   d.maximumResources.Memory(),
-	}
+			CPUClass: types.CPUClass(d.availableResources.CPUClass()),
+			CPUs:     d.availableResources.CPUs(),
+			Memory:   d.availableResources.Memory(),
+		},
+		types.Resources{
+			CPUClass: types.CPUClass(d.maximumResources.CPUClass()),
+			CPUs:     d.maximumResources.CPUs(),
+			Memory:   d.maximumResources.Memory(),
+		},
+		0
 }
 
 // Simulation

node/node.go

@@ -242,22 +242,13 @@ func (n *Node) StopLocalContainer(ctx context.Context, containerID string) error
 
 // =========================== APIs exclusively used in Simulation ==============================
 
-// AvailableResourcesSim returns the current available resources of the node.
+// NodeInformationSim returns the available resources, maximum available resources and number of offers in the node.
 // Note: Only available when the node is running in simulation mode.
-func (n *Node) AvailableResourcesSim() types.Resources {
+func (n *Node) NodeInformationSim() (types.Resources, types.Resources, int) {
 	if !n.config.Simulation() {
-		panic(errors.New("AvailableResourcesSim request can only be used in Simulation Mode"))
+		panic(errors.New("NodeInformationSim request can only be used in Simulation Mode"))
 	}
-	return n.discoveryComp.AvailableResourcesSim()
-}
-
-// MaximumResourcesSim returns the maximum available resources of the node.
-// Note: Only available when the node is running in simulation mode.
-func (n *Node) MaximumResourcesSim() types.Resources {
-	if !n.config.Simulation() {
-		panic(errors.New("MaximumResourcesSim request can only be used in Simulation Mode"))
-	}
-	return n.discoveryComp.MaximumResourcesSim()
+	return n.discoveryComp.NodeInformationSim()
 }
 
 // RefreshOffersSim triggers the inner actions to refresh all the offers that the node is handling.