Issue 2073 - Organization phase 1 #2431

maria-farooq · 2017-08-18T12:11:27Z

Telscale PR https://bitbucket.org/telestax/telscale-restcomm/pull-requests/33/issue-2073-organization-phase-1/diff
test suit results: https://mobicents.ci.cloudbees.com/job/RestComm-For-Specific-Branch/127/

…ault) in init and also update default entry #2073

…2073 #2085

* master: Documentation for issue #1939 Minor fix Revert SMPP SMS encoding to GSM. And use -d encoding for API. Patch to support dialling a registered client if request comes from external network This close #2086 added comment fixed #2011, cc: #1939 removed unused import unignored added some useful tests updated test modify calltool to getCall from another account's resource #1939 set account sid to the account sid of from client account #1939 completed test for #1939 register sub-account-client with restcomm access cdr from subaccount teporarily ignored rest of test to test new one added shallow test added data for sub-account and sub-account-client Revert "added space" added space Conflicts resolved in: restcomm/restcomm.testsuite/src/test/resources/restcomm.script_callLifecycleTest

* master: (22 commits) Fixes for testsuite for LCM This refer to #1135 Update MGCP driver to 6.0.22 This refer to #2015 added DTMF_DETECTOR_TONE_DURATION=80 patched #2024 https://telestax.atlassian.net/browse/RESTCOMM-841 cs fix #2024 cs fix #2024 patched #2024 #2015 Set Media Server version to 5.1.0.43 added author #2015 Updated MGCP driver version to 6.0.23. patched #1988 #2015 Updated RMS version to 7.0.8. added config for rtp timout and start time params #1821 #1822 updated ascii docs #1135 #1907 #1312 completed mute unmute test #1135 #1907 #1312 added mute functionality for call added Mute param in Call Tools test #1135 #1312 #1907 added 2 more phones added shallow test structure added mute/unmute in callsendpoint #1135 ...

#2106

…, updated getClientByLogin to include organization sid #2106

* master: Removing Dialogic libraries and enabling automatic download at runtime, when XMS is configured. Closes #2384. Issue #2406: Minor cleanup, save messageType as local var Revert "Preliminar structure to download Dialogic libraries for XMS at runtime. Issue #2384." Preliminar structure to download Dialogic libraries for XMS at runtime. Issue #2384. Preliminar structure to download Dialogic libraries for XMS at runtime. Issue #2384. fix issue that creates loop in USSD PUSH

* master: updated sip servlet build

* master: Revert "Patch for Restcomm `acting-as-proxy` feature to provide option to disable SDP patching This close #2391" Revert "Patch for Restcomm acting as a proxy to disable SDP patching. This refer to #2391" Revert "Patch for Restcomm acting as a proxy to disable SDP patching. This refer to #2391" Revert "Patch for Restcomm acting as a proxy to disable SDP patching. This refer to #2391" Revert "Patch for Restcomm acting as a proxy to disable SDP patching. This refer to #2391" Revert "Patch for Restcomm acting as a proxy to disable SDP patching. This refer to #2391" Revert "Patch for Restcomm acting as a proxy to disable SDP patching. This refer to #2391" Issue #2411: Workaround: Add end transitions to processingInfo Issue #2411: Workaround: Send Bye when received DownloaderResponse in wrong State Conflicts resolved: restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/util/SdpUtils.java restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java

gvagenas

@maria-farooq I provided my comments.

I run few tests and some of them fail, such as the:

org.restcomm.connect.testsuite.telephony.ClientMessageTest
org.restcomm.connect.testsuite.telephony.ClientsDialTest

Can you please check and also start a new CI build to check the testsuite?

Last, how it will be the migration of existing clients, IncomingPhoneNumbers etc? I guess it will be done manualy, right?

gvagenas · 2017-08-22T10:42:41Z

restcomm/restcomm.application/src/main/java/org/restcomm/connect/application/Bootstrapper.java

