[Asterisk-code-review] pjsip/registration/inbound/nominal/contact acl: Remove dupli... (testsuite[master])

Joshua Colp asteriskteam at digium.com
Tue Dec 29 11:03:10 CST 2015


Joshua Colp has uploaded a new change for review.

  https://gerrit.asterisk.org/1882

Change subject: pjsip/registration/inbound/nominal/contact_acl: Remove duplicate config.
......................................................................

pjsip/registration/inbound/nominal/contact_acl: Remove duplicate config.

These tests had duplicate configuration in their files causing
the configuration to be treated as invalid in some cases. As a result
the tests would have no endpoint to match against and fail.

Change-Id: I66c4e5b62c20892695042873dfa6fb54762d7b77
---
M tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv4/configs/ast1/pjsip.conf
M tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv6/configs/ast1/pjsip.conf
2 files changed, 0 insertions(+), 90 deletions(-)


  git pull ssh://gerrit.asterisk.org:29418/testsuite refs/changes/82/1882/1

diff --git a/tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv4/configs/ast1/pjsip.conf b/tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv4/configs/ast1/pjsip.conf
index dea7a85..a1eda0b 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv4/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv4/configs/ast1/pjsip.conf
@@ -43,48 +43,3 @@
 type=acl
 contact_permit=0.0.0.0/0
 contact_deny=127.0.0.1   ; block only the default loopback address
-[local-transport-template](!)
-type=transport
-bind=127.0.0.1
-
-[local-transport-udp](local-transport-template)
-protocol=udp
-
-[local-transport-tcp](local-transport-template)
-protocol=tcp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-allow=!all,ulaw
-
-[aor-template](!)
-type=aor
-max_contacts=1
-minimum_expiration=5
-default_expiration=30
-
-[alice](endpoint-template)
-aors=alice
-
-[alice](aor-template)
-
-[bob](endpoint-template)
-aors=bob
-
-[bob](aor-template)
-
-[charlie](endpoint-template)
-aors=charlie
-
-[charlie](aor-template)
-
-[carol](endpoint-template)
-aors=carol
-
-[carol](aor-template)
-
-[acl]
-type=acl
-contact_permit=0.0.0.0/0
-contact_deny=127.0.0.1   ; block only the default loopback address
diff --git a/tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv6/configs/ast1/pjsip.conf b/tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv6/configs/ast1/pjsip.conf
index 0d1a5ee..275859c 100644
--- a/tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv6/configs/ast1/pjsip.conf
+++ b/tests/channels/pjsip/registration/inbound/nominal/contact_acl/ipv6/configs/ast1/pjsip.conf
@@ -43,48 +43,3 @@
 type=acl
 contact_permit=::0/0
 contact_deny=::1     ; block only the default loopback address
-[local-transport6-template](!)
-type=transport
-bind=[::1]
-
-[local-transport-udp6](local-transport6-template)
-protocol=udp
-
-[local-transport-tcp6](local-transport6-template)
-protocol=tcp
-
-[endpoint-template](!)
-type=endpoint
-context=default
-allow=!all,ulaw
-
-[aor-template](!)
-type=aor
-max_contacts=1
-minimum_expiration=5
-default_expiration=30
-
-[alice](endpoint-template)
-aors=alice
-
-[alice](aor-template)
-
-[bob](endpoint-template)
-aors=bob
-
-[bob](aor-template)
-
-[charlie](endpoint-template)
-aors=charlie
-
-[charlie](aor-template)
-
-[carol](endpoint-template)
-aors=carol
-
-[carol](aor-template)
-
-[acl]
-type=acl
-contact_permit=::0/0
-contact_deny=::1     ; block only the default loopback address

-- 
To view, visit https://gerrit.asterisk.org/1882
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I66c4e5b62c20892695042873dfa6fb54762d7b77
Gerrit-PatchSet: 1
Gerrit-Project: testsuite
Gerrit-Branch: master
Gerrit-Owner: Joshua Colp <jcolp at digium.com>



More information about the asterisk-code-review mailing list