Jujucontroller branch

juju-api/pom.xml

@@ -7,6 +7,10 @@
 	</parent>
 	<artifactId>juju-api</artifactId>
 	<dependencies>
+		<dependency>
+			<groupId>jakarta.persistence</groupId>
+			<artifactId>jakarta.persistence-api</artifactId>
+		</dependency>
 		<dependency>
 			<groupId>jakarta.validation</groupId>
 			<artifactId>jakarta.validation-api</artifactId>

juju-api/src/main/java/com/ubiqube/etsi/mano/service/juju/entities/JujuCloud.java

@@ -1,40 +1,70 @@
-/**
- *     Copyright (C) 2019-2023 Ubiqube.
- *
- *     This program is free software: you can redistribute it and/or modify
- *     it under the terms of the GNU General Public License as published by
- *     the Free Software Foundation, either version 3 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
- */
+
 package com.ubiqube.etsi.mano.service.juju.entities;
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.UUID;
 
-import lombok.Builder;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
 @Getter
 @Setter
-@Builder
+@NoArgsConstructor
 @ToString
+@Entity
+@Table(name = "juju_clouds")
 public class JujuCloud implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	public JujuCloud(String name, String type, String authTypes, List<JujuRegion> regions, JujuCredential credential,
+			JujuMetadata metadata) {
+		super();
+		this.name = name;
+		this.type = type;
+		this.authTypes = authTypes;
+		this.regions = regions;
+		this.credential = credential;
+		this.metadata = metadata;
+	}
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private UUID id;
+
+	@Column(name = "name")
 	private String name;
+
+	@Column(name = "type")
 	private String type;
+
+	@Column(name = "authTypes")
 	private String authTypes;
+
+	@Column(name = "status")
+	private String status;
+
+	@OneToMany(cascade = CascadeType.ALL)
+	@JoinColumn(name = "region_id")
 	private List<JujuRegion> regions;
+
+	@ManyToOne
+	@JoinColumn(name = "credentail_id")
 	private JujuCredential credential;
+
+	@ManyToOne
+	@JoinColumn(name = "metadata_id")
 	private JujuMetadata metadata;
 }

juju-api/src/main/java/com/ubiqube/etsi/mano/service/juju/entities/JujuCredential.java

@@ -17,19 +17,40 @@
 package com.ubiqube.etsi.mano.service.juju.entities;
 
 import java.io.Serializable;
+import java.util.UUID;
 
-import lombok.Builder;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
 @Getter
 @Setter
+@NoArgsConstructor
 @ToString
-@Builder
+@Entity
+@Table(name = "juju_credentials")
 public class JujuCredential implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	public JujuCredential(String name, String authType, String username, String password, String tenantName) {
+		super();
+		this.name = name;
+		this.authType = authType;
+		this.username = username;
+		this.password = password;
+		this.tenantName = tenantName;
+	}
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private UUID id;
+
 	private String name;
 	private String authType;
 	private String username;

juju-api/src/main/java/com/ubiqube/etsi/mano/service/juju/entities/JujuMetadata.java

@@ -18,27 +18,58 @@
 
 import java.io.Serializable;
 import java.util.List;
+import java.util.UUID;
 
-import lombok.Builder;
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.OneToMany;
+import jakarta.persistence.Table;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
 @Getter
 @Setter
-@Builder
+@NoArgsConstructor
 @ToString
+@Entity
+@Table(name = "juju_metadata")
 public class JujuMetadata implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	private String name; // Controller name
+	public JujuMetadata(String name, String imageId, String path, String osSeries, String osAuthUrl,
+			List<String> constraints, String networkId, String regionName, List<JujuModel> models) {
+		super();
+		this.name = name;
+		this.imageId = imageId;
+		this.path = path;
+		this.osSeries = osSeries;
+		this.osAuthUrl = osAuthUrl;
+		this.constraints = constraints;
+		this.networkId = networkId;
+		this.regionName = regionName;
+		this.models = models;
+	}
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private UUID id;
+
+	private String name;
 	private String imageId;
 	private String path;
 	private String osSeries;
 	private String osAuthUrl;
 	private List<String> constraints;
 	private String networkId;
 	private String regionName;
-	private List<JujuModel> models;
 
+	@OneToMany(cascade = CascadeType.ALL)
+	@JoinColumn(name = "models_id", referencedColumnName = "id")
+	private List<JujuModel> models;
 }

juju-api/src/main/java/com/ubiqube/etsi/mano/service/juju/entities/JujuModel.java

@@ -17,21 +17,39 @@
 package com.ubiqube.etsi.mano.service.juju.entities;
 
 import java.io.Serializable;
+import java.util.UUID;
 
-import lombok.Builder;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
 @Getter
 @Setter
