service: generalize libvirt flag handling

Signed-off-by: Martin Polednik <[email protected]>
guangxuli · Nov 29, 2017 · 469c2cf · 469c2cf
1 parent 4570de7
commit 469c2cf
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 7 deletions.
diff --git a/cmd/virt-handler/virt-handler.go b/cmd/virt-handler/virt-handler.go
@@ -76,8 +76,8 @@ const (
 
 type virtHandlerApp struct {
 	service.ServiceListen
+	service.ServiceLibvirt
 	HostOverride            string
-	LibvirtUri              string
 	VirtShareDir            string
 	EphemeralDiskDir        string
 	WatchdogTimeoutDuration time.Duration
@@ -197,11 +197,10 @@ func (app *virtHandlerApp) AddFlags() {
 
 	app.BindAddress = defaultHost
 	app.Port = defaultPort
+	app.LibvirtUri = libvirtUri
 
 	app.AddCommonFlags()
-
-	flag.StringVar(&app.LibvirtUri, "libvirt-uri", libvirtUri,
-		"Libvirt connection string")
+	app.AddLibvirtFlags()
 
 	flag.StringVar(&app.HostOverride, "hostname-override", hostOverride,
 		"Name under which the node is registered in kubernetes, where this virt-handler instance is running on")

diff --git a/cmd/virt-manifest/virt-manifest.go b/cmd/virt-manifest/virt-manifest.go
@@ -45,6 +45,7 @@ const (
 
 type virtManifestApp struct {
 	service.ServiceListen
+	service.ServiceLibvirt
 	LibvirtUri string
 }
 
@@ -84,11 +85,10 @@ func (app *virtManifestApp) AddFlags() {
 
 	app.BindAddress = defaultHost
 	app.Port = defaultPort
+	app.LibvirtUri = libvirtUri
 
 	app.AddCommonFlags()
-
-	flag.StringVar(&app.LibvirtUri, "libvirt-uri", libvirtUri,
-		"Libvirt connection string")
+	app.AddLibvirtFlags()
 
 	flag.Parse()
 }

diff --git a/pkg/service/service.go b/pkg/service/service.go
@@ -38,6 +38,10 @@ type ServiceListen struct {
 	Port        int
 }
 
+type ServiceLibvirt struct {
+	LibvirtUri string
+}
+
 func (service *ServiceListen) Address() string {
 	return fmt.Sprintf("%s:%s", service.BindAddress, strconv.Itoa(service.Port))
 }
@@ -50,3 +54,8 @@ func (service *ServiceListen) AddCommonFlags() {
 	flag.StringVar(&service.BindAddress, "listen", service.BindAddress, "Address where to listen on")
 	flag.IntVar(&service.Port, "port", service.Port, "Port to listen on")
 }
+
+func (service *ServiceLibvirt) AddLibvirtFlags() {
+	flag.StringVar(&service.Uri, "libvirt-uri", service.Uri, "Libvirt connection string")
+
+}