+
+            final String hostname = configuration.getString("hostname");
+            Organization organization = storage.getOrganizationsDao().getOrganization(new Sid(defaultOrganization));
+            if(organization != null){


@maria-farooq Shouldn't we create a new Organization in case the default one is null?

yes agreed, done!

gvagenas · 2017-08-22T10:45:39Z

restcomm/restcomm.application/src/main/webapp/WEB-INF/data/hsql/restcomm.script

@@ -27,19 +28,20 @@ CREATE USER SA PASSWORD ""
 GRANT DBA TO SA
 SET WRITE_DELAY 10
 SET SCHEMA PUBLIC
-INSERT INTO "restcomm_accounts" VALUES('ACae6e420f425248d6a26948c17a9e2acf','2012-04-24 00:00:00.000000000','2012-04-24 00:00:00.000000000','[email protected]','Default Administrator Account',NULL,'Full','uninitialized','77f8c12cc7b8f8423e5c38b035249166','Administrator','/2012-04-24/Accounts/ACae6e420f425248d6a26948c17a9e2acf')
+INSERT INTO "restcomm_organizations" VALUES('ORafbe225ad37541eba518a74248f0ac4c', 'default.restcomm.com', '2017-04-19 00:00:00.000000000','2017-04-19 00:00:00.000000000')


@maria-farooq I believe the default Organization domain name should be configurable at retcomm.xml, so Bootstrapper will create a default Org in case it's missing from the DB.

This way we can cover cloud deployment and on-premise deployments

@gvagenas it is configureable from restcomm.xml, we are using hostname properly as domain name. on bootstap RC will update this domain name and set it using hostname properly

gvagenas · 2017-08-22T10:46:49Z

restcomm/restcomm.commons/src/main/java/org/restcomm/connect/commons/util/DNSUtils.java

+/**
+ * @author [email protected] (Maria Farooq)
+ */
+public class DNSUtils {


@maria-farooq I guess you provided this utility class just to help you with testing, right?

gvagenas · 2017-08-22T10:49:22Z

restcomm/restcomm.application/src/main/java/org/restcomm/connect/application/Bootstrapper.java

            context.setAttribute(InstanceId.class.getName(), instanceId);
            monitoring.tell(instanceId, null);
            RestcommConfiguration.getInstance().getMain().setInstanceId(instanceId.getId().toString());
+
+            generateDefaultDomainName(xml.subset("http-client"), storage);


@maria-farooq If the default Domain Name generation fails nothing will happen. I think here we should either stop RC or try to recover from this

yes agreed, done!

gvagenas · 2017-08-24T05:19:58Z

...comm/restcomm.http/src/main/java/org/restcomm/connect/http/IncomingPhoneNumbersEndpoint.java

            }
+        }catch(Exception e){
+            logger.error("", e);


@maria-farooq we should provide a description to the log message

gvagenas · 2017-08-24T05:21:26Z

...comm/restcomm.http/src/main/java/org/restcomm/connect/http/IncomingPhoneNumbersEndpoint.java

+            dao.removeIncomingPhoneNumber(new Sid(sid));
+            return noContent().build();
+        }catch(Exception e){
+            logger.error("", e);


@maria-farooq we should provide a description to the log message

gvagenas · 2017-08-24T05:21:37Z

...comm/restcomm.http/src/main/java/org/restcomm/connect/http/IncomingPhoneNumbersEndpoint.java

+            }
+            return status(BAD_REQUEST).entity("21452").build();
+        }catch(Exception e){
+            logger.error("", e);


@maria-farooq we should provide a description to the log message

gvagenas · 2017-08-24T07:55:22Z

restcomm/restcomm.sms/src/main/java/org/restcomm/connect/sms/smpp/SmppMessageHandler.java

-        IncomingPhoneNumber number = numbers.getIncomingPhoneNumber(to);
+        final IncomingPhoneNumbersDao numbersDao = storage.getIncomingPhoneNumbersDao();
+        List<IncomingPhoneNumber> numbers = numbersDao.getIncomingPhoneNumber(to);
+        IncomingPhoneNumber number = numbers.get(0);


@maria-farooq The IncomingPhoneNumber number here is used only for the logging statement, unless if I am missing something.
Shouldn't be better to remove the lookup and save resources?

Agreed! removed. done

gvagenas · 2017-08-24T13:12:15Z

restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java

@@ -500,13 +504,23 @@ private void invite(final Object message) throws IOException, NumberParseExcepti
        final ApplicationsDao applications = storage.getApplicationsDao();
        // Try to find an application defined for the client.
        final SipURI fromUri = (SipURI) request.getFrom().getURI();
+        Sid sourceOrganizationSid = OrganizationUtil.getOrganizationSidBySipURIHost(storage, fromUri);


@maria-farooq I think this part should be handled withn a lot of precaution.
If INVITE arrives from NEXMO or a sip endpoint that uses SIP URI, sourceOrganizationSid will be null and thus the log statements below will throw exception, several operations down below will also fail.
Unless I am missing something here

@gvagenas as discussed on chat it is safe from NPE

gvagenas · 2017-08-24T13:14:33Z

restcomm/restcomm.telephony/src/main/java/org/restcomm/connect/telephony/CallManager.java

@@ -538,8 +552,14 @@ private void invite(final Object message) throws IOException, NumberParseExcepti
            logger.info("mediaExternalIp: " + mediaExternalIp);
            logger.info("proxyIp: " + proxyIp);
        }
-
-        final Client toClient = clients.getClient(toUser);
+        Sid toOrganizationSid = OrganizationUtil.getOrganizationSidBySipURIHost(storage, (SipURI) request.getTo().getURI());


@maria-farooq similar to the previous comment, the toOrganizationSid should be carefully handled becaue next log statement will throw NPE.

@gvagenas as discussed on chat it is safe from NPE

