From e755b20880bd18bf332bfeb57ec9c04c79ff77fc Mon Sep 17 00:00:00 2001
From: James Rose <james.o.rose@gmail.com>
Date: Wed, 30 Jul 2014 16:57:30 +0000
Subject: [PATCH] Added provisioning variables for firmware for spa50x spa51x
 and yealink phones

---
 resources/templates/provision/cisco/spa501g/{$mac}.xml       | 2 +-
 resources/templates/provision/cisco/spa502g/{$mac}.xml       | 2 +-
 resources/templates/provision/cisco/spa504g/{$mac}.xml       | 2 +-
 resources/templates/provision/cisco/spa508g/{$mac}.xml       | 2 +-
 resources/templates/provision/cisco/spa509g/{$mac}.xml       | 2 +-
 resources/templates/provision/cisco/spa512g/{$mac}.xml       | 2 +-
 resources/templates/provision/cisco/spa514g/{$mac}.xml       | 2 +-
 resources/templates/provision/yealink/t20p/y000000000007.cfg | 2 +-
 resources/templates/provision/yealink/t22p/y000000000005.cfg | 2 +-
 resources/templates/provision/yealink/t26p/y000000000004.cfg | 2 +-
 resources/templates/provision/yealink/t32g/y000000000032.cfg | 2 +-
 resources/templates/provision/yealink/t38g/y000000000038.cfg | 2 +-
 resources/templates/provision/yealink/t42g/y000000000029.cfg | 2 +-
 resources/templates/provision/yealink/t46g/y000000000028.cfg | 2 +-
 resources/templates/provision/yealink/t48g/y000000000035.cfg | 2 +-
 resources/templates/provision/yealink/w52p/y000000000025.cfg | 2 +-
 16 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/resources/templates/provision/cisco/spa501g/{$mac}.xml b/resources/templates/provision/cisco/spa501g/{$mac}.xml
index 3d6db05ad3..8fc8cb57bc 100644
--- a/resources/templates/provision/cisco/spa501g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa501g/{$mac}.xml
@@ -198,7 +198,7 @@
 <Upgrade_Enable group="Provisioning/Firmware_Upgrade">Yes</Upgrade_Enable>
 <Upgrade_Error_Retry_Delay group="Provisioning/Firmware_Upgrade">3600</Upgrade_Error_Retry_Delay>
 <Downgrade_Rev_Limit group="Provisioning/Firmware_Upgrade" />
-<Upgrade_Rule group="Provisioning/Firmware_Upgrade" />
+<Upgrade_Rule group="Provisioning/Firmware_Upgrade">{$cisco_spa50x_firmware_rule}</Upgrade_Rule>
 <Log_Upgrade_Request_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH</Log_Upgrade_Request_Msg>
 <Log_Upgrade_Success_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
diff --git a/resources/templates/provision/cisco/spa502g/{$mac}.xml b/resources/templates/provision/cisco/spa502g/{$mac}.xml
index 85570a7d52..e2f01cc73b 100644
--- a/resources/templates/provision/cisco/spa502g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa502g/{$mac}.xml
@@ -200,7 +200,7 @@
 <Upgrade_Enable group="Provisioning/Firmware_Upgrade">Yes</Upgrade_Enable>
 <Upgrade_Error_Retry_Delay group="Provisioning/Firmware_Upgrade">3600</Upgrade_Error_Retry_Delay>
 <Downgrade_Rev_Limit group="Provisioning/Firmware_Upgrade" />
-<Upgrade_Rule group="Provisioning/Firmware_Upgrade" />
+<Upgrade_Rule group="Provisioning/Firmware_Upgrade">{$cisco_spa50x_firmware_rule}</Upgrade_Rule>
 <Log_Upgrade_Request_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH</Log_Upgrade_Request_Msg>
 <Log_Upgrade_Success_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
