[incubator-dlab] branch DLAB-1748 updated: [DLAB-1748]: changed how new installed dependencies are acquired for pip

2020-07-10 Thread lfrolov
This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1748 by this push:
 new 7da2448  [DLAB-1748]: changed how new installed dependencies are 
acquired for pip
7da2448 is described below

commit 7da2448ebf86bc5e9df8800d89349ff03852346e
Author: leonidfrolov 
AuthorDate: Fri Jul 10 19:16:16 2020 +0300

[DLAB-1748]: changed how new installed dependencies are acquired for pip
---
 infrastructure-provisioning/src/general/lib/os/fab.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py 
b/infrastructure-provisioning/src/general/lib/os/fab.py
index 86814d2..6973d6b 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -87,8 +87,8 @@ def install_pip_pkg(requisites, pip_version, lib_group):
 version = \
 [i for i in ver if pip_pkg.split("==")[0].lower() in 
i][0].split(
 '==')[1]
-dep = sudo('cat /tmp/tee.tmp | grep "Installing collected 
packages: "').replace('\r\n', '').replace(pip_pkg[0], '').strip()
-if dep == '':
+dep = sudo('cat /tmp/tee.tmp | grep "Installing collected 
packages: "').replace('\r\n', '').strip()[31:]
+if dep == '' or dep == pip_pkg.split("==")[0]:
 dep = []
 else:
 dep = dep.split(', ')


-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org



[incubator-dlab] 02/02: [DLAB-1748]: changed how new installed dependencies are acquired for pip

2020-07-10 Thread lfrolov
This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 744d146ebe0a9807dfa2f318898c897c73a27ec6
Author: leonidfrolov 
AuthorDate: Fri Jul 10 19:05:32 2020 +0300

[DLAB-1748]: changed how new installed dependencies are acquired for pip
---
 infrastructure-provisioning/src/general/lib/os/fab.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py 
b/infrastructure-provisioning/src/general/lib/os/fab.py
index 7f80787..86814d2 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -66,7 +66,7 @@ def install_pip_pkg(requisites, pip_version, lib_group):
 pip_pkg = pip_pkg[0]
 else:
 pip_pkg = "{}=={}".format(pip_pkg[0], pip_pkg[1])
-sudo('{0} install {1} --no-cache-dir 2>&1 | if ! grep -w -i -E  
"({2})" >  /tmp/{0}install_{1}.log; then  echo "" > 
/tmp/{0}install_{1}.log;fi'.format(pip_version, pip_pkg, error_parser))
+sudo('{0} install {1} --no-cache-dir 2>&1 | tee /tmp/tee.tmp; if ! 
grep -w -i -E  "({2})" /tmp/tee.tmp >  /tmp/{0}install_{1}.log; then  echo "" > 
/tmp/{0}install_{1}.log;fi'.format(pip_version, pip_pkg, error_parser))
 err = sudo('cat /tmp/{0}install_{1}.log'.format(pip_version, 
pip_pkg)).replace('"', "'")
 sudo('{0} freeze | if ! grep -w -i {1} > /tmp/{0}install_{1}.list; 
then  echo "" > /tmp/{0}install_{1}.list;fi'.format(pip_version, pip_pkg))
 res = sudo('cat /tmp/{0}install_{1}.list'.format(pip_version, 
pip_pkg))
@@ -87,8 +87,7 @@ def install_pip_pkg(requisites, pip_version, lib_group):
 version = \
 [i for i in ver if pip_pkg.split("==")[0].lower() in 
i][0].split(
 '==')[1]
-dep = sudo('{0} show {1} 2>&1 | grep "Requires: 
"'.format(pip_version, pip_pkg.split("==")[0])).replace(
-'\r', '').replace('\n', '').replace('Requires:', 
'').strip()
+dep = sudo('cat /tmp/tee.tmp | grep "Installing collected 
packages: "').replace('\r\n', '').replace(pip_pkg[0], '').strip()
 if dep == '':
 dep = []
 else:


-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org



[incubator-dlab] 01/02: [DLAB-1748]: added installaton of specific version for R

2020-07-10 Thread lfrolov
This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit a17e982cc4a638bfb47efcf97cedaacb70b4f6eb
Author: leonidfrolov 
AuthorDate: Fri Jul 10 18:54:37 2020 +0300

[DLAB-1748]: added installaton of specific version for R
---
 .../src/general/lib/os/debian/notebook_lib.py  |  2 +-
 .../src/general/lib/os/fab.py  | 41 ++
 .../general/scripts/os/install_additional_libs.py  |  4 +--
 3 files changed, 37 insertions(+), 10 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py 
b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index c97ccb8..ea971e2 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -417,7 +417,7 @@ def get_available_os_pkgs():
 os_pkgs = dict()
 ansi_escape = re.compile(r'\x1b[^m]*m')
 manage_pkg('update', 'remote', '')
-apt_raw = sudo("apt list -a")
+apt_raw = sudo("apt list")
 apt_list = ansi_escape.sub('', apt_raw).split("\r\n")
 for pkg in apt_list:
 if "/" in pkg:
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py 
b/infrastructure-provisioning/src/general/lib/os/fab.py
index ec9b6c2..7f80787 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -402,21 +402,49 @@ def ensure_ciphers():
 
 def install_r_pkg(requisites):
 status = list()
-error_parser = "ERROR:|error:|Cannot|failed|Please run|requires"
+error_parser = "ERROR:|error:|Cannot|failed|Please run|requires|Error"
 try:
 for r_pkg in requisites:
-if r_pkg == 'sparklyr':
-run('sudo -i R -e \'install.packages("{0}", 
repos="https://cloud.r-project.org;, dep=TRUE)\' 2>&1 | tee /tmp/tee.tmp; if ! 
grep -w -E  "({1})" /tmp/tee.tmp > /tmp/install_{0}.log; then  echo "" > 
/tmp/install_{0}.log;fi'.format(r_pkg, error_parser))
-sudo('R -e \'install.packages("{0}", 
repos="https://cloud.r-project.org;, dep=TRUE)\' 2>&1 | tee /tmp/tee.tmp; if ! 
grep -w -E  "({1})" /tmp/tee.tmp >  /tmp/install_{0}.log; then  echo "" > 
/tmp/install_{0}.log;fi'.format(r_pkg, error_parser))
+if r_pkg[1] == '':
+r_pkg = pip_pkg[0]
+if r_pkg == 'sparklyr':
+run('sudo -i R -e \'install.packages("{0}", 
repos="https://cloud.r-project.org;, dep=TRUE)\' 2>&1 | '
+'tee /tmp/tee.tmp; if ! grep -w -E  "({1})" 
/tmp/tee.tmp > /tmp/install_{0}.log; then  echo "" >'
+' /tmp/install_{0}.log;fi'.format(r_pkg, error_parser))
+else:
+sudo('R -e \'install.packages("{0}", 
repos="https://cloud.r-project.org;, dep=TRUE)\' 2>&1 | '
+ 'tee /tmp/tee.tmp; if ! grep -w -E  "({1})" 
/tmp/tee.tmp >  /tmp/install_{0}.log; then  echo "" >'
+ ' /tmp/install_{0}.log;fi'.format(r_pkg, 
error_parser))
+else:
+if r_pkg == 'sparklyr':
+run('sudo -i R -e \'devtools::install_version("{0}", 
version = "{1}", repos = "http://cran.us.r-project.org;, '
+'dep=TRUE)\' 2>&1 | tee /tmp/tee.tmp; if ! grep -w -E  
"({2})" /tmp/tee.tmp > /tmp/install_{0}.log; '
+'then  echo "" > 
/tmp/install_{0}.log;fi'.format(r_pkg[0], r_pkg[1], error_parser))
+else:
+sudo('R -e \'devtools::install_version("{0}", version = 
"{1}", repos = "http://cran.us.r-project.org;, '
+ 'dep=TRUE)\' 2>&1 | tee /tmp/tee.tmp; if ! grep -w -E 
 "({2})" /tmp/tee.tmp > /tmp/install_{0}.log; '
+ 'then  echo "" > 
/tmp/install_{0}.log;fi'.format(r_pkg[0], r_pkg[1], args.version))
+dep = sudo('grep "(NA -> " /tmp/tee.tmp | awk \'{print 
$1}\'').replace('\r\n', ' ')
+if dep == r_pkg or dep == '':
+dep = []
+else:
+dep = dep.split(' ')
 err = sudo('cat /tmp/install_{0}.log'.format(r_pkg)).replace('"', 
"'")
 sudo('R -e \'installed.packages()[,c(3:4)]\' | if ! grep -w {0} > 
/tmp/install_{0}.list; then  echo "" > /tmp/install_{0}.list;fi'.format(r_pkg))
 res = sudo('cat /tmp/install_{0}.list'.format(r_pkg))
 if res:
 ansi_escape = re.compile(r'\x1b[^m]*m')
 version = ansi_escape.sub('', 
res).split("\r\n")[0].split('"')[1]
-status.append({"group": "r_pkg", "name": r_pkg, "version": 
version, "status": "installed"})
+status.append({"group": "r_pkg", "name": r_pkg, "version": 
version, "status": "installed", "add_pkgs": dep})
  

[incubator-dlab] branch DLAB-1748 updated (d6c6f67 -> 744d146)

2020-07-10 Thread lfrolov
This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a change to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


from d6c6f67  [DLAB-1748]: made pip dependencies a list
 new a17e982  [DLAB-1748]: added installaton of specific version for R
 new 744d146  [DLAB-1748]: changed how new installed dependencies are 
acquired for pip

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../src/general/lib/os/debian/notebook_lib.py  |  2 +-
 .../src/general/lib/os/fab.py  | 46 +-
 .../general/scripts/os/install_additional_libs.py  |  4 +-
 3 files changed, 39 insertions(+), 13 deletions(-)


-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org



[incubator-dlab] branch develop updated: [DLAB-1934] Implemented set of UI tasks in Audit(part2) (#818)

2020-07-10 Thread dgnatyshyn
This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/develop by this push:
 new 7a9efff  [DLAB-1934] Implemented set of UI tasks in Audit(part2) (#818)
7a9efff is described below

commit 7a9efff2add114754fe6e90866be4c77f6df0bfd
Author: Dmytro Gnatyshyn <42860905+dg1...@users.noreply.github.com>
AuthorDate: Fri Jul 10 17:46:23 2020 +0300

[DLAB-1934] Implemented set of UI tasks in Audit(part2) (#818)
---
 .../service/impl/ProjectServiceImpl.java   |  2 +-
 .../service/impl/UserGroupServiceImpl.java |  8 +--
 .../audit/audit-grid/audit-grid.component.ts   | 84 ++
 .../cluster-details/cluster-details.component.html |  2 +-
 .../cluster-details/cluster-details.component.ts   | 10 ++-
 ...utational-resource-create-dialog.component.html |  2 +-
 .../resources-grid/resources-grid.component.ts |  2 +-
 .../notification-dialog.component.ts   |  6 +-
 .../webapp/src/assets/styles/_dialogs.scss |  1 +
 9 files changed, 73 insertions(+), 44 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index b4d635d..530784a 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -65,7 +65,7 @@ public class ProjectServiceImpl implements ProjectService {
private static final String AUDIT_ADD_ENDPOINT = "Added endpoint(s) %s";
private static final String AUDIT_ADD_GROUP = "Added group(s) %s";
private static final String AUDIT_REMOVE_GROUP = "Removed group(s) %s";
-   private static final String AUDIT_UPDATE_BUDGET = "Update budget 
%d->%d";
+   private static final String AUDIT_UPDATE_BUDGET = "Update quota %d->%d";
private static final String AUDIT_ADD_EDGE_NODE = "Create edge node for 
endpoint %s, requested in project %s";
 
private final ProjectDAO projectDAO;
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
index f4d7c5c..c646a53 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
@@ -58,10 +58,10 @@ import static 
com.epam.dlab.backendapi.domain.AuditResourceTypeEnum.GROUP;
 @Singleton
 @Slf4j
 public class UserGroupServiceImpl implements UserGroupService {
-   private static final String AUDIT_ADD_ROLE_MESSAGE = "Added role(s): 
%s.\n";
-   private static final String AUDIT_REMOVE_ROLE_MESSAGE = "Removed 
role(s): %s.\n";
-   private static final String AUDIT_ADD_USER_MESSAGE = "Added user(s): 
%s.\n";
-   private static final String AUDIT_REMOVE_USER_MESSAGE = "Removed 
user(s): %s.\n";
+   private static final String AUDIT_ADD_ROLE_MESSAGE = "Add role(s): 
%s.\n";
+   private static final String AUDIT_REMOVE_ROLE_MESSAGE = "Remove 
role(s): %s.\n";
+   private static final String AUDIT_ADD_USER_MESSAGE = "Add user(s): 
%s.\n";
+   private static final String AUDIT_REMOVE_USER_MESSAGE = "Remove 
user(s): %s.\n";
private static final String ROLE_NOT_FOUND_MSG = "Any of role : %s were 
not found";
private static final String ADMIN = "admin";
private static final String PROJECT_ADMIN = "projectAdmin";
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
index c710b3f..4bb0d6c 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
@@ -176,8 +176,8 @@ export class AuditGridComponent implements OnInit {
   
   
   
-
-  
+
+  
 
   Action
Description 
@@ -203,17 +203,17 @@ export class AuditGridComponent implements OnInit {
   
 
   Action
-   Previous value 
-   New value 
+   Previous value 
+   New value 
 
 
-  
-{{updateBudget[0]}}
-
-

[incubator-dlab] branch DLAB-1934 created (now e951682)

2020-07-10 Thread dgnatyshyn
This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a change to branch DLAB-1934
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


  at e951682  [DLAB-1934] Implemented set of UI tasks in Audit(part2)

This branch includes the following new commits:

 new e951682  [DLAB-1934] Implemented set of UI tasks in Audit(part2)

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org



[incubator-dlab] 01/01: [DLAB-1934] Implemented set of UI tasks in Audit(part2)

2020-07-10 Thread dgnatyshyn
This is an automated email from the ASF dual-hosted git repository.

dgnatyshyn pushed a commit to branch DLAB-1934
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit e9516821d13e41a87961a914519c144277a81c39
Author: Dmytro_Gnatyshyn 
AuthorDate: Fri Jul 10 17:39:35 2020 +0300

[DLAB-1934] Implemented set of UI tasks in Audit(part2)
---
 .../service/impl/ProjectServiceImpl.java   |  2 +-
 .../service/impl/UserGroupServiceImpl.java |  8 +--
 .../audit/audit-grid/audit-grid.component.ts   | 84 ++
 .../cluster-details/cluster-details.component.html |  2 +-
 .../cluster-details/cluster-details.component.ts   | 10 ++-
 ...utational-resource-create-dialog.component.html |  2 +-
 .../resources-grid/resources-grid.component.ts |  2 +-
 .../notification-dialog.component.ts   |  6 +-
 .../webapp/src/assets/styles/_dialogs.scss |  1 +
 9 files changed, 73 insertions(+), 44 deletions(-)

diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
index b4d635d..530784a 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/ProjectServiceImpl.java
@@ -65,7 +65,7 @@ public class ProjectServiceImpl implements ProjectService {
private static final String AUDIT_ADD_ENDPOINT = "Added endpoint(s) %s";
private static final String AUDIT_ADD_GROUP = "Added group(s) %s";
private static final String AUDIT_REMOVE_GROUP = "Removed group(s) %s";
-   private static final String AUDIT_UPDATE_BUDGET = "Update budget 
%d->%d";
+   private static final String AUDIT_UPDATE_BUDGET = "Update quota %d->%d";
private static final String AUDIT_ADD_EDGE_NODE = "Create edge node for 
endpoint %s, requested in project %s";
 
private final ProjectDAO projectDAO;
diff --git 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
index f4d7c5c..c646a53 100644
--- 
a/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
+++ 
b/services/self-service/src/main/java/com/epam/dlab/backendapi/service/impl/UserGroupServiceImpl.java
@@ -58,10 +58,10 @@ import static 
com.epam.dlab.backendapi.domain.AuditResourceTypeEnum.GROUP;
 @Singleton
 @Slf4j
 public class UserGroupServiceImpl implements UserGroupService {
-   private static final String AUDIT_ADD_ROLE_MESSAGE = "Added role(s): 
%s.\n";
-   private static final String AUDIT_REMOVE_ROLE_MESSAGE = "Removed 
role(s): %s.\n";
-   private static final String AUDIT_ADD_USER_MESSAGE = "Added user(s): 
%s.\n";
-   private static final String AUDIT_REMOVE_USER_MESSAGE = "Removed 
user(s): %s.\n";
+   private static final String AUDIT_ADD_ROLE_MESSAGE = "Add role(s): 
%s.\n";
+   private static final String AUDIT_REMOVE_ROLE_MESSAGE = "Remove 
role(s): %s.\n";
+   private static final String AUDIT_ADD_USER_MESSAGE = "Add user(s): 
%s.\n";
+   private static final String AUDIT_REMOVE_USER_MESSAGE = "Remove 
user(s): %s.\n";
private static final String ROLE_NOT_FOUND_MSG = "Any of role : %s were 
not found";
private static final String ADMIN = "admin";
private static final String PROJECT_ADMIN = "projectAdmin";
diff --git 
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
 
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
index c710b3f..4bb0d6c 100644
--- 
a/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
+++ 
b/services/self-service/src/main/resources/webapp/src/app/reports/audit/audit-grid/audit-grid.component.ts
@@ -176,8 +176,8 @@ export class AuditGridComponent implements OnInit {
   
   
   
-
-  
+
+  
 
   Action
Description 
@@ -203,17 +203,17 @@ export class AuditGridComponent implements OnInit {
   
 
   Action
-   Previous value 
-   New value 
+   Previous value 
+   New value 
 
 
-  
-{{updateBudget[0]}}
-
-  {{updateBudget[1]}}
+  
+{{action[0]}}
+
+  {{action[1]}}
 
-
-  

[incubator-dlab] 01/01: [DLAB-1749] BE support library installation of particular version

2020-07-10 Thread ofuks
This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch DLAB-1749
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit d681f8245b3a6d42ded393bd38fdc77885bf347f
Author: Oleh Fuks 
AuthorDate: Fri Jul 10 15:19:01 2020 +0300

[DLAB-1749] BE support library installation of particular version
---
 .../main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java| 8 
 1 file changed, 8 insertions(+)

diff --git 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
index bcb452a..1752560 100644
--- 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
+++ 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * Stores info about libraries.
  */
@@ -49,6 +51,12 @@ public class LibInstallDTO {
@JsonProperty
private boolean override;
 
+   @JsonProperty("available_versions")
+   private List availableVersions;
+
+   @JsonProperty("add_pkgs")
+   private List transitiveDependencies;
+
public LibInstallDTO(String group, String name, String version) {
this.group = group;
this.name = name;


-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org



[incubator-dlab] 01/01: [DLAB-1749] BE support library installation of particular version

2020-07-10 Thread ofuks
This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a commit to branch DLAB-1749
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit d681f8245b3a6d42ded393bd38fdc77885bf347f
Author: Oleh Fuks 
AuthorDate: Fri Jul 10 15:19:01 2020 +0300

[DLAB-1749] BE support library installation of particular version
---
 .../main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java| 8 
 1 file changed, 8 insertions(+)

diff --git 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
index bcb452a..1752560 100644
--- 
a/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
+++ 
b/services/dlab-model/src/main/java/com/epam/dlab/dto/exploratory/LibInstallDTO.java
@@ -24,6 +24,8 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.util.List;
+
 /**
  * Stores info about libraries.
  */
@@ -49,6 +51,12 @@ public class LibInstallDTO {
@JsonProperty
private boolean override;
 
+   @JsonProperty("available_versions")
+   private List availableVersions;
+
+   @JsonProperty("add_pkgs")
+   private List transitiveDependencies;
+
public LibInstallDTO(String group, String name, String version) {
this.group = group;
this.name = name;


-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org



[incubator-dlab] branch DLAB-1749 created (now d681f82)

2020-07-10 Thread ofuks
This is an automated email from the ASF dual-hosted git repository.

ofuks pushed a change to branch DLAB-1749
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.


  at d681f82  [DLAB-1749] BE support library installation of particular 
version

This branch includes the following new commits:

 new d681f82  [DLAB-1749] BE support library installation of particular 
version

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.



-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org