* master: Change CDR status to lowercase 'completed' when 'updateInCompleteCallDetailRecordsToCompletedByInstanceId' applies. Issue #2162

…for null organization based on from URI

* master: Push server HTTP request Content-Type is "application/json"

maria-farooq · 2017-08-29T09:13:33Z

@gvagenas i have take care of all comments and also test suit is green now

Maria Farooq added 30 commits April 19, 2017 18:45

added data model #2073

07d8b09

added organizations table #2073

cf6d703

removed meaningless columns #2073

69f8014

updated data model #2073

e950dae

updated account table (added new column for organization_sid with def…

e7cecd6

…ault) in init and also update default entry #2073

updated test suit scripts

0cc725d

updated in project test scripts #2073

b8e205b

corrected exatra closing bracket

6fe48c9

corrected syntax error

60eaa16

corrected hsql syntax

95189ad

added Organization interface and added unique domain_name constraint #…

2b1a43d

…2073 #2085

added organization dao #2073 #2085

c123540

added organization mybatis xml query mapping files #2073 #2085

ffd43b6

added org in account api response #2073 #2085

654b078

covered custuctor changes

d08ae0e

added org element in account api response

b76f3da

handled NPE

bf600f7

added junit test case #2085 #2073

6f04f27

removed org id from account api response #2073

5e6bf94

added unit test for adding same sip client in 2 different Organizations

fe72d6a

#2106

updated test #2106

dedda49

updated call manager for resolving organization based on SIPUri Host …

60d8ab2

…, updated getClientByLogin to include organization sid #2106

updated CallManager and SMSService for org #2106

52f44e9

handled UAM Register and MESSAGES as per org #2106

b643eb7

cs fix

e12efc4

tie the sub account to the same org as the parent #2106

66ad13f

updated client

9fcc96c

added organization_sid in restcomm_incoming_phone_numbers #2106

a15296e

Maria Farooq added 2 commits August 21, 2017 12:18

removed unused import

a4cdaeb

gvagenas added the unplanned label Aug 21, 2017

gvagenas added this to the George 8.2.0 Sprint 7 milestone Aug 21, 2017

Maria Farooq added 4 commits August 21, 2017 16:08

Merge branch 'master' into issue-2073

c16b6aa

* master: updated sip servlet build

fixed error for sipuri cast

8b4d750

correct sipuri cast

416079b

gvagenas reviewed Aug 24, 2017

View reviewed changes

Maria Farooq added 16 commits August 25, 2017 11:00

Merge branch 'master' into issue-2073

2c59210

* master: Change CDR status to lowercase 'completed' when 'updateInCompleteCallDetailRecordsToCompletedByInstanceId' applies. Issue #2162

fixed test cases

3ad930c

handled NPE

bcb2df0

updated try catch for security exceptions

d5bff43

added error description

a7a9863

shutdown RC system when org not properly initialized

65fae6f

optimization

83ab5f4

removed duplicate log statements and change level form error to info …

113b117

…for null organization based on from URI

f****

4ca7b6d

removed its causing a lot of test faliures

43ceed4

fixed test

7a34023

fixed preventing adding null to list

a6d669e

added mistakenly removed record

805c3fc

updated schema for organization

06ea416

updated hostname

381fc16

Merge branch 'master' into issue-2073

4df1eb4

* master: Push server HTTP request Content-Type is "application/json"

added some more documentation

8a23880

gvagenas merged commit 8a23880 into master Sep 5, 2017

gvagenas removed the Peer Review label Sep 5, 2017

jaimecasero deleted the issue-2073 branch April 11, 2018 20:12

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Issue 2073 - Organization phase 1 #2431

Issue 2073 - Organization phase 1 #2431

maria-farooq commented Aug 18, 2017 •

edited

Loading

gvagenas left a comment

gvagenas Aug 22, 2017

maria-farooq Aug 25, 2017

gvagenas Aug 22, 2017

maria-farooq Aug 25, 2017

gvagenas Aug 22, 2017

maria-farooq Aug 25, 2017

gvagenas Aug 22, 2017

maria-farooq Aug 25, 2017

gvagenas Aug 24, 2017

maria-farooq Aug 25, 2017

gvagenas Aug 24, 2017

maria-farooq Aug 25, 2017

gvagenas Aug 24, 2017

maria-farooq Aug 25, 2017

gvagenas Aug 24, 2017

maria-farooq Aug 25, 2017

gvagenas Aug 24, 2017

maria-farooq Aug 29, 2017

gvagenas Aug 24, 2017

maria-farooq Aug 29, 2017

maria-farooq commented Aug 29, 2017

Issue 2073 - Organization phase 1 #2431

Issue 2073 - Organization phase 1 #2431

Conversation

maria-farooq commented Aug 18, 2017 • edited Loading

gvagenas left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

maria-farooq commented Aug 29, 2017

maria-farooq commented Aug 18, 2017 •

edited

Loading