changes to sync with latest db

2026-07-04 19:11:47 +00:00 · 2020-01-29 14:00:36 -05:00
parent 4a4fa485b8
commit a914225441
6 changed files with 156 additions and 100 deletions
@@ -2,7 +2,7 @@ const debug = require('debug')('jambonz:sbc-inbound');

 module.exports = function(srf, logger) {
  const {lookupSipGatewayBySignalingAddress, lookupAuthHook}  = srf.locals.dbHelpers;
-  const authenticator = require('drachtio-http-authenticator')(lookupAuthHook, logger);
+  const authenticator = require('jambonz-http-authenticator')(lookupAuthHook, logger);

  async function challengeDeviceCalls(req, res, next) {
    req.locals = req.locals || {};
@@ -719,18 +719,6 @@
      "resolved": "https://registry.npmjs.org/drachtio-fn-b2b-sugar/-/drachtio-fn-b2b-sugar-0.0.12.tgz",
      "integrity": "sha512-FKPAcEMJTYKDrd9DJUCc4VHnY/c65HOO9k8XqVNognF9T02hKEjGuBCM4Da9ipyfiHmVRuECwj0XNvZ361mkVQ=="
    },
-    "drachtio-http-authenticator": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/drachtio-http-authenticator/-/drachtio-http-authenticator-0.1.8.tgz",
-      "integrity": "sha512-VKgEt5AA1tXVa82ZwMqnTPrQC9OudHWuuxjNtQY3n53s+gzQDE+e4HN2ZcGVaQFbHpiKJHnxlb7FClshco4jLA==",
-      "requires": {
-        "debug": "^4.1.1",
-        "drachtio-srf": "^4.4.14",
-        "nonce": "^1.0.4",
-        "request": "^2.88.0",
-        "request-debug": "^0.2.0"
-      }
-    },
    "drachtio-mw-registration-parser": {
      "version": "0.0.2",
      "resolved": "https://registry.npmjs.org/drachtio-mw-registration-parser/-/drachtio-mw-registration-parser-0.0.2.tgz",
@@ -1770,14 +1758,26 @@
      }
    },
    "jambonz-db-helpers": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/jambonz-db-helpers/-/jambonz-db-helpers-0.1.5.tgz",
-      "integrity": "sha512-gYCvfgFUNWf5gNPG6GilkySbWvLnKN9fwUa+lhPjhglszVlyhXYAzoFXJvjvVYxFKr/UVhc5djY3Os4M2MJtIw==",
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/jambonz-db-helpers/-/jambonz-db-helpers-0.2.0.tgz",
+      "integrity": "sha512-AykK4ICzUl5/LaNQGZdy8dlWuv8nOSSRVAqQDztJvdmJHyl4wTEC+///pKNgQlm+RX7R3vCV7dFCVoTHuIAx3A==",
      "requires": {
        "debug": "^4.1.1",
        "mysql2": "^2.0.2"
      }
    },
+    "jambonz-http-authenticator": {
+      "version": "0.0.7",
+      "resolved": "https://registry.npmjs.org/jambonz-http-authenticator/-/jambonz-http-authenticator-0.0.7.tgz",
+      "integrity": "sha512-mNtDptv6E3+CVbNYReBGl9IqbIIB+rWpIm9hftXABh7nYlKoKr3yimZkoNsJcZbGHm1rYW6dyfyR8/KqBsmq1Q==",
+      "requires": {
+        "debug": "^4.1.1",
+        "drachtio-srf": "^4.4.27",
+        "nonce": "^1.0.4",
+        "request": "^2.88.0",
+        "request-debug": "^0.2.0"
+      }
+    },
    "js-tokens": {
      "version": "4.0.0",
      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
@@ -2062,9 +2062,9 @@
      "dev": true
    },
    "mysql2": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-2.0.2.tgz",
