From a99c41fa03bbb08a381eacdfb697124f71ec5c68 Mon Sep 17 00:00:00 2001
From: Yue Zhang <yuezha@microsoft.com>
Date: Tue, 2 Jun 2015 12:38:38 +0800
Subject: [PATCH] Support internal plugin

---
 azureguestagent/protocol/v1.py |  2 +-
 tests/test_extensionsconfig.py | 41 +++++++++++++++++++++-------------
 2 files changed, 27 insertions(+), 16 deletions(-)

diff --git a/azureguestagent/protocol/v1.py b/azureguestagent/protocol/v1.py
index 80fff9a..8b8bf10 100644
--- a/azureguestagent/protocol/v1.py
+++ b/azureguestagent/protocol/v1.py
@@ -921,7 +921,7 @@ class ExtensionManifest(object):
     def parse(self, xmlText):
         logger.Verbose("Extension manifest:{0}", xmlText)
         xmlDoc = ET.fromstring(xmlText.strip())
-        packages = FindAllNodes(xmlDoc, ".//Plugins/Plugin")
+        packages = FindAllNodes(xmlDoc, ".//Plugin")
         for package in packages:
             version = FindFirstNode(package, "Version").text
             uris = FindAllNodes(package, "Uris/Uri")
diff --git a/tests/test_extensionsconfig.py b/tests/test_extensionsconfig.py
index d77a258..f83df5e 100644
--- a/tests/test_extensionsconfig.py
+++ b/tests/test_extensionsconfig.py
@@ -77,21 +77,28 @@ ExtensionsConfigSample="""\
 ManifestSample="""\
 <?xml version="1.0" encoding="utf-8"?>
 <PluginVersionManifest xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
-<Plugins>
-<Plugin>
-<Version>1.0</Version>
-<Uris>
-<Uri>http://blahblah</Uri>
-</Uris>
-</Plugin>
-<Plugin>
-<Version>1.1</Version>
-<Uris>
-<Uri>http://blahblah</Uri>
-</Uris>
-</Plugin>
-</Plugins>
-<InternalPlugins />
+    <Plugins>
+        <Plugin>
+            <Version>1.0</Version>
+            <Uris>
+                <Uri>http://blahblah</Uri>
+            </Uris>
+        </Plugin>
+        <Plugin>
+            <Version>1.1</Version>
+            <Uris>
+                <Uri>http://blahblah</Uri>
+            </Uris>
+        </Plugin>
+    </Plugins>
+    <InternalPlugins>
+        <Plugin>
+            <Version>1.2</Version>
+            <Uris>
+                <Uri>http://blahblah</Uri>
+            </Uris>
+    </Plugin>
+</InternalPlugins>
 </PluginVersionManifest>
 """
 
@@ -114,6 +121,10 @@ class TestExtensionsConfig(unittest.TestCase):
         self.assertEquals(json.loads('{"foo":"bar"}'), 
                           extension.getPublicSettings())
 
+        man = v1.ExtensionManifest(ManifestSample)
+        self.assertNotEquals(None, man.versionUris)
+        self.assertEquals(3, len(man.versionUris))
+
    
 if __name__ == '__main__':
     unittest.main()