diff --git a/resources/templates/provision/cisco/spa504g/{$mac}.xml b/resources/templates/provision/cisco/spa504g/{$mac}.xml
index 67a537213d..40d023bd18 100644
--- a/resources/templates/provision/cisco/spa504g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa504g/{$mac}.xml
@@ -141,7 +141,7 @@
 <Upgrade_Enable group="Provisioning/Firmware_Upgrade">Yes</Upgrade_Enable>
 <Upgrade_Error_Retry_Delay group="Provisioning/Firmware_Upgrade">3600</Upgrade_Error_Retry_Delay>
 <Downgrade_Rev_Limit group="Provisioning/Firmware_Upgrade" />
-<Upgrade_Rule group="Provisioning/Firmware_Upgrade" />
+<Upgrade_Rule group="Provisioning/Firmware_Upgrade">{$cisco_spa50x_firmware_rule}</Upgrade_Rule>
 <Log_Upgrade_Request_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH</Log_Upgrade_Request_Msg>
 <Log_Upgrade_Success_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
diff --git a/resources/templates/provision/cisco/spa508g/{$mac}.xml b/resources/templates/provision/cisco/spa508g/{$mac}.xml
index 0403c4d9c7..a52f843035 100644
--- a/resources/templates/provision/cisco/spa508g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa508g/{$mac}.xml
@@ -200,7 +200,7 @@
 <Upgrade_Enable group="Provisioning/Firmware_Upgrade">Yes</Upgrade_Enable>
 <Upgrade_Error_Retry_Delay group="Provisioning/Firmware_Upgrade">3600</Upgrade_Error_Retry_Delay>
 <Downgrade_Rev_Limit group="Provisioning/Firmware_Upgrade" />
-<Upgrade_Rule group="Provisioning/Firmware_Upgrade" />
+<Upgrade_Rule group="Provisioning/Firmware_Upgrade">{$cisco_spa50x_firmware_rule}</Upgrade_Rule>
 <Log_Upgrade_Request_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH</Log_Upgrade_Request_Msg>
 <Log_Upgrade_Success_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
diff --git a/resources/templates/provision/cisco/spa509g/{$mac}.xml b/resources/templates/provision/cisco/spa509g/{$mac}.xml
index 799982c479..6bda8e2466 100644
--- a/resources/templates/provision/cisco/spa509g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa509g/{$mac}.xml
@@ -200,7 +200,7 @@
 <Upgrade_Enable group="Provisioning/Firmware_Upgrade">Yes</Upgrade_Enable>
 <Upgrade_Error_Retry_Delay group="Provisioning/Firmware_Upgrade">3600</Upgrade_Error_Retry_Delay>
 <Downgrade_Rev_Limit group="Provisioning/Firmware_Upgrade" />
-<Upgrade_Rule group="Provisioning/Firmware_Upgrade" />
+<Upgrade_Rule group="Provisioning/Firmware_Upgrade">{$cisco_spa50x_firmware_rule}</Upgrade_Rule>
 <Log_Upgrade_Request_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH</Log_Upgrade_Request_Msg>
 <Log_Upgrade_Success_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
diff --git a/resources/templates/provision/cisco/spa512g/{$mac}.xml b/resources/templates/provision/cisco/spa512g/{$mac}.xml
index 6405f557b1..e5a3dbe4e3 100644
--- a/resources/templates/provision/cisco/spa512g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa512g/{$mac}.xml
@@ -200,7 +200,7 @@
 <Upgrade_Enable group="Provisioning/Firmware_Upgrade">Yes</Upgrade_Enable>
 <Upgrade_Error_Retry_Delay group="Provisioning/Firmware_Upgrade">3600</Upgrade_Error_Retry_Delay>
 <Downgrade_Rev_Limit group="Provisioning/Firmware_Upgrade" />
-<Upgrade_Rule group="Provisioning/Firmware_Upgrade" />
+<Upgrade_Rule group="Provisioning/Firmware_Upgrade">{$cisco_spa51x_firmware_rule}</Upgrade_Rule>
 <Log_Upgrade_Request_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH</Log_Upgrade_Request_Msg>
 <Log_Upgrade_Success_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
