Merge pull request #69 from erssebaggala/add_graphs

Add graphs to reports module
bodastage · May 27, 2019 · 81f1384 · 81f1384
2 parents 506efb2 + 23f9f62
commit 81f1384
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 14 deletions.
diff --git a/.travis.yml b/.travis.yml
diff --git a/README.md b/README.md
@@ -13,16 +13,15 @@ Boda Telecom Suite Community Edition - An open source telecommunication network
 * CM managed object browsing 
 * Automatic network baseline generation
 * Radio Access Network (RAN) audit (relations, conflicts, parameter values vs baseline )
-* Reporting
-
+* Reports that support tabular and different graphical presentation of data
 
 ## Requirements 
 
-* 4GB memory
 * 64 bit OS (Kernel version 3.10+ for Linux and build 10.0.14393+ for Windows)
 * [Docker](https://www.docker.com/get-docker)
-* 5GB hard disk space
+* Memory and disk space depend on the network /data size
 * Latest web browser
+
 ## Deployment/Installation
 
 * Download latest release files (bts-ce-**version**) from https://github.com/bodastage/bts-ce/releases/latest
@@ -36,7 +35,7 @@ Boda Telecom Suite Community Edition - An open source telecommunication network
   ```batch 
   > bts setup
   ```
-* Open web broswer and paste the URL http://localhost on windows or http://192.168.99.100
+* Open web broswer and paste the URL http://localhost:8888
 * Login with username: **[email protected]** and password: **password**
 
 ## Installing a new release 
@@ -66,6 +65,7 @@ This is achieved using the following 2 commands,
 - [PostgreSQL](https://www.postgresql.org/)
 - [Apache Airflow](https://airflow.apache.org/)
 - [ReactJs](http://reactjs.org/)
+- [RabbitMQ](https://www.rabbitmq.com/)
 
 ## Resources
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-v2.0.0-rc3
+v2.1.0
diff --git a/bts-ce-api b/bts-ce-api
diff --git a/bts-ce-reports b/bts-ce-reports
diff --git a/bts-ce-web b/bts-ce-web
diff --git a/bts.bat b/bts.bat
@@ -67,7 +67,7 @@ If "%~1"==""  (
 	Rem Echo manage list modules -- List installed modules
 	Echo -----------------------------------------------------
 	Echo Boda Telecom Suite - Community Edition
-	Echo Copyright 2017-2018. Bodastage Solutions. http://www.bodastage.com
+	Echo Copyright 2017-2019. Bodastage Solutions. http://www.bodastage.com
 )
 
 Rem Run setup 

diff --git a/docker-compose.yml b/docker-compose.yml
@@ -33,7 +33,8 @@ services:
             - ./queue_scripts/definitions.json:/etc/rabbitmq/definitions.json:ro
             - ./queue_scripts/queue_setup.sh:/queue_setup.sh
     bts-api:
-        image: registry.gitlab.com/bts-ce/bts-ce-api
+#        image: registry.gitlab.com/bts-ce/bts-ce-api
+        image: bodastage/bts-ce-api:1.2.1
         ports:
           - 8181:8181
         restart: always
@@ -62,7 +63,8 @@ services:
         container_name: "bts-ce-api"
         command: ["/wait-for-it.sh","database:5432","--","/migrate-and-start-web-server.sh"]
     bts-web:
-        image: registry.gitlab.com/bts-ce/bts-ce-web:2.1.0
+#        image: registry.gitlab.com/bts-ce/bts-ce-web:2.1.2
+        image: bodastage/bts-ce-web:2.1.2
         restart: always
         ports:
           - "8888:80"
@@ -133,7 +135,8 @@ services:
 #        container_name: "bts-ce-ftp"
 #        command: ["pure-pw","useradd","bodastage","-f", "/etc/pure-ftpd/passwd/pureftpd.passwd", "-m", "-u", "ftpuser", "-d", "/home/ftpusers/bodastage"]
     bts-reports:
-        image: registry.gitlab.com/bts-ce/bts-ce-reports
+#        image: registry.gitlab.com/bts-ce/bts-ce-reports:0.0.1
+        image: bodastage/bts-ce-reports:0.0.1
         restart: always
         environment:
           - POSTGRES_PASSWORD=password

diff --git a/win/Setup.ps1 b/win/Setup.ps1
@@ -208,7 +208,7 @@ if ( $UseHyperVDriver -eq $True ){
 
 	# Create docker machine 
 	Write-Host -NoNewline "Creating docker-machine..."
-	"& '$DockerForWindows\docker-machine.exe' create -d hyperv -hyper-virtual-switch BTSExternalSwitch default" | Invoke-Expression
+	"& '$DockerForWindows\docker-machine.exe' create -d hyperv --hyperv-memory 2048 --hyperv-virtual-switch BTSExternalSwitch default" | Invoke-Expression
 	Write-Host "Done"
 	Write-Host ""
+2 −1		.gitignore
+39 −26		generate_report_worker.py
+8 −6		tests/receive_report_generation_request.py
+71 −3		tests/request_report_generation.py
+26 −2		.travis.yml
+6 −4		__tests__/dashboard/dashboard-components-spec.js
+1 −1		__tests__/help/help-component-spec.js
+47 −17		__tests__/networkbrowser/networkbrowser-actions-spec.js
+22 −10		__tests__/profile/profile-actions-spec.js
+25 −15		__tests__/session/session-actions-spec.js
+4 −2		__tests__/session/session-reducers-spec.js
+22 −11		__tests__/telecomlib/technologies-actions-spec.js
+ −		app_screenshot.png
+24,964 −18,105		package-lock.json
+49 −43		package.json
+0 −0		python
+1 −2		src/modules/help/Help.jsx
+3 −3		src/modules/layout/Tabs.jsx
+7 −2		src/modules/layout/UILayout.css
+11 −17		src/modules/layout/UILayout.js
+9 −1		src/modules/layout/uilayout-actions.js
+13 −11		src/modules/networkbrowser/network-browser-actions.js
+378 −43		src/modules/reports/CreateReport.jsx
+8 −0		src/modules/reports/GraphOptions.css
+536 −0		src/modules/reports/GraphOptions.jsx
+112 −0		src/modules/reports/GraphReport.jsx
+66 −0		src/modules/reports/ReportContainer.jsx
+18 −8		src/modules/reports/Reports.jsx
+20 −16		src/modules/reports/ReportsTree.jsx
+126 −17		src/modules/reports/TableReport.jsx
+88 −5		src/modules/reports/reports-actions.js
+6 −0		src/modules/reports/reports-panel.css
+81 −18		src/modules/reports/reports-reducers.js