-      "integrity": "sha512-n9Tiw8LzrfOnH1CLFw0AWJlkQLOWMSr2Q+/aF5jRJ7SRRJLGrY9FidhyoTEhF0FxQYE+xABvXwiZl4b61Mt4eg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mysql2/-/mysql2-2.1.0.tgz",
+      "integrity": "sha512-9kGVyi930rG2KaHrz3sHwtc6K+GY9d8wWk1XRSYxQiunvGcn4DwuZxOwmK11ftuhhwrYDwGx9Ta4VBwznJn36A==",
      "requires": {
        "cardinal": "^2.1.1",
        "denque": "^1.4.1",
@@ -2078,9 +2078,9 @@
      },
      "dependencies": {
        "iconv-lite": {
-          "version": "0.5.0",
-          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.0.tgz",
-          "integrity": "sha512-NnEhI9hIEKHOzJ4f697DMz9IQEXr/MMJ5w64vN2/4Ai+wRnvV7SBrL0KLoRlwaKVghOc7LQ5YkPLuX146b6Ydw==",
+          "version": "0.5.1",
+          "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.5.1.tgz",
+          "integrity": "sha512-ONHr16SQvKZNSqjQT9gy5z24Jw+uqfO02/ngBSBoqChZ+W8qXX7GPRa1RoUnzGADw8K63R1BXUMzarCVQBpY8Q==",
          "requires": {
            "safer-buffer": ">= 2.1.2 < 3"
          }
@@ -28,9 +28,9 @@
    "config": "^3.2.4",
    "debug": "^4.1.1",
    "drachtio-fn-b2b-sugar": "0.0.12",
-    "drachtio-http-authenticator": "^0.1.8",
    "drachtio-srf": "^4.4.27",
-    "jambonz-db-helpers": "^0.1.5",
+    "jambonz-db-helpers": "^0.2.0",
+    "jambonz-http-authenticator": "0.0.7",
    "pino": "^5.14.0",
    "rtpengine-client": "^0.0.8"
  },
@@ -5,46 +5,42 @@ DROP TABLE IF EXISTS `call_routes`;

 DROP TABLE IF EXISTS `conference_participants`;

-DROP TABLE IF EXISTS `queue_members`;
-
-DROP TABLE IF EXISTS `calls`;
-
-DROP TABLE IF EXISTS `phone_numbers`;
-
-DROP TABLE IF EXISTS `applications`;
-
 DROP TABLE IF EXISTS `conferences`;

+DROP TABLE IF EXISTS `lcr_carrier_set_entry`;
+
+DROP TABLE IF EXISTS `lcr_routes`;
+
+DROP TABLE IF EXISTS `queue_members`;
+
 DROP TABLE IF EXISTS `queues`;

+DROP TABLE IF EXISTS `calls`;
+
 DROP TABLE IF EXISTS `subscriptions`;

 DROP TABLE IF EXISTS `registrations`;

 DROP TABLE IF EXISTS `api_keys`;

-DROP TABLE IF EXISTS `accounts`;
-
-DROP TABLE IF EXISTS `service_providers`;
+DROP TABLE IF EXISTS `phone_numbers`;

 DROP TABLE IF EXISTS `sip_gateways`;

 DROP TABLE IF EXISTS `voip_carriers`;

-CREATE TABLE IF NOT EXISTS `applications`
-(
-`application_sid` CHAR(36) NOT NULL UNIQUE ,
-`name` VARCHAR(255) NOT NULL,
-`account_sid` CHAR(36) NOT NULL,
-`call_hook` VARCHAR(255) NOT NULL,
-`call_status_hook` VARCHAR(255) NOT NULL,
-PRIMARY KEY (`application_sid`)
-) ENGINE=InnoDB COMMENT='A defined set of behaviors to be applied to phone calls with';
+DROP TABLE IF EXISTS `applications`;
+
+DROP TABLE IF EXISTS `accounts`;
+
+DROP TABLE IF EXISTS `service_providers`;
+
+DROP TABLE IF EXISTS `webhooks`;

 CREATE TABLE IF NOT EXISTS `call_routes`
 (
 `call_route_sid` CHAR(36) NOT NULL UNIQUE ,
-`order` INTEGER NOT NULL,
+`priority` INTEGER NOT NULL,
 `account_sid` CHAR(36) NOT NULL,
 `regex` VARCHAR(255) NOT NULL,
 `application_sid` CHAR(36) NOT NULL,
@@ -67,6 +63,15 @@ CREATE TABLE IF NOT EXISTS `conference_participants`
 PRIMARY KEY (`conference_participant_sid`)
 ) ENGINE=InnoDB COMMENT='A relationship between a call and a conference that it is co';

+CREATE TABLE IF NOT EXISTS `lcr_routes`
+(
+`lcr_route_sid` CHAR(36),
+`regex` VARCHAR(32) NOT NULL,
+`description` VARCHAR(1024),
+`priority` INTEGER NOT NULL UNIQUE ,
+PRIMARY KEY (`lcr_route_sid`)
+);
+
 CREATE TABLE IF NOT EXISTS `queues`
 (
 `id` INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE ,
@@ -129,18 +134,6 @@ CREATE TABLE IF NOT EXISTS `calls`
 PRIMARY KEY (`call_sid`)
 ) ENGINE=InnoDB COMMENT='A phone call';

-CREATE TABLE IF NOT EXISTS `service_providers`
-(
-`service_provider_sid` CHAR(36) NOT NULL UNIQUE ,
-`name` VARCHAR(255) NOT NULL UNIQUE ,
-`description` VARCHAR(255),
-`root_domain` VARCHAR(255) UNIQUE ,
-`registration_hook` VARCHAR(255),
-`hook_basic_auth_user` VARCHAR(255),
-`hook_basic_auth_password` VARCHAR(255),
-PRIMARY KEY (`service_provider_sid`)
-) ENGINE=InnoDB COMMENT='An organization that provides communication services to its ';
-
 CREATE TABLE IF NOT EXISTS `api_keys`
 (
 `api_key_sid` CHAR(36) NOT NULL UNIQUE ,
@@ -150,19 +143,6 @@ CREATE TABLE IF NOT EXISTS `api_keys`
 PRIMARY KEY (`api_key_sid`)
 ) ENGINE=InnoDB COMMENT='An authorization token that is used to access the REST api';

-CREATE TABLE IF NOT EXISTS `accounts`
-(
-`account_sid` CHAR(36) NOT NULL UNIQUE ,
-`name` VARCHAR(255) NOT NULL,
-`sip_realm` VARCHAR(255) UNIQUE ,
-`service_provider_sid` CHAR(36) NOT NULL,
-`registration_hook` VARCHAR(255),
-`hook_basic_auth_user` VARCHAR(255),
-`hook_basic_auth_password` VARCHAR(255),
-`is_active` BOOLEAN NOT NULL DEFAULT true,
-PRIMARY KEY (`account_sid`)
-) ENGINE=InnoDB COMMENT='A single end-user of the platform';
-
 CREATE TABLE IF NOT EXISTS `subscriptions`
 (
 `id` INTEGER(10) UNSIGNED NOT NULL AUTO_INCREMENT UNIQUE ,
@@ -180,6 +160,16 @@ CREATE TABLE IF NOT EXISTS `voip_carriers`
 PRIMARY KEY (`voip_carrier_sid`)
 ) ENGINE=InnoDB COMMENT='An external organization that can provide sip trunking and D';

+CREATE TABLE IF NOT EXISTS `webhooks`
+(
+`webhook_sid` CHAR(36) NOT NULL UNIQUE ,
+`url` VARCHAR(255) NOT NULL,
+`method` ENUM("get","post") NOT NULL DEFAULT 'post',
+`username` VARCHAR(255),
+`password` VARCHAR(255),
+PRIMARY KEY (`webhook_sid`)
+);
+
 CREATE TABLE IF NOT EXISTS `phone_numbers`
 (
 `phone_number_sid` CHAR(36) UNIQUE ,
@@ -190,6 +180,16 @@ CREATE TABLE IF NOT EXISTS `phone_numbers`
 PRIMARY KEY (`phone_number_sid`)
 ) ENGINE=InnoDB COMMENT='A phone number that has been assigned to an account';

+CREATE TABLE IF NOT EXISTS `lcr_carrier_set_entry`
+(
+`lcr_carrier_set_entry_sid` CHAR(36),
+`workload` INTEGER NOT NULL DEFAULT 1,
+`lcr_route_sid` CHAR(36) NOT NULL,
+`voip_carrier_sid` CHAR(36) NOT NULL,
+`priority` INTEGER NOT NULL DEFAULT 0,
+PRIMARY KEY (`lcr_carrier_set_entry_sid`)
+);
+
 CREATE TABLE IF NOT EXISTS `sip_gateways`
 (
 `sip_gateway_sid` CHAR(36),
@@ -198,19 +198,49 @@ CREATE TABLE IF NOT EXISTS `sip_gateways`
 `inbound` BOOLEAN NOT NULL,
 `outbound` BOOLEAN NOT NULL,
 `voip_carrier_sid` CHAR(36) NOT NULL,
-`is_active` BOOLEAN NOT NULL DEFAULT true,
+`is_active` BOOLEAN NOT NULL DEFAULT 1,
 PRIMARY KEY (`sip_gateway_sid`)
 );

-CREATE UNIQUE INDEX `applications_idx_name` ON `applications` (`account_sid`,`name`);
+CREATE TABLE IF NOT EXISTS `applications`
+(
+`application_sid` CHAR(36) NOT NULL UNIQUE ,
+`name` VARCHAR(255) NOT NULL,
+`account_sid` CHAR(36) NOT NULL,
+`call_hook_sid` CHAR(36),
+`call_status_hook_sid` CHAR(36),
+`speech_synthesis_vendor` VARCHAR(64) NOT NULL DEFAULT 'google',
+`speech_synthesis_voice` VARCHAR(64) NOT NULL DEFAULT 'en-US-Wavenet-C',
+`speech_recognizer_vendor` VARCHAR(64) NOT NULL DEFAULT 'google',
+`speech_recognizer_language` VARCHAR(64) NOT NULL DEFAULT 'en-US',
+PRIMARY KEY (`application_sid`)
+) ENGINE=InnoDB COMMENT='A defined set of behaviors to be applied to phone calls with';

-CREATE INDEX `applications_application_sid_idx` ON `applications` (`application_sid`);
-CREATE INDEX `applications_name_idx` ON `applications` (`name`);
-CREATE INDEX `applications_account_sid_idx` ON `applications` (`account_sid`);
-ALTER TABLE `applications` ADD FOREIGN KEY account_sid_idxfk (`account_sid`) REFERENCES `accounts` (`account_sid`);
+CREATE TABLE IF NOT EXISTS `service_providers`
+(
+`service_provider_sid` CHAR(36) NOT NULL UNIQUE ,
+`name` VARCHAR(255) NOT NULL UNIQUE ,
+`description` VARCHAR(255),
+`root_domain` VARCHAR(255) UNIQUE ,
+`registration_hook_sid` CHAR(36),
+PRIMARY KEY (`service_provider_sid`)
+) ENGINE=InnoDB COMMENT='An organization that provides communication services to its ';
+
+CREATE TABLE IF NOT EXISTS `accounts`
+(
+`account_sid` CHAR(36) NOT NULL UNIQUE ,
+`name` VARCHAR(255) NOT NULL,
+`sip_realm` VARCHAR(255) UNIQUE ,
+`service_provider_sid` CHAR(36) NOT NULL,
+`registration_hook_sid` CHAR(36),
+`device_calling_hook_sid` CHAR(36),
+`error_hook_sid` CHAR(36),
+`is_active` BOOLEAN NOT NULL DEFAULT true,
+PRIMARY KEY (`account_sid`)
+) ENGINE=InnoDB COMMENT='A single end-user of the platform';

 CREATE INDEX `call_routes_call_route_sid_idx` ON `call_routes` (`call_route_sid`);
-ALTER TABLE `call_routes` ADD FOREIGN KEY account_sid_idxfk_1 (`account_sid`) REFERENCES `accounts` (`account_sid`);
+ALTER TABLE `call_routes` ADD FOREIGN KEY account_sid_idxfk (`account_sid`) REFERENCES `accounts` (`account_sid`);

 ALTER TABLE `call_routes` ADD FOREIGN KEY application_sid_idxfk (`application_sid`) REFERENCES `applications` (`application_sid`);

@@ -239,34 +269,58 @@ ALTER TABLE `calls` ADD FOREIGN KEY inbound_user_sid_idxfk (`inbound_user_sid`)

 ALTER TABLE `calls` ADD FOREIGN KEY outbound_user_sid_idxfk (`outbound_user_sid`) REFERENCES `registrations` (`registration_sid`);

-CREATE INDEX `service_providers_service_provider_sid_idx` ON `service_providers` (`service_provider_sid`);
-CREATE INDEX `service_providers_name_idx` ON `service_providers` (`name`);
-CREATE INDEX `service_providers_root_domain_idx` ON `service_providers` (`root_domain`);
 CREATE INDEX `api_keys_api_key_sid_idx` ON `api_keys` (`api_key_sid`);
 CREATE INDEX `api_keys_account_sid_idx` ON `api_keys` (`account_sid`);
-ALTER TABLE `api_keys` ADD FOREIGN KEY account_sid_idxfk_2 (`account_sid`) REFERENCES `accounts` (`account_sid`);
+ALTER TABLE `api_keys` ADD FOREIGN KEY account_sid_idxfk_1 (`account_sid`) REFERENCES `accounts` (`account_sid`);

 CREATE INDEX `api_keys_service_provider_sid_idx` ON `api_keys` (`service_provider_sid`);
 ALTER TABLE `api_keys` ADD FOREIGN KEY service_provider_sid_idxfk (`service_provider_sid`) REFERENCES `service_providers` (`service_provider_sid`);

+ALTER TABLE `subscriptions` ADD FOREIGN KEY registration_sid_idxfk (`registration_sid`) REFERENCES `registrations` (`registration_sid`);
+
+CREATE INDEX `voip_carriers_voip_carrier_sid_idx` ON `voip_carriers` (`voip_carrier_sid`);
+CREATE INDEX `voip_carriers_name_idx` ON `voip_carriers` (`name`);
+CREATE INDEX `webhooks_webhook_sid_idx` ON `webhooks` (`webhook_sid`);
+CREATE INDEX `phone_numbers_phone_number_sid_idx` ON `phone_numbers` (`phone_number_sid`);
+CREATE INDEX `phone_numbers_voip_carrier_sid_idx` ON `phone_numbers` (`voip_carrier_sid`);
+ALTER TABLE `phone_numbers` ADD FOREIGN KEY voip_carrier_sid_idxfk (`voip_carrier_sid`) REFERENCES `voip_carriers` (`voip_carrier_sid`);
+
+ALTER TABLE `phone_numbers` ADD FOREIGN KEY account_sid_idxfk_2 (`account_sid`) REFERENCES `accounts` (`account_sid`);
+
+ALTER TABLE `phone_numbers` ADD FOREIGN KEY application_sid_idxfk_2 (`application_sid`) REFERENCES `applications` (`application_sid`);
+
+ALTER TABLE `lcr_carrier_set_entry` ADD FOREIGN KEY lcr_route_sid_idxfk (`lcr_route_sid`) REFERENCES `lcr_routes` (`lcr_route_sid`);
+
+ALTER TABLE `lcr_carrier_set_entry` ADD FOREIGN KEY voip_carrier_sid_idxfk_1 (`voip_carrier_sid`) REFERENCES `voip_carriers` (`voip_carrier_sid`);
+
+CREATE UNIQUE INDEX `sip_gateways_sip_gateway_idx_hostport` ON `sip_gateways` (`ipv4`,`port`);
+
+ALTER TABLE `sip_gateways` ADD FOREIGN KEY voip_carrier_sid_idxfk_2 (`voip_carrier_sid`) REFERENCES `voip_carriers` (`voip_carrier_sid`);
+
+CREATE UNIQUE INDEX `applications_idx_name` ON `applications` (`account_sid`,`name`);
+
+CREATE INDEX `applications_application_sid_idx` ON `applications` (`application_sid`);
+CREATE INDEX `applications_name_idx` ON `applications` (`name`);
+CREATE INDEX `applications_account_sid_idx` ON `applications` (`account_sid`);
+ALTER TABLE `applications` ADD FOREIGN KEY account_sid_idxfk_3 (`account_sid`) REFERENCES `accounts` (`account_sid`);
+
+ALTER TABLE `applications` ADD FOREIGN KEY call_hook_sid_idxfk (`call_hook_sid`) REFERENCES `webhooks` (`webhook_sid`);
+
+ALTER TABLE `applications` ADD FOREIGN KEY call_status_hook_sid_idxfk (`call_status_hook_sid`) REFERENCES `webhooks` (`webhook_sid`);
+
+CREATE INDEX `service_providers_service_provider_sid_idx` ON `service_providers` (`service_provider_sid`);
+CREATE INDEX `service_providers_name_idx` ON `service_providers` (`name`);
+CREATE INDEX `service_providers_root_domain_idx` ON `service_providers` (`root_domain`);
+ALTER TABLE `service_providers` ADD FOREIGN KEY registration_hook_sid_idxfk (`registration_hook_sid`) REFERENCES `webhooks` (`webhook_sid`);
+
 CREATE INDEX `accounts_account_sid_idx` ON `accounts` (`account_sid`);
 CREATE INDEX `accounts_name_idx` ON `accounts` (`name`);
 CREATE INDEX `accounts_sip_realm_idx` ON `accounts` (`sip_realm`);
 CREATE INDEX `accounts_service_provider_sid_idx` ON `accounts` (`service_provider_sid`);
 ALTER TABLE `accounts` ADD FOREIGN KEY service_provider_sid_idxfk_1 (`service_provider_sid`) REFERENCES `service_providers` (`service_provider_sid`);

-ALTER TABLE `subscriptions` ADD FOREIGN KEY registration_sid_idxfk (`registration_sid`) REFERENCES `registrations` (`registration_sid`);
+ALTER TABLE `accounts` ADD FOREIGN KEY registration_hook_sid_idxfk_1 (`registration_hook_sid`) REFERENCES `webhooks` (`webhook_sid`);

-CREATE INDEX `voip_carriers_voip_carrier_sid_idx` ON `voip_carriers` (`voip_carrier_sid`);
-CREATE INDEX `voip_carriers_name_idx` ON `voip_carriers` (`name`);
-CREATE INDEX `phone_numbers_phone_number_sid_idx` ON `phone_numbers` (`phone_number_sid`);
-CREATE INDEX `phone_numbers_voip_carrier_sid_idx` ON `phone_numbers` (`voip_carrier_sid`);
-ALTER TABLE `phone_numbers` ADD FOREIGN KEY voip_carrier_sid_idxfk (`voip_carrier_sid`) REFERENCES `voip_carriers` (`voip_carrier_sid`);
+ALTER TABLE `accounts` ADD FOREIGN KEY device_calling_hook_sid_idxfk (`device_calling_hook_sid`) REFERENCES `webhooks` (`webhook_sid`);

-ALTER TABLE `phone_numbers` ADD FOREIGN KEY account_sid_idxfk_3 (`account_sid`) REFERENCES `accounts` (`account_sid`);
-
-ALTER TABLE `phone_numbers` ADD FOREIGN KEY application_sid_idxfk_2 (`application_sid`) REFERENCES `applications` (`application_sid`);
-
-CREATE UNIQUE INDEX `sip_gateways_sip_gateway_idx_hostport` ON `sip_gateways` (`ipv4`,`port`);
-
-ALTER TABLE `sip_gateways` ADD FOREIGN KEY voip_carrier_sid_idxfk_1 (`voip_carrier_sid`) REFERENCES `voip_carriers` (`voip_carrier_sid`);
+ALTER TABLE `accounts` ADD FOREIGN KEY error_hook_sid_idxfk (`error_hook_sid`) REFERENCES `webhooks` (`webhook_sid`);
@@ -1,7 +1,9 @@
-insert into service_providers (service_provider_sid, name, root_domain, registration_hook, hook_basic_auth_user, hook_basic_auth_password) 
-values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'SP A', 'jambonz.org', 'http://127.0.0.1:4000/auth', 'foo', 'bar');
-insert into accounts(account_sid, service_provider_sid, name, sip_realm, registration_hook, hook_basic_auth_user, hook_basic_auth_password)
-values ('ed649e33-e771-403a-8c99-1780eabbc803', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'test account', 'sip.example.com', 'http://127.0.0.1:4000/auth', 'foo', 'bar');
+insert into webhooks(webhook_sid, url, username, password) values('90dda62e-0ea2-47d1-8164-5bd49003476c', 'http://127.0.0.1:4000/auth', 'foo', 'bar');
+
+insert into service_providers (service_provider_sid, name, root_domain, registration_hook_sid) 
+values ('3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'SP A', 'jambonz.org', '90dda62e-0ea2-47d1-8164-5bd49003476c');
+insert into accounts(account_sid, service_provider_sid, name, sip_realm, registration_hook_sid)
+values ('ed649e33-e771-403a-8c99-1780eabbc803', '3f35518f-5a0d-4c2e-90a5-2407bb3b36f0', 'test account', 'sip.example.com', '90dda62e-0ea2-47d1-8164-5bd49003476c');

 insert into voip_carriers (voip_carrier_sid, name) values ('287c1452-620d-4195-9f19-c9814ef90d78', 'westco');
 insert into sip_gateways (sip_gateway_sid, voip_carrier_sid, ipv4, inbound, outbound) 
@@ -25,7 +25,7 @@
  <send retrans="500">
    <![CDATA[

-      INVITE sip:[service]@jambones.org SIP/2.0
+      INVITE sip:[service]@baddomain.org SIP/2.0
      Via: SIP/2.0/[transport] [local_ip]:[local_port];branch=[branch]
      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
      To: [service] <sip:[service]@[remote_ip]:[remote_port]>
@@ -59,7 +59,7 @@
  <send>
    <![CDATA[

-      ACK sip:[service]@jambones.org SIP/2.0
+      ACK sip:[service]@baddomain.org SIP/2.0
      [last_Via]
      From: sipp <sip:sipp@[local_ip]:[local_port]>;tag=[pid]SIPpTag09[call_number]
      To: [service] <sip:[service]@[remote_ip]:[remote_port]>[peer_tag_param]