From 4ca1b7e24764cd81e8da26723380f2af06edf642 Mon Sep 17 00:00:00 2001 From: Ted Trask Date: Wed, 20 Apr 2016 18:42:21 +0000 Subject: Remove reference to Polycom 320/330 since no longer supported These devices require 3.x firmware, which has different parameter structure (cherry picked from commit c2f4987f4b6fea7c9da15172a2964fd2723e7e9e) --- provisioning-scripts.lua | 8 ++++---- upgradeprovisioning | 1 + 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/provisioning-scripts.lua b/provisioning-scripts.lua index b995d1a..998a8e7 100644 --- a/provisioning-scripts.lua +++ b/provisioning-scripts.lua @@ -40,7 +40,7 @@ mymodule.provisioning_classes = { "CREATE INDEX classes_label_idx ON provisioning_classes (label)", -- Need to enforce that group/label combo is unique "CREATE UNIQUE INDEX classes_group_label_idx ON provisioning_classes (class_group_id, label)", - "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Polycom SoundPoint IP 320/321/330/331/335 SIP', '1')", + "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Polycom SoundPoint IP 321/331/335 SIP', '1')", "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Polycom SoundPoint IP 450 SIP', '2')", "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Polycom SoundPoint IP 550/560 SIP', '3')", "INSERT INTO provisioning_classes VALUES(default, (SELECT class_group_id FROM provisioning_class_groups WHERE name='device'), 'Polycom SoundPoint IP 650/670 SIP', '4')", @@ -87,9 +87,9 @@ mymodule.classes_to_param_groups = { $$ LANGUAGE plpgsql", "CREATE TRIGGER check_group_trigger BEFORE INSERT ON classes_to_param_groups FOR EACH ROW EXECUTE PROCEDURE check_group_names()", -- Devices - "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 320/321/330/331/335 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Polycom)'))", - "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 320/321/330/331/335 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Polycom)'))", - "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 320/321/330/331/335 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'))", + "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 321/331/335 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Polycom)'))", + "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 321/331/335 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Polycom)'))", + "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 321/331/335 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Polycom Device'))", "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 450 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 1 (Polycom)'))", "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 450 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 2 (Polycom)'))", "INSERT INTO classes_to_param_groups VALUES((SELECT class_id FROM provisioning_classes WHERE label='Polycom SoundPoint IP 450 SIP'), (SELECT group_id FROM provisioning_groups WHERE label='Registration 3 (Polycom)'))", diff --git a/upgradeprovisioning b/upgradeprovisioning index e6da87f..84fb954 100755 --- a/upgradeprovisioning +++ b/upgradeprovisioning @@ -599,6 +599,7 @@ if [ "$version" -lt "9" ]; then done psql -U postgres -c "UPDATE provisioning_params SET descr='Capitalized hex digits with no punctuation' WHERE descr='Capitalized hex digits with no puncuation'" provisioning + psql -U postgres -c "UPDATE provisioning_classes SET label='Polycom SoundPoint IP 321/331/335 SIP' WHERE label='Polycom SoundPoint IP 320/321/330/331/335 SIP'" provisioning # database psql -U postgres -c "UPDATE provisioning_params SET value='9' WHERE name='databaseversion'" provisioning -- cgit v1.2.3