Add CloudProvider to the MeasurementConfig.

truerocha · Apr 16, 2019 · 80b2c5d · 80b2c5d
1 parent 477754e
commit 80b2c5d
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/clusterloader2/pkg/measurement/common/bundle/test_metrics.go b/clusterloader2/pkg/measurement/common/bundle/test_metrics.go
@@ -207,6 +207,7 @@ func createConfig(config *measurement.MeasurementConfig, overrides map[string]in
 		PrometheusFramework: config.PrometheusFramework,
 		Params:              params,
 		TemplateProvider:    config.TemplateProvider,
+		CloudProvider:       config.CloudProvider,
 	}
 }
 

diff --git a/clusterloader2/pkg/measurement/interface.go b/clusterloader2/pkg/measurement/interface.go
@@ -35,8 +35,8 @@ type MeasurementConfig struct {
 	// TemplateProvider provides templated objects.
 	TemplateProvider *config.TemplateProvider
 	// Identifier identifies this instance of measurement.
-	Identifier string
-	// TODO(krzysied): add CloudProvider.
+	Identifier    string
+	CloudProvider string
 }
 
 // Measurement is an common interface for all measurements methods. It should be implemented by the user to

diff --git a/clusterloader2/pkg/measurement/manager.go b/clusterloader2/pkg/measurement/manager.go
@@ -26,6 +26,7 @@ import (
 // MeasurementManager manages all measurement executions.
 type MeasurementManager struct {
 	clusterFramework    *framework.Framework
+	clusterLoaderConfig *config.ClusterLoaderConfig
 	prometheusFramework *framework.Framework
 	templateProvider    *config.TemplateProvider
 
@@ -37,9 +38,10 @@ type MeasurementManager struct {
 
 // CreateMeasurementManager creates new instance of MeasurementManager.
 func CreateMeasurementManager(clusterFramework, prometheusFramework *framework.Framework,
-	templateProvider *config.TemplateProvider) *MeasurementManager {
+	templateProvider *config.TemplateProvider, config *config.ClusterLoaderConfig) *MeasurementManager {
 	return &MeasurementManager{
 		clusterFramework:    clusterFramework,
+		clusterLoaderConfig: config,
 		prometheusFramework: prometheusFramework,
 		templateProvider:    templateProvider,
 		measurements:        make(map[string]map[string]Measurement),
@@ -59,6 +61,7 @@ func (mm *MeasurementManager) Execute(methodName string, identifier string, para
 		Params:              params,
 		TemplateProvider:    mm.templateProvider,
 		Identifier:          identifier,
+		CloudProvider:       mm.clusterLoaderConfig.ClusterConfig.Provider,
 	}
 	summaries, err := measurementInstance.Execute(config)
 	mm.summaries = append(mm.summaries, summaries...)

diff --git a/clusterloader2/pkg/test/simple_context.go b/clusterloader2/pkg/test/simple_context.go
@@ -47,7 +47,7 @@ func createSimpleContext(c *config.ClusterLoaderConfig, f, p *framework.Framewor
 		state:               s,
 		templateProvider:    templateProvider,
 		tuningSetFactory:    tuningset.NewTuningSetFactory(),
-		measurementManager:  measurement.CreateMeasurementManager(f, p, templateProvider),
+		measurementManager:  measurement.CreateMeasurementManager(f, p, templateProvider, c),
 		chaosMonkey:         chaos.NewMonkey(f.GetClientSets().GetClient(), c.ClusterConfig.Provider),
 	}
 }