Merge pull request #281 from jluk/master

add networkwatcher extension schema
Azure · Feb 17, 2017 · 693f10c · 693f10c
2 parents 420882a + e04c6f0
commit 693f10c
Show file tree

Hide file tree

Showing 2 changed files with 96 additions and 2 deletions.
diff --git a/schemas/2015-08-01/Microsoft.Compute.json b/schemas/2015-08-01/Microsoft.Compute.json
@@ -222,7 +222,9 @@
             { "$ref": "#/definitions/OSPatchingForLinux"},
             { "$ref": "#/definitions/VMSnapshot"},
             { "$ref": "#/definitions/VMSnapshotLinux"},
-            { "$ref": "#/definitions/customScript" }
+            { "$ref": "#/definitions/customScript"},
+            { "$ref": "#/definitions/networkWatcherAgentWindows"},
+            { "$ref": "#/definitions/networkWatcherAgentLinux"}
           ]
         }
       },
@@ -290,7 +292,9 @@
             { "$ref": "#/definitions/datadogLinuxAgent"},
             { "$ref": "#/definitions/datadogWindowsAgent"},
             { "$ref": "#/definitions/dockerExtension"},
-            { "$ref": "#/definitions/customScript" }
+            { "$ref": "#/definitions/customScript"},
+            { "$ref": "#/definitions/networkWatcherAgentWindows"},
+            { "$ref": "#/definitions/networkWatcherAgentLinux"}
           ]
         }
       },
@@ -2917,6 +2921,62 @@
         "settings",
         "protectedSettings"
       ]
+    },
+    "networkWatcherAgentWindows":{
+      "type":"object",
+      "properties":{
+        "publisher":{
+          "enum":[
+            "Microsoft.Azure.NetworkWatcher"
+          ]
+        },
+        "type":{
+          "enum":[
+            "NetworkWatcherAgentWindows"
+          ]
+        },
+        "typeHandlerVersion":{
+          "type":"string",
+          "minLength":1
+        },
+        "autoUpgradeMinorVersion":{
+          "type":"boolean"
+        }
+      },
+      "required":[
+        "publisher",
+        "type",
+        "typeHandlerVersion",
+        "autoUpgradeMinorVersion"
+      ]
+    },
+    "networkWatcherAgentLinux":{
+      "type":"object",
+      "properties":{
+        "publisher":{
+          "enum":[
+            "Microsoft.Azure.NetworkWatcher"
+          ]
+        },
+        "type":{
+          "enum":[
+            "NetworkWatcherAgentLinux"
+          ]
+        },
+        "typeHandlerVersion":{
+          "type":"string",
+          "minLength":1
+        },
+        "autoUpgradeMinorVersion":{
+          "type":"boolean"
+        }
+      },
+      "required":[
+        "publisher",
+        "type",
+        "typeHandlerVersion",
+        "autoUpgradeMinorVersion"
+      ]
     }
   }
 }
diff --git a/tests/2015-08-01/Microsoft.Compute.tests.json b/tests/2015-08-01/Microsoft.Compute.tests.json
@@ -1024,6 +1024,40 @@
           }
         }
       }
+    },
+
+    {
+      "name": "extensions - Test networkWatcherAgentWindows",
+      "definition": "http://schema.management.azure.com/schemas/2015-08-01/Microsoft.Compute.json#/resourceDefinitions/extensions",
+      "json": {
+        "name": "Test Name",
+        "location": "Test Location",
+        "type": "Microsoft.Compute/virtualMachines/extensions",
+        "apiVersion": "2015-06-15",
+        "properties": {
+          "publisher": "Microsoft.Azure.NetworkWatcher",
+          "type": "NetworkWatcherAgentWindows",
+          "typeHandlerVersion": "Test Type Handler Version",
+          "autoUpgradeMinorVersion": true
+        }
+      }
+    },
+
+    {
+      "name": "extensions - Test networkWatcherAgentLinux",
+      "definition": "http://schema.management.azure.com/schemas/2015-08-01/Microsoft.Compute.json#/resourceDefinitions/extensions",
+      "json": {
+        "name": "Test Name",
+        "location": "Test Location",
+        "type": "Microsoft.Compute/virtualMachines/extensions",
+        "apiVersion": "2015-06-15",
+        "properties": {
+          "publisher": "Microsoft.Azure.NetworkWatcher",
+          "type": "NetworkWatcherAgentLinux",
+          "typeHandlerVersion": "Test Type Handler Version",
+          "autoUpgradeMinorVersion": true
+        }
+      }
     }
 
   ]