From 72fda164daf846ff1fc77ab5baa33ec693c41fb4 Mon Sep 17 00:00:00 2001
From: Yue Zhang <yuezha@microsoft.com>
Date: Wed, 23 Sep 2015 12:47:14 +0800
Subject: [PATCH] Change privateSettings to protectedSettings

---
 azurelinuxagent/distro/default/extension.py | 2 +-
 azurelinuxagent/protocol/common.py          | 4 ++--
 azurelinuxagent/protocol/v1.py              | 2 +-
 tests/test_extensionsconfig.py              | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/azurelinuxagent/distro/default/extension.py b/azurelinuxagent/distro/default/extension.py
index 52d8a53..0ddf00f 100644
--- a/azurelinuxagent/distro/default/extension.py
+++ b/azurelinuxagent/distro/default/extension.py
@@ -630,7 +630,7 @@ class ExtHandlerInstance(object):
 
         settings = {
             'publicSettings': self.ext.publicSettings,
-            'protectedSettings': self.ext.privateSettings,
+            'protectedSettings': self.ext.protectedSettings,
             'protectedSettingsCertThumbprint': self.ext.certificateThumbprint
         }
         ext_settings = {
diff --git a/azurelinuxagent/protocol/common.py b/azurelinuxagent/protocol/common.py
index 367794f..deee1f8 100644
--- a/azurelinuxagent/protocol/common.py
+++ b/azurelinuxagent/protocol/common.py
@@ -104,11 +104,11 @@ class CertList(DataContract):
 
 class Extension(DataContract):
     def __init__(self, name=None, sequenceNumber=None, publicSettings=None,
-                 privateSettings=None, certificateThumbprint=None):
+                 protectedSettings=None, certificateThumbprint=None):
         self.name = name
         self.sequenceNumber = sequenceNumber
         self.publicSettings = publicSettings
-        self.privateSettings = privateSettings
+        self.protectedSettings = protectedSettings
         self.certificateThumbprint = certificateThumbprint
 
 class ExtHandlerProperties(DataContract):
diff --git a/azurelinuxagent/protocol/v1.py b/azurelinuxagent/protocol/v1.py
index 41c13bd..8940447 100644
--- a/azurelinuxagent/protocol/v1.py
+++ b/azurelinuxagent/protocol/v1.py
@@ -1018,7 +1018,7 @@ class ExtensionsConfig(object):
             ext.name = ext_handler.name
             ext.sequenceNumber = seqNo
             ext.publicSettings = handler_settings.get("publicSettings")
-            ext.privateSettings = handler_settings.get("protectedSettings")
+            ext.protectedSettings = handler_settings.get("protectedSettings")
             thumbprint = handler_settings.get("protectedSettingsCertThumbprint")
             ext.certificateThumbprint = thumbprint
             ext_handler.properties.extensions.append(ext)
diff --git a/tests/test_extensionsconfig.py b/tests/test_extensionsconfig.py
index 505c73d..09006f6 100644
--- a/tests/test_extensionsconfig.py
+++ b/tests/test_extensionsconfig.py
@@ -141,7 +141,7 @@ class TestExtensionsConfig(unittest.TestCase):
         settings = extension.properties.extensions[0]
         self.assertEquals("4037FBF5F1F3014F99B5D6C7799E9B20E6871CB3", 
                           settings.certificateThumbprint)
-        self.assertEquals("MIICWgYJK", settings.privateSettings)
+        self.assertEquals("MIICWgYJK", settings.protectedSettings)
         self.assertEquals(json.loads('{"foo":"bar"}'), 
                           settings.publicSettings)