diff --git a/resources/templates/provision/cisco/spa514g/{$mac}.xml b/resources/templates/provision/cisco/spa514g/{$mac}.xml
index 522fda5945..e1df53a9b7 100644
--- a/resources/templates/provision/cisco/spa514g/{$mac}.xml
+++ b/resources/templates/provision/cisco/spa514g/{$mac}.xml
@@ -101,7 +101,7 @@
 <Upgrade_Enable group="Provisioning/Firmware_Upgrade">Yes</Upgrade_Enable>
 <Upgrade_Error_Retry_Delay group="Provisioning/Firmware_Upgrade">3600</Upgrade_Error_Retry_Delay>
 <Downgrade_Rev_Limit group="Provisioning/Firmware_Upgrade" />
-<Upgrade_Rule group="Provisioning/Firmware_Upgrade" />
+<Upgrade_Rule group="Provisioning/Firmware_Upgrade">{$cisco_spa51x_firmware_rule}</Upgrade_Rule>
 <Log_Upgrade_Request_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Requesting upgrade $SCHEME://$SERVIP:$PORT$PATH</Log_Upgrade_Request_Msg>
 <Log_Upgrade_Success_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Successful upgrade $SCHEME://$SERVIP:$PORT$PATH -- $ERR</Log_Upgrade_Success_Msg>
 <Log_Upgrade_Failure_Msg group="Provisioning/Firmware_Upgrade">$PN $MAC -- Upgrade failed: $ERR</Log_Upgrade_Failure_Msg>
diff --git a/resources/templates/provision/yealink/t20p/y000000000007.cfg b/resources/templates/provision/yealink/t20p/y000000000007.cfg
index 759f45e645..7d964f2f27 100644
--- a/resources/templates/provision/yealink/t20p/y000000000007.cfg
+++ b/resources/templates/provision/yealink/t20p/y000000000007.cfg
@@ -1136,7 +1136,7 @@ phone_setting.hold_power_led_flash_enable =
 #######################################################################################
 ##                     Configure the access URL of firmware                          ##                                 
 #######################################################################################
-firmware.url = 
+firmware.url = {$yealink_t20p_firmware_url}
 
 #######################################################################################
 ##                     Configure the access URL of the customized  ringtones         ##                                  
diff --git a/resources/templates/provision/yealink/t22p/y000000000005.cfg b/resources/templates/provision/yealink/t22p/y000000000005.cfg
index 08139237dd..e87afe9c9e 100644
--- a/resources/templates/provision/yealink/t22p/y000000000005.cfg
+++ b/resources/templates/provision/yealink/t22p/y000000000005.cfg
@@ -1136,7 +1136,7 @@ phone_setting.hold_power_led_flash_enable =
 #######################################################################################
 ##                     Configure the access URL of firmware                          ##
 #######################################################################################
-firmware.url = 
+firmware.url = {$yealink_t22p_firmware_url}
 
 #######################################################################################
 ##                     Configure the access URL of the customized  ringtones         ##
diff --git a/resources/templates/provision/yealink/t26p/y000000000004.cfg b/resources/templates/provision/yealink/t26p/y000000000004.cfg
index f96e35edbf..9037d2c102 100644
--- a/resources/templates/provision/yealink/t26p/y000000000004.cfg
+++ b/resources/templates/provision/yealink/t26p/y000000000004.cfg
@@ -1136,7 +1136,7 @@ phone_setting.hold_power_led_flash_enable =
 #######################################################################################
 ##                     Configure the access URL of firmware                          ##
 #######################################################################################
-firmware.url = 
+firmware.url = {$yealink_t26p_firmware_url}
 
 #######################################################################################
 ##                     Configure the access URL of the customized  ringtones         ##
diff --git a/resources/templates/provision/yealink/t32g/y000000000032.cfg b/resources/templates/provision/yealink/t32g/y000000000032.cfg
index 58d96b0eca..f2d354d6cf 100644
--- a/resources/templates/provision/yealink/t32g/y000000000032.cfg
+++ b/resources/templates/provision/yealink/t32g/y000000000032.cfg
@@ -1133,7 +1133,7 @@ phone_setting.hold_power_led_flash_enable =
 #######################################################################################
 ##                     Configure the access URL of firmware                          ##                                 
 #######################################################################################
