Merge "pjsip/alembic: Add missing columns to system and registration"

configs/samples/pjsip.conf.sample

@@ -948,6 +948,15 @@
                         ; 407 become subject to this retry interval.
 ;server_uri=    ; SIP URI of the server to register against (default: "")
 ;transport=     ; Transport used for outbound authentication (default: "")
+;line=          ; When enabled this option will cause a 'line' parameter to be
+                ; added to the Contact header placed into the outgoing
+                ; registration request. If the remote server sends a call
+                ; this line parameter will be used to establish a relationship
+                ; to the outbound registration, ultimately causing the
+                ; configured endpoint to be used (default: "no")
+;endpoint=      ; When line support is enabled this configured endpoint name
+                ; is used for incoming calls that are related to the outbound
+                ; registration (default: "")
 ;type=  ; Must be of type registration (default: "")
 
 

contrib/ast-db-manage/config/versions/dbc44d5a908_add_missing_columns_to_sys_and_reg.py

@@ -0,0 +1,37 @@
+"""Add missing columns to system and registration
+
+Revision ID: dbc44d5a908
+Revises: 423f34ad36e2
+Create Date: 2016-02-03 13:15:15.083043
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'dbc44d5a908'
+down_revision = '423f34ad36e2'
+
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects.postgresql import ENUM
+
+YESNO_NAME = 'yesno_values'
+YESNO_VALUES = ['yes', 'no']
+
+def upgrade():
+    ############################# Enums ##############################
+
+    # yesno_values have already been created, so use postgres enum object
+    # type to get around "already created" issue - works okay with mysql
+    yesno_values = ENUM(*YESNO_VALUES, name=YESNO_NAME, create_type=False)
+
+    op.add_column('ps_systems', sa.Column('disable_tcp_switch', yesno_values))
+    op.add_column('ps_registrations', sa.Column('line', yesno_values))
+    op.add_column('ps_registrations', sa.Column('endpoint', sa.String(40)))
+    pass
+
+
+def downgrade():
+    op.drop_column('ps_systems', 'disable_tcp_switch')
+    op.drop_column('ps_registrations', 'line')
+    op.drop_column('ps_registrations', 'endpoint')
+    pass