-@Builder
+@NoArgsConstructor
 @ToString
+@Entity
+@Table(name = "juju_models")
 public class JujuModel implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	public JujuModel(String name, String charmName, String appName) {
+		super();
+		this.name = name;
+		this.charmName = charmName;
+		this.appName = appName;
+	}
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private UUID id;
+
 	private String name;
 	private String charmName;
 	private String appName;
-
 }

juju-api/src/main/java/com/ubiqube/etsi/mano/service/juju/entities/JujuRegion.java

@@ -17,20 +17,37 @@
 package com.ubiqube.etsi.mano.service.juju.entities;
 
 import java.io.Serializable;
+import java.util.UUID;
 
-import lombok.Builder;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.Table;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
 import lombok.Setter;
 import lombok.ToString;
 
 @Getter
 @Setter
+@NoArgsConstructor
 @ToString
-@Builder
+@Entity
+@Table(name = "juju_regions")
 public class JujuRegion implements Serializable {
 	private static final long serialVersionUID = 1L;
 
+	public JujuRegion(String name, String endPoint) {
+		this.name = name;
+		this.endPoint = endPoint;
+	}
+
+	@Id
+	@GeneratedValue(strategy = GenerationType.AUTO)
+	private UUID id;
+
 	private String name;
 	private String endPoint;
-
 }

juju-client/src/main/java/com/ubiqube/etsi/mano/service/juju/cli/JujuRemoteConfig.java

@@ -16,6 +16,8 @@
  */
 package com.ubiqube.etsi.mano.service.juju.cli;
 
+import java.time.Duration;
+
 import org.springframework.context.ConfigurableApplicationContext;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -58,7 +60,6 @@ private HttpServiceProxyFactory createProxyFactory(final JujuProperty props) {
 		webBuilder.observationRegistry(observationRegistry);
 		final WebClient client = webBuilder
 				.build();
-		return HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).build();
+		return HttpServiceProxyFactory.builder(WebClientAdapter.forClient(client)).blockTimeout(Duration.ofMinutes(30)).build();
 	}
-
 }

juju-client/src/main/java/com/ubiqube/etsi/mano/service/juju/cli/JujuRemoteService.java

@@ -17,6 +17,7 @@
 package com.ubiqube.etsi.mano.service.juju.cli;
 
 import org.springframework.http.ResponseEntity;
+import org.springframework.stereotype.Service;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.service.annotation.DeleteExchange;
@@ -28,6 +29,7 @@
 import com.ubiqube.etsi.mano.service.juju.entities.JujuCloud;
 import com.ubiqube.etsi.mano.service.juju.entities.JujuMetadata;
 
+@Service
 @HttpExchange(url = "/juju", accept = "application/json", contentType = "application/json")
 public interface JujuRemoteService {
 
@@ -36,6 +38,10 @@ public interface JujuRemoteService {
 
 	@PostExchange("/cloud")
 	ResponseEntity<String> addCloud(@RequestBody final JujuCloud cloud);
+
+	@GetExchange("/cloud/{cloudname}")
+	ResponseEntity<String> cloudDetail(@PathVariable("cloudname") final String cloudname);
+
 
 	@DeleteExchange("/cloud/{cloudname}")
 	ResponseEntity<String> removeCloud(@PathVariable("cloudname") final String cloudname);
@@ -48,6 +54,10 @@ public interface JujuRemoteService {
 
 	@PutExchange("/credential")
 	ResponseEntity<String> updateCredential(@RequestBody final JujuCloud cloud);
+
+	@GetExchange("/credential/{cloudname}/{credname}")
+	ResponseEntity<String> credentialDetails(@PathVariable("cloudname") final String cloudname, @PathVariable("credname") final String credname);
+
 
 	@DeleteExchange("/credential/{cloudname}/{name}")
 	ResponseEntity<String> removeCredential(@PathVariable("cloudname") final String cloudname, @PathVariable("name") final String name);
@@ -71,6 +81,9 @@ public interface JujuRemoteService {
 
 	@GetExchange("/controller")
 	ResponseEntity<String> controllers();
+
+	@GetExchange("/controller/{controllername}")
+	ResponseEntity<String> controllerDetail(@PathVariable("controllername") final String controllername);
 
 	@DeleteExchange("/controller/{controllername}")
 	ResponseEntity<String> removeController(@PathVariable("controllername") final String controllername);
@@ -80,6 +93,10 @@ public interface JujuRemoteService {
 
 	@GetExchange("/model")
 	ResponseEntity<String> model();
+
+	@GetExchange("/model/{name}")
+	ResponseEntity<String> modelDetail(@PathVariable("name") final String name);
+
 
 	@DeleteExchange("/model/{name}")
 	ResponseEntity<String> removeModel(@PathVariable("name") final String name);