-firmware.url = 
+firmware.url = {$yealink_t32g_firmware_url}
 
 #######################################################################################
 ##                     Configure the access URL of the customized  ringtones         ##                                  
diff --git a/resources/templates/provision/yealink/t38g/y000000000038.cfg b/resources/templates/provision/yealink/t38g/y000000000038.cfg
index e8bbd5ad81..e7b618b2cb 100644
--- a/resources/templates/provision/yealink/t38g/y000000000038.cfg
+++ b/resources/templates/provision/yealink/t38g/y000000000038.cfg
@@ -1136,7 +1136,7 @@ phone_setting.hold_power_led_flash_enable =
 #######################################################################################
 ##                     Configure the access URL of firmware                          ##                                 
 #######################################################################################
-firmware.url = 
+firmware.url = {$yealink_t38g_firmware_url}
 
 #######################################################################################
 ##                     Configure the access URL of the customized  ringtones         ##                                  
diff --git a/resources/templates/provision/yealink/t42g/y000000000029.cfg b/resources/templates/provision/yealink/t42g/y000000000029.cfg
index 63a320c86f..a9d165b04a 100644
--- a/resources/templates/provision/yealink/t42g/y000000000029.cfg
+++ b/resources/templates/provision/yealink/t42g/y000000000029.cfg
@@ -1531,4 +1531,4 @@ directory_setting.url =
 ##                                   Configure the access URL of firmware            ##          
 #######################################################################################
 #Before using this parameter, you should store the desired firmware (x.71.x.x.rom) to the provisioning server.
-firmware.url =
+firmware.url = {$yealink_t42g_firmware_url}
diff --git a/resources/templates/provision/yealink/t46g/y000000000028.cfg b/resources/templates/provision/yealink/t46g/y000000000028.cfg
index 115f2b6f76..3bf35892fc 100644
--- a/resources/templates/provision/yealink/t46g/y000000000028.cfg
+++ b/resources/templates/provision/yealink/t46g/y000000000028.cfg
@@ -1531,4 +1531,4 @@ directory_setting.url =
 ##                                   Configure the access URL of firmware            ##          
 #######################################################################################
 #Before using this parameter, you should store the desired firmware (x.71.x.x.rom) to the provisioning server.
-firmware.url =
+firmware.url = {$yealink_t46g_firmware_url}
diff --git a/resources/templates/provision/yealink/t48g/y000000000035.cfg b/resources/templates/provision/yealink/t48g/y000000000035.cfg
index e0468db796..fc16fb6ffb 100644
--- a/resources/templates/provision/yealink/t48g/y000000000035.cfg
+++ b/resources/templates/provision/yealink/t48g/y000000000035.cfg
@@ -1531,4 +1531,4 @@ directory_setting.url =
 ##                                   Configure the access URL of firmware            ##          
 #######################################################################################
 #Before using this parameter, you should store the desired firmware (x.71.x.x.rom) to the provisioning server.
-firmware.url =
+firmware.url = {$yealink_t48g_firmware_url}
diff --git a/resources/templates/provision/yealink/w52p/y000000000025.cfg b/resources/templates/provision/yealink/w52p/y000000000025.cfg
index 23ab737315..502d1ec7bf 100644
--- a/resources/templates/provision/yealink/w52p/y000000000025.cfg
+++ b/resources/templates/provision/yealink/w52p/y000000000025.cfg
@@ -314,7 +314,7 @@ phone_setting.predial_autodial = 1
 #######################################################################################
 ##                                   Base_Upgrade                                    ##                                 
 #######################################################################################
-firmware.url = 
+firmware.url = {$yealink_w52p_firmware_url}
 
 #######################################################################################
 ##                                  Handset_upgrade                                            ##