Added support for --ipam-query-url command line switch (#140)

* Added support for --ipam-query-url command line switch

Signed-off-by: Olli Janatuinen <[email protected]>

* Updated CNM doc

Author: olljanat

cnm/plugin/main.go

@@ -75,6 +75,13 @@ var args = common.ArgumentList{
 		Type:         "string",
 		DefaultValue: "",
 	},
+	{
+		Name:         common.OptIpamQueryUrl,
+		Shorthand:    common.OptIpamQueryUrlAlias,
+		Description:  "Set the IPAM query URL",
+		Type:         "string",
+		DefaultValue: "",
+	},
 	{
 		Name:         common.OptIpamQueryInterval,
 		Shorthand:    common.OptIpamQueryIntervalAlias,
@@ -106,6 +113,7 @@ func main() {
 	url := common.GetArg(common.OptAPIServerURL).(string)
 	logLevel := common.GetArg(common.OptLogLevel).(int)
 	logTarget := common.GetArg(common.OptLogTarget).(int)
+	ipamQueryUrl, _ := common.GetArg(common.OptIpamQueryUrl).(string)
 	ipamQueryInterval, _ := common.GetArg(common.OptIpamQueryInterval).(int)
 	vers := common.GetArg(common.OptVersion).(bool)
 
@@ -166,6 +174,7 @@ func main() {
 
 	ipamPlugin.SetOption(common.OptEnvironment, environment)
 	ipamPlugin.SetOption(common.OptAPIServerURL, url)
+	ipamPlugin.SetOption(common.OptIpamQueryUrl, ipamQueryUrl)
 	ipamPlugin.SetOption(common.OptIpamQueryInterval, ipamQueryInterval)
 
 	// Start plugins.

cns/service/main.go

@@ -79,6 +79,13 @@ var args = acn.ArgumentList{
 		Type:         "string",
 		DefaultValue: "",
 	},
+	{
+		Name:         acn.OptIpamQueryUrl,
+		Shorthand:    acn.OptIpamQueryUrlAlias,
+		Description:  "Set the IPAM query URL",
+		Type:         "string",
+		DefaultValue: "",
+	},
 	{
 		Name:         acn.OptIpamQueryInterval,
 		Shorthand:    acn.OptIpamQueryIntervalAlias,
@@ -119,6 +126,7 @@ func main() {
 	logLevel := acn.GetArg(acn.OptLogLevel).(int)
 	logTarget := acn.GetArg(acn.OptLogTarget).(int)
 	logDirectory := acn.GetArg(acn.OptLogLocation).(string)
+	ipamQueryUrl, _ := acn.GetArg(acn.OptIpamQueryUrl).(string)
 	ipamQueryInterval, _ := acn.GetArg(acn.OptIpamQueryInterval).(int)
 	vers := acn.GetArg(acn.OptVersion).(bool)
 
@@ -216,6 +224,7 @@ func main() {
 
 	ipamPlugin.SetOption(acn.OptEnvironment, environment)
 	ipamPlugin.SetOption(acn.OptAPIServerURL, url)
+	ipamPlugin.SetOption(acn.OptIpamQueryUrl, ipamQueryUrl)
 	ipamPlugin.SetOption(acn.OptIpamQueryInterval, ipamQueryInterval)
 
 	if netPlugin != nil {

docs/cnm.md

@@ -46,8 +46,11 @@ Usage: azure-cnm-plugin [OPTIONS]
 
 Options:
   -e, --environment=azure      Set the operating environment {azure,mas}
-  -l, --log-level=info         Set the logging level {debug,info}
-  -t, --log-target=logfile     Set the logging target {logfile,syslog,stderr}
+  -u, --api-url                Set the API server URL
+  -l, --log-level=info         Set the logging level {info,debug}
+  -t, --log-target=logfile     Set the logging target {syslog,stderr,logfile}
+  -o, --log-location           Set the logging directory
+  -q, --ipam-query-url         Set the IPAM query URL
   -i, --ipam-query-interval    Set the IPAM plugin query interval
   -v, --version                Print version information
   -h, --help                   Print usage information