Supporting platforms in JSON (fixes #8)

Author: vania-pooh

README.md

@@ -65,15 +65,16 @@ In **quota** section we define quota names, browser names, their versions and us
     "test-quota": {
       "firefox" : {
         "defaultVersion": "33.0",
+        "defaultPlatform": "LINUX",
         "versions": {
           "33.0": "cloud",
-          "42.0": "cloud"
+          "42.0@LINUX": "cloud"
         }
       }
     }
   }
 ```
-Here **test-quota** is free-form name of the quota, **firefox** is the browser name. Finally **versions** section contains a mapping of browser version to host group name, e.g. **firefox 33.0** will correspond to all hosts defined in **cloud** hosts group.
+To specify a platform use `@`-notation, e.g. `42.0@LINUX`. Here **test-quota** is free-form name of the quota, **firefox** is the browser name. Finally **versions** section contains a mapping of browser version to host group name, e.g. **firefox 33.0** will correspond to all hosts defined in **cloud** hosts group.
 In **aliases** section we define aliases for quota blocks from **quota** section. For each defined alias quota contents will be copied to a separate file with new name.
 
 Cloud provider attributes `username` and `password` can be included in the input file:
@@ -90,4 +91,4 @@ Cloud provider attributes `username` and `password` can be included in the input
       }
     }
   }
-```
+```

cmd/data.go

@@ -16,8 +16,9 @@ type Hosts map[string]Regions
 type Versions map[string]string
 
 type Browser struct {
-	DefaultVersion string   `json:"defaultVersion"`
-	Versions       Versions `json:"versions"`
+	DefaultVersion  string   `json:"defaultVersion"`
+	DefaultPlatform string   `json:"defaultPlatform"`
+	Versions        Versions `json:"versions"`
 }
 
 type Quota map[string]Browser

cmd/generate.go

@@ -13,6 +13,7 @@ import (
 	"regexp"
 	"sort"
 	"strconv"
+	"strings"
 )
 
 const (
@@ -82,20 +83,25 @@ func createQuota(quotaName string, hostsMap Hosts, quota Quota) ggr.Browsers {
 		for versionName, hostsRef := range browser.Versions {
 			regions := hostsMap[hostsRef]
 			if regions != nil {
+				version, platform := parseVersionPlatform(versionName)
 				xmlVersion := ggr.Version{
-					Number:  versionName,
+					Number:  version,
 					Regions: jsonRegionsToXmlRegions(regions),
 				}
+				if platform != "" {
+					xmlVersion.Platform = platform
+				}
 				xmlVersions = append(xmlVersions, xmlVersion)
 			} else {
 				fmt.Printf("Missing host reference %s for browser %s:%s:%s\n", hostsRef, quotaName, browserName, versionName)
 				os.Exit(1)
 			}
 		}
 		xmlBrowser := ggr.Browser{
-			Name:           browserName,
-			DefaultVersion: browser.DefaultVersion,
-			Versions:       xmlVersions,
+			Name:            browserName,
+			DefaultVersion:  browser.DefaultVersion,
+			DefaultPlatform: browser.DefaultPlatform,
+			Versions:        xmlVersions,
 		}
 		browsers = append(browsers, xmlBrowser)
 	}
@@ -104,6 +110,15 @@ func createQuota(quotaName string, hostsMap Hosts, quota Quota) ggr.Browsers {
 	}
 }
 
+func parseVersionPlatform(s string) (string, string) {
+	const separator = "@"
+	pieces := strings.Split(s, separator)
+	if len(pieces) > 1 {
+		return pieces[0], strings.Join(pieces[1:], separator)
+	}
+	return s, ""
+}
+
 func jsonRegionsToXmlRegions(regions Regions) []ggr.Region {
 	var xmlRegions []ggr.Region
 	for regionName, region := range regions {

cmd/generate_test.go

@@ -31,20 +31,25 @@ func TestConvert(t *testing.T) {
 	browser := browsers[0]
 	AssertThat(t, browser.Name, EqualTo{"firefox"})
 	AssertThat(t, browser.DefaultVersion, EqualTo{"33.0"})
+	AssertThat(t, browser.DefaultPlatform, EqualTo{"LINUX"})
 
 	versions := browser.Versions
-	AssertThat(t, len(versions), EqualTo{3})
+	AssertThat(t, len(versions), EqualTo{4})
 
 	sort.Slice(versions, func(i, j int) bool {
 		return versions[i].Number < versions[j].Number
 	})
 
 	firstVersion := versions[0]
-	AssertThat(t, firstVersion.Number == "33.0", Is{true})
+	AssertThat(t, firstVersion.Number, EqualTo{"33.0"})
 	secondVersion := versions[1]
-	AssertThat(t, secondVersion.Number == "42.0", Is{true})
+	AssertThat(t, secondVersion.Number, EqualTo{"42.0"})
 	thirdVersion := versions[2]
-	AssertThat(t, thirdVersion.Number == "43.0", Is{true})
+	AssertThat(t, thirdVersion.Number, EqualTo{"43.0"})
+	AssertThat(t, thirdVersion.Platform, EqualTo{"LINUX"})
+	fourthVersion := versions[3]
+	AssertThat(t, fourthVersion.Number, EqualTo{"43.0"})
+	AssertThat(t, fourthVersion.Platform, EqualTo{"WINDOWS"})
 
 	firstRegions := firstVersion.Regions
 	AssertThat(t, len(firstRegions), EqualTo{2})
@@ -80,3 +85,17 @@ func TestConvert(t *testing.T) {
 		AssertThat(t, host.Password, EqualTo{"Password1"})
 	}
 }
+
+func TestParseVersionPlatform(t *testing.T) {
+	v, p := parseVersionPlatform("some-string")
+	AssertThat(t, v, EqualTo{"some-string"})
+	AssertThat(t, p, EqualTo{""})
+
+	v, p = parseVersionPlatform("version@platform")
+	AssertThat(t, v, EqualTo{"version"})
+	AssertThat(t, p, EqualTo{"platform"})
+
+	v, p = parseVersionPlatform("version@platform@platform")
+	AssertThat(t, v, EqualTo{"version"})
+	AssertThat(t, p, EqualTo{"platform@platform"})
+}

test-data/input.json

@@ -30,10 +30,12 @@
     "test-quota": {
       "firefox" : {
         "defaultVersion": "33.0",
+        "defaultPlatform": "LINUX",
         "versions": {
           "33.0": "cloud",
           "42.0": "cloud",
-          "43.0": "cloud-provider"
+          "43.0@LINUX": "cloud-provider",
+          "43.0@WINDOWS": "cloud-provider"
         }
       }
     }

test-data/output.xml

@@ -1,5 +1,5 @@
 <qa:browsers xmlns:qa="urn:config.gridrouter.qatools.ru">
-    <browser name="firefox" defaultVersion="33.0">
+    <browser name="firefox" defaultVersion="33.0" defaultPlatform="LINUX">
         <version number="33.0">
             <region name="region-a">
                 <host name="selenium-cloud-a-1.example.com" port="4444" count="1"></host>
@@ -92,7 +92,16 @@
                 <host name="selenium-cloud-b-20.example.com" port="4444" count="2"></host>
             </region>
         </version>
-        <version number="43.0">
+        <version number="43.0" platform="LINUX">
+            <region name="provider-1">
+                <host name="cloud-provider-1.com" port="4444" count="1" username="user1" password="Password1"></host>
+                <host name="cloud-provider-2.com" port="4444" count="1" username="user1" password="Password1"></host>
+                <host name="cloud-provider-3.com" port="4444" count="1" username="user1" password="Password1"></host>
+                <host name="cloud-provider-4.com" port="4444" count="1" username="user1" password="Password1"></host>
+                <host name="cloud-provider-5.com" port="4444" count="1" username="user1" password="Password1"></host>
+            </region>
+        </version>
+        <version number="43.0" platform="WINDOWS">
             <region name="provider-1">
                 <host name="cloud-provider-1.com" port="4444" count="1" username="user1" password="Password1"></host>
                 <host name="cloud-provider-2.com" port="4444" count="1" username="user1" password="Password1"></host>