Make first commit

Transferring from original dcae project

Issue-Id: DCAEGEN2-45
Change-Id: If8500f4a120ec2d27a714c8917f163beb57ee64c
Signed-off-by: Michael Hwang <mhwang@research.att.com>

24 files changed, 2868 insertions, 0 deletions

diff --git a/src/gen/java/io/swagger/api/ApiException.java b/src/gen/java/io/swagger/api/ApiException.java
new file mode 100644
index 0000000..cdc6162
--- /dev/null
+++ b/src/gen/java/io/swagger/api/ApiException.java
@@ -0,0 +1,30 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class ApiException extends Exception{
+	private int code;
+	public ApiException (int code, String msg) {
+		super(msg);
+		this.code = code;
+	}
+}
diff --git a/src/gen/java/io/swagger/api/ApiOriginFilter.java b/src/gen/java/io/swagger/api/ApiOriginFilter.java
new file mode 100644
index 0000000..b6f29f2
--- /dev/null
+++ b/src/gen/java/io/swagger/api/ApiOriginFilter.java
@@ -0,0 +1,42 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+import java.io.IOException;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletResponse;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class ApiOriginFilter implements javax.servlet.Filter {
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		HttpServletResponse res = (HttpServletResponse) response;
+		res.addHeader("Access-Control-Allow-Origin", "*");
+		res.addHeader("Access-Control-Allow-Methods", "GET, POST, DELETE, PUT");
+		res.addHeader("Access-Control-Allow-Headers", "Content-Type");
+		chain.doFilter(request, response);
+	}
+
+	public void destroy() {}
+
+	public void init(FilterConfig filterConfig) throws ServletException {}
+}
diff --git a/src/gen/java/io/swagger/api/ApiResponseMessage.java b/src/gen/java/io/swagger/api/ApiResponseMessage.java
new file mode 100644
index 0000000..bf4e13a
--- /dev/null
+++ b/src/gen/java/io/swagger/api/ApiResponseMessage.java
@@ -0,0 +1,89 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+import javax.xml.bind.annotation.XmlTransient;
+
+@javax.xml.bind.annotation.XmlRootElement
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class ApiResponseMessage {
+	public static final int ERROR = 1;
+	public static final int WARNING = 2;
+	public static final int INFO = 3;
+	public static final int OK = 4;
+	public static final int TOO_BUSY = 5;
+
+	int code;
+	String type;
+	String message;
+	
+	public ApiResponseMessage(){}
+	
+	public ApiResponseMessage(int code, String message){
+		this.code = code;
+		switch(code){
+		case ERROR:
+			setType("error");
+			break;
+		case WARNING:
+			setType("warning");
+			break;
+		case INFO:
+			setType("info");
+			break;
+		case OK:
+			setType("ok");
+			break;
+		case TOO_BUSY:
+			setType("too busy");
+			break;
+		default:
+			setType("unknown");
+			break;
+		}
+		this.message = message;
+	}
+
+	@XmlTransient
+	public int getCode() {
+		return code;
+	}
+
+	public void setCode(int code) {
+		this.code = code;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getMessage() {
+		return message;
+	}
+
+	public void setMessage(String message) {
+		this.message = message;
+	}
+}
diff --git a/src/gen/java/io/swagger/api/DcaeServiceTypesApi.java b/src/gen/java/io/swagger/api/DcaeServiceTypesApi.java
new file mode 100644
index 0000000..72f1f63
--- /dev/null
+++ b/src/gen/java/io/swagger/api/DcaeServiceTypesApi.java
@@ -0,0 +1,172 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+import io.swagger.api.factories.DcaeServiceTypesApiServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+import io.swagger.model.InlineResponse200;
+import io.swagger.model.DCAEServiceType;
+import io.swagger.model.DCAEServiceTypeRequest;
+
+import javax.validation.Valid;
+import javax.ws.rs.core.*;
+import javax.ws.rs.*;
+
+@Path("/dcae-service-types")
+@Consumes({"application/json", "application/vnd.dcae.inventory.v1+json"})
+@Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
+@io.swagger.annotations.Api(description = "the dcae-service-types API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DcaeServiceTypesApi {
+    private final DcaeServiceTypesApiService delegate = DcaeServiceTypesApiServiceFactory.getDcaeServiceTypesApi();
+
+    @Context
+    UriInfo uriInfo;
+
+    public static Link buildLinkForGet(UriInfo uriInfo, String rel, String typeName, Boolean onlyLatest, Boolean onlyActive,
+                                       String vnfType, String serviceId, String serviceLocation, String asdcServiceId,
+                                       String asdcResourceId, Integer offset) {
+        UriBuilder ub = uriInfo.getBaseUriBuilder().path(DcaeServiceTypesApi.class)
+                .path(DcaeServiceTypesApi.class, "dcaeServiceTypesGet");
+
+        if (typeName != null) {
+            ub.queryParam("typeName", typeName);
+        }
+        if (onlyLatest != null) {
+            ub.queryParam("onlyLatest", onlyLatest);
+        }
+        if (onlyActive != null) {
+            ub.queryParam("onlyActive", onlyActive);
+        }
+        if (vnfType != null) {
+            ub.queryParam("vnfType", vnfType);
+        }
+        if (serviceId != null) {
+            ub.queryParam("serviceId", serviceId);
+        }
+        if (serviceLocation != null) {
+            ub.queryParam("serviceLocation", serviceLocation);
+        }
+        if (asdcServiceId != null) {
+            ub.queryParam("asdcServiceId", asdcServiceId);
+        }
+        if (asdcResourceId != null) {
+            ub.queryParam("asdcResourceId", asdcResourceId);
+        }
+        if (offset != null) {
+            ub.queryParam("offset", offset);
+        }
+
+        Link.Builder lb = Link.fromUri(ub.build());
+        lb.rel(rel);
+        return lb.build();
+    }
+
+    @GET
+    @Path("/")
+    @Consumes({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Get a list of `DCAEServiceType` objects.", response = InlineResponse200.class, tags = {})
+    @io.swagger.annotations.ApiResponses(value = {
+            @io.swagger.annotations.ApiResponse(code = 200, message = "List of `DCAEServiceType` objects", response = InlineResponse200.class)})
+    public Response dcaeServiceTypesGet(
+            @ApiParam(value = "Filter by service type name") @QueryParam("typeName") String typeName,
+            @ApiParam(value = "If set to true, query returns just the latest versions of DCAE service types. If set to false, then all versions are returned. Default is true")
+                @DefaultValue("true") @QueryParam("onlyLatest") Boolean onlyLatest,
+            @ApiParam(value = "If set to true, query returns only *active* DCAE service types. If set to false, then all DCAE service types are returned. Default is true")
+                @DefaultValue("true") @QueryParam("onlyActive") Boolean onlyActive,
+            @ApiParam(value = "Filter by associated vnf type. No wildcards, matches are explicit. This field is treated case insensitive.")
+                @QueryParam("vnfType") String vnfType,
+            @ApiParam(value = "Filter by assocaited service id. Instances with service id null or empty is always returned.")
+                @QueryParam("serviceId") String serviceId,
+            @ApiParam(value = "Filter by associated service location. Instances with service location null or empty is always returned.")
+                @QueryParam("serviceLocation") String serviceLocation,
+            @ApiParam(value = "Filter by associated asdc design service id. Setting this to `NONE` will return instances that have asdc service id set to null")
+                @QueryParam("asdcServiceId") String asdcServiceId,
+            @ApiParam(value = "Filter by associated asdc design resource id. Setting this to `NONE` will return instances that have asdc resource id set to null")
+                @QueryParam("asdcResourceId") String asdcResourceId,
+            @ApiParam(value = "Query resultset offset used for pagination (zero-based)") @QueryParam("offset") Integer offset,
+            @Context SecurityContext securityContext)
+            throws NotFoundException {
+        return delegate.dcaeServiceTypesGet(typeName, onlyLatest, onlyActive, vnfType, serviceId, serviceLocation,
+                asdcServiceId, asdcResourceId, offset, uriInfo, securityContext);
+    }
+
+    public static Link buildLinkForGet(UriInfo uriInfo, String rel, String typeId) {
+        // This same method can be used for PUTs as well
+
+        UriBuilder ub = uriInfo.getBaseUriBuilder().path(DcaeServiceTypesApi.class)
+                .path(DcaeServiceTypesApi.class, "dcaeServiceTypesTypeIdGet");
+        Link.Builder lb = Link.fromUri(ub.build(typeId));
+        lb.rel(rel);
+        return lb.build();
+    }
+
+    @GET
+    @Path("/{typeId}")
+    @Consumes({"application/json"})
+    @Produces({"application/json"})
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Get a `DCAEServiceType` object.", response = DCAEServiceType.class, tags = {})
+    @io.swagger.annotations.ApiResponses(value = {
+            @io.swagger.annotations.ApiResponse(code = 200, message = "Single `DCAEServiceType` object", response = DCAEServiceType.class),
+            @io.swagger.annotations.ApiResponse(code = 404, message = "Resource not found", response = DCAEServiceType.class)})
+    public Response dcaeServiceTypesTypeIdGet(
+            @ApiParam(value = "", required = true) @PathParam("typeId") String typeId,
+            @Context SecurityContext securityContext)
+            throws NotFoundException {
+        return delegate.dcaeServiceTypesTypeIdGet(typeId, uriInfo, securityContext);
+    }
+
+    @POST
+    @Path("/")
+    @Consumes({"application/json"})
+    @Produces({"application/json"})
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Inserts a new `DCAEServiceType` or updates an existing instance. Updates are only allowed iff there are no running DCAE services of the requested type,",
+            response = DCAEServiceType.class, tags = {})
+    @io.swagger.annotations.ApiResponses(value = {
+            @io.swagger.annotations.ApiResponse(code = 200, message = "Single `DCAEServiceType` object.", response = DCAEServiceType.class),
+            @io.swagger.annotations.ApiResponse(code = 400, message = "Bad request provided.", response = ApiResponseMessage.class),
+            @io.swagger.annotations.ApiResponse(code = 409, message = "Failed to update because there are still DCAE services of the requested type running.", response = ApiResponseMessage.class)})
+    public Response dcaeServiceTypesTypeNamePut(
+            @ApiParam(value = "", required = true) @Valid DCAEServiceTypeRequest request,
+            @Context SecurityContext securityContext)
+            throws NotFoundException {
+        return delegate.dcaeServiceTypesTypeIdPost(request, uriInfo, securityContext);
+    }
+
+    @DELETE
+    @Path("/{typeId}")
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Deactivates existing `DCAEServiceType` instances", response = DCAEServiceType.class, tags = {})
+    @io.swagger.annotations.ApiResponses(value = {
+            @io.swagger.annotations.ApiResponse(code = 200, message = "`DCAEServiceType` has been deactivated", response = ApiResponseMessage.class),
+            @io.swagger.annotations.ApiResponse(code = 404, message = "`DCAEServiceType` not found", response = ApiResponseMessage.class),
+            @io.swagger.annotations.ApiResponse(code = 410, message = "`DCAEServiceType` already gone", response = ApiResponseMessage.class)
+    })
+    public Response dcaeServiceTypesTypeIdDelete(
+            @ApiParam(value = "", required = true) @PathParam("typeId") String typeId,
+            @Context SecurityContext securityContext)
+            throws NotFoundException {
+        return delegate.dcaeServiceTypesTypeIdDelete(typeId, uriInfo, securityContext);
+    }
+
+}
diff --git a/src/gen/java/io/swagger/api/DcaeServiceTypesApiService.java b/src/gen/java/io/swagger/api/DcaeServiceTypesApiService.java
new file mode 100644
index 0000000..afc7476
--- /dev/null
+++ b/src/gen/java/io/swagger/api/DcaeServiceTypesApiService.java
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+import io.swagger.model.DCAEServiceTypeRequest;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public abstract class DcaeServiceTypesApiService {
+      public abstract Response dcaeServiceTypesGet(String typeName, Boolean onlyLatest, Boolean onlyActive,
+                                                   String vnfType, String serviceId, String serviceLocation,
+                                                   String asdcServiceId, String asdcResourceId,
+                                                   Integer offset, UriInfo uriInfo, SecurityContext securityContext)
+      throws NotFoundException;
+      public abstract Response dcaeServiceTypesTypeIdGet(String typeId, UriInfo uriInfo, SecurityContext securityContext)
+      throws NotFoundException;
+      public abstract Response dcaeServiceTypesTypeIdPost(DCAEServiceTypeRequest request, UriInfo uriInfo,
+                                                           SecurityContext securityContext)
+      throws NotFoundException;
+      public abstract Response dcaeServiceTypesTypeIdDelete(String typeId, UriInfo uriInfo, SecurityContext securityContext)
+              throws NotFoundException;
+}
diff --git a/src/gen/java/io/swagger/api/DcaeServicesApi.java b/src/gen/java/io/swagger/api/DcaeServicesApi.java
new file mode 100644
index 0000000..55d79f3
--- /dev/null
+++ b/src/gen/java/io/swagger/api/DcaeServicesApi.java
@@ -0,0 +1,178 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+import io.dropwizard.jersey.params.DateTimeParam;
+import io.swagger.api.factories.DcaeServicesApiServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+import io.swagger.model.InlineResponse2001;
+import io.swagger.model.DCAEService;
+import io.swagger.model.DCAEServiceRequest;
+import org.joda.time.DateTime;
+
+import javax.validation.Valid;
+import javax.ws.rs.core.*;
+import javax.ws.rs.*;
+
+@Path("/dcae-services")
+@Consumes({"application/json", "application/vnd.dcae.inventory.v1+json"})
+@Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
+@io.swagger.annotations.Api(description = "the dcae-services API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DcaeServicesApi {
+    private final DcaeServicesApiService delegate = DcaeServicesApiServiceFactory.getDcaeServicesApi();
+
+    @Context
+    UriInfo uriInfo;
+
+    public static Link buildLinkForGetByTypeId(UriInfo uriInfo, String rel, String typeId) {
+        return buildLinkForGet(uriInfo, rel, typeId, null, null, null, null, null, null, null);
+    }
+
+    public static Link buildLinkForGetByVnfType(UriInfo uriInfo, String rel, String vnfType) {
+        return buildLinkForGet(uriInfo, rel, null, null, vnfType, null, null, null, null, null);
+    }
+
+    public static Link buildLinkForGetByVnfLocation(UriInfo uriInfo, String rel, String vnfLocation) {
+        return buildLinkForGet(uriInfo, rel, null, null, null, vnfLocation, null, null, null, null);
+    }
+
+    public static Link buildLinkForGet(UriInfo uriInfo, String rel, String typeId, String vnfId, String vnfType,
+                                       String vnfLocation, String componentType, Boolean shareable, DateTime created,
+                                       Integer offset) {
+        UriBuilder ub = uriInfo.getBaseUriBuilder().path(DcaeServicesApi.class)
+                .path(DcaeServicesApi.class, "dcaeServicesGet");
+
+        if (typeId != null) {
+            ub.queryParam("typeId", typeId);
+        }
+        if (vnfId != null) {
+            ub.queryParam("vnfId", vnfId);
+        }
+        if (vnfType != null) {
+            ub.queryParam("vnfType", vnfType);
+        }
+        if (vnfLocation != null) {
+            ub.queryParam("vnfLocation", vnfLocation);
+        }
+        if (componentType != null) {
+            ub.queryParam("componentType", componentType);
+        }
+        if (shareable != null) {
+            ub.queryParam("shareable", shareable.toString());
+        }
+        if (created != null) {
+            ub.queryParam("created", created.toString());
+        }
+        if (offset != null) {
+            ub.queryParam("offset", offset);
+        }
+
+        Link.Builder lb = Link.fromUri(ub.build());
+        lb.rel(rel);
+        return lb.build();
+    }
+
+    @GET
+    @Path("/")
+    @Consumes({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Get a list of `DCAEService` objects.", response = InlineResponse2001.class, tags = {})
+    @io.swagger.annotations.ApiResponses(value = {
+            @io.swagger.annotations.ApiResponse(code = 200, message = "List of `DCAEService` objects", response = InlineResponse2001.class),
+            @io.swagger.annotations.ApiResponse(code = 502, message = "Bad response from DCAE controller", response = ApiResponseMessage.class),
+            @io.swagger.annotations.ApiResponse(code = 504, message = "Failed to connect with DCAE controller", response = ApiResponseMessage.class)})
+    public Response dcaeServicesGet(
+            @ApiParam(value = "DCAE service type name") @QueryParam("typeId") String typeId,
+            @ApiParam(value = "") @QueryParam("vnfId") String vnfId,
+            @ApiParam(value = "Filter by associated vnf type. This field is treated case insensitive.")
+                @QueryParam("vnfType") String vnfType,
+            @ApiParam(value = "") @QueryParam("vnfLocation") String vnfLocation,
+            @ApiParam(value = "Use to filter by a specific DCAE service component type") @QueryParam("componentType") String componentType,
+            @ApiParam(value = "Use to filter by DCAE services that have shareable components or not") @QueryParam("shareable") Boolean shareable,
+            @ApiParam(value = "Use to filter by created time") @QueryParam("created") DateTimeParam created,
+            @ApiParam(value = "Query resultset offset used for pagination (zero-based)") @QueryParam("offset") Integer offset,
+            @Context SecurityContext securityContext)
+            throws NotFoundException {
+        return delegate.dcaeServicesGet(typeId, vnfId, vnfType, vnfLocation, componentType, shareable,
+                (created == null ? null : created.get()), offset, uriInfo, securityContext);
+    }
+
+    public static Link buildLinkForGet(UriInfo uriInfo, String rel, String serviceId) {
+        // This same method can be used for PUTs as well
+
+        UriBuilder ub = uriInfo.getBaseUriBuilder().path(DcaeServicesApi.class)
+                .path(DcaeServicesApi.class, "dcaeServicesServiceIdGet");
+        Link.Builder lb = Link.fromUri(ub.build(serviceId));
+        lb.rel(rel);
+        return lb.build();
+    }
+
+    @GET
+    @Path("/{serviceId}")
+    @Consumes({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Get a `DCAEService` object.", response = DCAEService.class, tags = {})
+    @io.swagger.annotations.ApiResponses(value = {
+            @io.swagger.annotations.ApiResponse(code = 200, message = "Single `DCAEService` object", response = DCAEService.class),
+            @io.swagger.annotations.ApiResponse(code = 404, message = "DCAE service not found", response = ApiResponseMessage.class),
+            @io.swagger.annotations.ApiResponse(code = 502, message = "Bad response from DCAE controller", response = ApiResponseMessage.class),
+            @io.swagger.annotations.ApiResponse(code = 504, message = "Failed to connect with DCAE controller", response = ApiResponseMessage.class)})
+    public Response dcaeServicesServiceIdGet(
+            @ApiParam(value = "", required = true) @PathParam("serviceId") String serviceId,
+            @Context SecurityContext securityContext)
+            throws NotFoundException {
+        return delegate.dcaeServicesServiceIdGet(serviceId, uriInfo, securityContext);
+    }
+
+    @PUT
+    @Path("/{serviceId}")
+    @Consumes({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Put a new or update an existing `DCAEService` object.", response = DCAEService.class, tags = {})
+    @io.swagger.annotations.ApiResponses(value = {
+            @io.swagger.annotations.ApiResponse(code = 200, message = "Single `DCAEService` object", response = DCAEService.class),
+            @io.swagger.annotations.ApiResponse(code = 422, message = "Bad request provided", response = ApiResponseMessage.class)})
+    public Response dcaeServicesServiceIdPut(
+            @ApiParam(value = "", required = true) @PathParam("serviceId") String serviceId,
+            @ApiParam(value = "", required = true) @Valid DCAEServiceRequest request,
+            @Context SecurityContext securityContext)
+            throws NotFoundException {
+        return delegate.dcaeServicesServiceIdPut(serviceId, request, uriInfo, securityContext);
+    }
+
+    @DELETE
+    @Path("/{serviceId}")
+    @Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Remove an existing `DCAEService` object.", tags = {})
+    @io.swagger.annotations.ApiResponses(value = {
+            @io.swagger.annotations.ApiResponse(code = 200, message = "DCAE service has been removed"),
+            @io.swagger.annotations.ApiResponse(code = 404, message = "Unknown DCAE service", response = ApiResponseMessage.class)})
+    public Response dcaeServicesServiceIdDelete(
+            @ApiParam(value = "", required = true) @PathParam("serviceId") String serviceId,
+            @Context SecurityContext securityContext)
+            throws NotFoundException
+    {
+        return delegate.dcaeServicesServiceIdDelete(serviceId, securityContext);
+    }
+}
diff --git a/src/gen/java/io/swagger/api/DcaeServicesApiService.java b/src/gen/java/io/swagger/api/DcaeServicesApiService.java
new file mode 100644
index 0000000..99f9f25
--- /dev/null
+++ b/src/gen/java/io/swagger/api/DcaeServicesApiService.java
@@ -0,0 +1,43 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+import io.swagger.model.DCAEServiceRequest;
+import org.joda.time.DateTime;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public abstract class DcaeServicesApiService {
+      public abstract Response dcaeServicesGet(String typeId, String vnfId, String vnfType, String vnfLocation,
+                                               String componentType, Boolean shareable, DateTime created, Integer offset,
+                                               UriInfo uriInfo, SecurityContext securityContext)
+      throws NotFoundException;
+      public abstract Response dcaeServicesServiceIdGet(String serviceId, UriInfo uriInfo, SecurityContext securityContext)
+      throws NotFoundException;
+      public abstract Response dcaeServicesServiceIdPut(String serviceId, DCAEServiceRequest request, UriInfo uriInfo,
+                                                        SecurityContext securityContext)
+      throws NotFoundException;
+      public abstract Response dcaeServicesServiceIdDelete(String serviceId, SecurityContext securityContext)
+              throws NotFoundException;
+}
diff --git a/src/gen/java/io/swagger/api/DcaeServicesGroupbyApi.java b/src/gen/java/io/swagger/api/DcaeServicesGroupbyApi.java
new file mode 100644
index 0000000..d108e31
--- /dev/null
+++ b/src/gen/java/io/swagger/api/DcaeServicesGroupbyApi.java
@@ -0,0 +1,59 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+import io.swagger.api.factories.DcaeServicesGroupbyApiServiceFactory;
+
+import io.swagger.annotations.ApiParam;
+
+import io.swagger.model.DCAEServiceGroupByResults;
+
+import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.*;
+import javax.ws.rs.core.UriInfo;
+
+@Path("/dcae-services-groupby")
+@Consumes({"application/json", "application/vnd.dcae.inventory.v1+json"})
+@Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
+@io.swagger.annotations.Api(description = "the dcae-services-groupby API")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DcaeServicesGroupbyApi {
+    private final DcaeServicesGroupbyApiService delegate = DcaeServicesGroupbyApiServiceFactory.getDcaeServicesGroupbyApi();
+
+    @Context
+    UriInfo uriInfo;
+
+    @GET
+    @Path("/{propertyName}")
+    @Consumes({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @Produces({"application/json", "application/vnd.dcae.inventory.v1+json"})
+    @io.swagger.annotations.ApiOperation(value = "", notes = "Get a list of unique values for the given `propertyName`", response = DCAEServiceGroupByResults.class, tags = {})
+    @io.swagger.annotations.ApiResponses(value = {
+            @io.swagger.annotations.ApiResponse(code = 200, message = "List of unique property values", response = DCAEServiceGroupByResults.class)})
+    public Response dcaeServicesGroupbyPropertyNameGet(
+            @ApiParam(value = "Property to find unique values. Restricted to `type`, `vnfType`, `vnfLocation`", required = true) @PathParam("propertyName") String propertyName,
+            @Context SecurityContext securityContext)
+            throws NotFoundException {
+        return delegate.dcaeServicesGroupbyPropertyNameGet(propertyName, uriInfo, securityContext);
+    }
+}
diff --git a/src/gen/java/io/swagger/api/DcaeServicesGroupbyApiService.java b/src/gen/java/io/swagger/api/DcaeServicesGroupbyApiService.java
new file mode 100644
index 0000000..bc25d4e
--- /dev/null
+++ b/src/gen/java/io/swagger/api/DcaeServicesGroupbyApiService.java
@@ -0,0 +1,31 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+import javax.ws.rs.core.Response;
+import javax.ws.rs.core.SecurityContext;
+import javax.ws.rs.core.UriInfo;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public abstract class DcaeServicesGroupbyApiService {
+      public abstract Response dcaeServicesGroupbyPropertyNameGet(String propertyName, UriInfo uriInfo, SecurityContext securityContext)
+      throws NotFoundException;
+}
diff --git a/src/gen/java/io/swagger/api/JacksonJsonProvider.java b/src/gen/java/io/swagger/api/JacksonJsonProvider.java
new file mode 100644
index 0000000..c7a5db2
--- /dev/null
+++ b/src/gen/java/io/swagger/api/JacksonJsonProvider.java
@@ -0,0 +1,39 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
+import io.swagger.util.Json;
+
+import javax.ws.rs.Produces;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.ext.Provider;
+
+@Provider
+@Produces({MediaType.APPLICATION_JSON})
+public class JacksonJsonProvider extends JacksonJaxbJsonProvider {
+    private static ObjectMapper commonMapper = Json.mapper();
+
+    public JacksonJsonProvider() {
+        super.setMapper(commonMapper);
+    }
+}
diff --git a/src/gen/java/io/swagger/api/NotFoundException.java b/src/gen/java/io/swagger/api/NotFoundException.java
new file mode 100644
index 0000000..3eb483f
--- /dev/null
+++ b/src/gen/java/io/swagger/api/NotFoundException.java
@@ -0,0 +1,35 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class NotFoundException extends ApiException {
+	private int code;
+
+	public int getCode() {
+		return this.code;
+	}
+
+	public NotFoundException (int code, String msg) {
+		super(code, msg);
+		this.code = code;
+	}
+}
diff --git a/src/gen/java/io/swagger/api/StringUtil.java b/src/gen/java/io/swagger/api/StringUtil.java
new file mode 100644
index 0000000..e20f46f
--- /dev/null
+++ b/src/gen/java/io/swagger/api/StringUtil.java
@@ -0,0 +1,62 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.api;
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class StringUtil {
+  /**
+   * Check if the given array contains the given value (with case-insensitive comparison).
+   *
+   * @param array The array
+   * @param value The value to search
+   * @return true if the array contains the value
+   */
+  public static boolean containsIgnoreCase(String[] array, String value) {
+    for (String str : array) {
+      if (value == null && str == null) return true;
+      if (value != null && value.equalsIgnoreCase(str)) return true;
+    }
+    return false;
+  }
+
+  /**
+   * Join an array of strings with the given separator.
+   * <p>
+   * Note: This might be replaced by utility method from commons-lang or guava someday
+   * if one of those libraries is added as dependency.
+   * </p>
+   *
+   * @param array     The array of strings
+   * @param separator The separator
+   * @return the resulting string
+   */
+  public static String join(String[] array, String separator) {
+    int len = array.length;
+    if (len == 0) return "";
+
+    StringBuilder out = new StringBuilder();
+    out.append(array[0]);
+    for (int i = 1; i < len; i++) {
+      out.append(separator).append(array[i]);
+    }
+    return out.toString();
+  }
+}
diff --git a/src/gen/java/io/swagger/model/DCAEService.java b/src/gen/java/io/swagger/model/DCAEService.java
new file mode 100644
index 0000000..779487c
--- /dev/null
+++ b/src/gen/java/io/swagger/model/DCAEService.java
@@ -0,0 +1,303 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.DCAEServiceComponent;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import javax.ws.rs.core.Link;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DCAEService   {
+  
+  private String serviceId = null;
+  private Link selfLink = null;
+  private Date created = null;
+  private Date modified = null;
+  private Link typeLink = null;
+  private String vnfId = null;
+  private Link vnfLink = null;
+  private String vnfType = null;
+  private String vnfLocation = null;
+  private String deploymentRef = null;
+  private List<DCAEServiceComponent> components = new ArrayList<DCAEServiceComponent>();
+
+  /**
+   **/
+  public DCAEService serviceId(String serviceId) {
+    this.serviceId = serviceId;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("serviceId")
+  public String getServiceId() {
+    return serviceId;
+  }
+  public void setServiceId(String serviceId) {
+    this.serviceId = serviceId;
+  }
+
+  /**
+   * Link.title is serviceId
+   **/
+  public DCAEService selfLink(Link selfLink) {
+    this.selfLink = selfLink;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Link.title is serviceId")
+  @JsonProperty("selfLink")
+  public Link getSelfLink() {
+    return selfLink;
+  }
+  public void setSelfLink(Link selfLink) {
+    this.selfLink = selfLink;
+  }
+
+  /**
+   **/
+  public DCAEService created(Date created) {
+    this.created = created;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("created")
+  public Date getCreated() {
+    return created;
+  }
+  public void setCreated(Date created) {
+    this.created = created;
+  }
+
+  /**
+   **/
+  public DCAEService modified(Date modified) {
+    this.modified = modified;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("modified")
+  public Date getModified() {
+    return modified;
+  }
+  public void setModified(Date modified) {
+    this.modified = modified;
+  }
+
+  /**
+   * Link.title is typeId
+   **/
+  public DCAEService typeLink(Link typeLink) {
+    this.typeLink = typeLink;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Link.title is typeId")
+  @JsonProperty("typeLink")
+  public Link getTypeLink() {
+    return typeLink;
+  }
+  public void setTypeLink(Link typeLink) {
+    this.typeLink = typeLink;
+  }
+
+  /**
+   **/
+  public DCAEService vnfId(String vnfId) {
+    this.vnfId = vnfId;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("vnfId")
+  public String getVnfId() {
+    return vnfId;
+  }
+  public void setVnfId(String vnfId) {
+    this.vnfId = vnfId;
+  }
+
+  /**
+   * Link.title is vnfId
+   **/
+  public DCAEService vnfLink(Link vnfLink) {
+    this.vnfLink = vnfLink;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Link.title is vnfId")
+  @JsonProperty("vnfLink")
+  public Link getVnfLink() {
+    return vnfLink;
+  }
+  public void setVnfLink(Link vnfLink) {
+    this.vnfLink = vnfLink;
+  }
+
+  /**
+   **/
+  public DCAEService vnfType(String vnfType) {
+    this.vnfType = vnfType;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("vnfType")
+  public String getVnfType() {
+    return vnfType;
+  }
+  public void setVnfType(String vnfType) {
+    this.vnfType = vnfType;
+  }
+
+  /**
+   * Location information of the associated VNF
+   **/
+  public DCAEService vnfLocation(String vnfLocation) {
+    this.vnfLocation = vnfLocation;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Location information of the associated VNF")
+  @JsonProperty("vnfLocation")
+  public String getVnfLocation() {
+    return vnfLocation;
+  }
+  public void setVnfLocation(String vnfLocation) {
+    this.vnfLocation = vnfLocation;
+  }
+
+  /**
+   * Reference to a Cloudify deployment
+   **/
+  public DCAEService deploymentRef(String deploymentRef) {
+    this.deploymentRef = deploymentRef;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Reference to a Cloudify deployment")
+  @JsonProperty("deploymentRef")
+  public String getDeploymentRef() {
+    return deploymentRef;
+  }
+  public void setDeploymentRef(String deploymentRef) {
+    this.deploymentRef = deploymentRef;
+  }
+
+  /**
+   **/
+  public DCAEService components(List<DCAEServiceComponent> components) {
+    this.components = components;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("components")
+  public List<DCAEServiceComponent> getComponents() {
+    return components;
+  }
+  public void setComponents(List<DCAEServiceComponent> components) {
+    this.components = components;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DCAEService dCAEService = (DCAEService) o;
+    return Objects.equals(serviceId, dCAEService.serviceId) &&
+        Objects.equals(selfLink, dCAEService.selfLink) &&
+        Objects.equals(created, dCAEService.created) &&
+        Objects.equals(modified, dCAEService.modified) &&
+        Objects.equals(typeLink, dCAEService.typeLink) &&
+        Objects.equals(vnfId, dCAEService.vnfId) &&
+        Objects.equals(vnfLink, dCAEService.vnfLink) &&
+        Objects.equals(vnfType, dCAEService.vnfType) &&
+        Objects.equals(vnfLocation, dCAEService.vnfLocation) &&
+        Objects.equals(deploymentRef, dCAEService.deploymentRef) &&
+        Objects.equals(components, dCAEService.components);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(serviceId, selfLink, created, modified, typeLink, vnfId, vnfLink, vnfType, vnfLocation, deploymentRef, components);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DCAEService {\n");
+    
+    sb.append("    serviceId: ").append(toIndentedString(serviceId)).append("\n");
+    sb.append("    selfLink: ").append(toIndentedString(selfLink)).append("\n");
+    sb.append("    created: ").append(toIndentedString(created)).append("\n");
+    sb.append("    modified: ").append(toIndentedString(modified)).append("\n");
+    sb.append("    typeLink: ").append(toIndentedString(typeLink)).append("\n");
+    sb.append("    vnfId: ").append(toIndentedString(vnfId)).append("\n");
+    sb.append("    vnfLink: ").append(toIndentedString(vnfLink)).append("\n");
+    sb.append("    vnfType: ").append(toIndentedString(vnfType)).append("\n");
+    sb.append("    vnfLocation: ").append(toIndentedString(vnfLocation)).append("\n");
+    sb.append("    deploymentRef: ").append(toIndentedString(deploymentRef)).append("\n");
+    sb.append("    components: ").append(toIndentedString(components)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/src/gen/java/io/swagger/model/DCAEServiceComponent.java b/src/gen/java/io/swagger/model/DCAEServiceComponent.java
new file mode 100644
index 0000000..6550c76
--- /dev/null
+++ b/src/gen/java/io/swagger/model/DCAEServiceComponent.java
@@ -0,0 +1,249 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import java.util.Date;
+import javax.ws.rs.core.Link;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DCAEServiceComponent   {
+  
+  private String componentId = null;
+  private Link componentLink = null;
+  private Date created = null;
+  private Date modified = null;
+  private String componentType = null;
+  private String componentSource = null;
+  private String status = null;
+  private String location = null;
+  private Integer shareable = null;
+
+  /**
+   **/
+  public DCAEServiceComponent componentId(String componentId) {
+    this.componentId = componentId;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "The id format is unique to the source", required = true)
+  @JsonProperty("componentId")
+  public String getComponentId() {
+    return componentId;
+  }
+  public void setComponentId(String componentId) {
+    this.componentId = componentId;
+  }
+
+  /**
+   * Link.title is componentId
+   **/
+  public DCAEServiceComponent componentLink(Link componentLink) {
+    this.componentLink = componentLink;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Link to the underlying resource of this component", required = true)
+  @JsonProperty("componentLink")
+  public Link getComponentLink() {
+    return componentLink;
+  }
+  public void setComponentLink(Link componentLink) {
+    this.componentLink = componentLink;
+  }
+
+  /**
+   **/
+  public DCAEServiceComponent created(Date created) {
+    this.created = created;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "", required = true)
+  @JsonProperty("created")
+  public Date getCreated() {
+    return created;
+  }
+  public void setCreated(Date created) {
+    this.created = created;
+  }
+
+  /**
+   **/
+  public DCAEServiceComponent modified(Date modified) {
+    this.modified = modified;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "", required = true)
+  @JsonProperty("modified")
+  public Date getModified() {
+    return modified;
+  }
+  public void setModified(Date modified) {
+    this.modified = modified;
+  }
+
+  /**
+   **/
+  public DCAEServiceComponent componentType(String componentType) {
+    this.componentType = componentType;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "", required = true)
+  @JsonProperty("componentType")
+  public String getComponentType() {
+    return componentType;
+  }
+  public void setComponentType(String componentType) {
+    this.componentType = componentType;
+  }
+
+
+  @ApiModelProperty(value = "Specifies the name of the underying source service that is responsible for this components", required = true,
+          allowableValues = "DCAEController, DMaaPController")
+  @JsonProperty("componentSource")
+  public String getComponentSource() {
+    return componentSource;
+  }
+  public void setComponentSource(String componentSource) {
+    this.componentSource = componentSource;
+  }
+
+  /**
+   **/
+  public DCAEServiceComponent status(String status) {
+    this.status = status;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("status")
+  public String getStatus() {
+    return status;
+  }
+  public void setStatus(String status) {
+    this.status = status;
+  }
+
+  /**
+   * Location information of the component
+   **/
+  public DCAEServiceComponent location(String location) {
+    this.location = location;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Location information of the component")
+  @JsonProperty("location")
+  public String getLocation() {
+    return location;
+  }
+  public void setLocation(String location) {
+    this.location = location;
+  }
+
+  /**
+   * Used to determine if this component can be shared amongst different DCAE services
+   **/
+  public DCAEServiceComponent shareable(Integer shareable) {
+    this.shareable = shareable;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Used to determine if this component can be shared amongst different DCAE services", required = true)
+  @JsonProperty("shareable")
+  public Integer getShareable() {
+    return shareable;
+  }
+  public void setShareable(Integer shareable) {
+    this.shareable = shareable;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DCAEServiceComponent dCAEServiceComponent = (DCAEServiceComponent) o;
+    return Objects.equals(componentId, dCAEServiceComponent.componentId) &&
+        Objects.equals(componentLink, dCAEServiceComponent.componentLink) &&
+        Objects.equals(created, dCAEServiceComponent.created) &&
+        Objects.equals(modified, dCAEServiceComponent.modified) &&
+        Objects.equals(componentType, dCAEServiceComponent.componentType) &&
+        Objects.equals(status, dCAEServiceComponent.status) &&
+        Objects.equals(location, dCAEServiceComponent.location) &&
+        Objects.equals(shareable, dCAEServiceComponent.shareable);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(componentId, componentLink, created, modified, componentType, status, location, shareable);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DCAEServiceComponent {\n");
+    
+    sb.append("    componentId: ").append(toIndentedString(componentId)).append("\n");
+    sb.append("    componentLink: ").append(toIndentedString(componentLink)).append("\n");
+    sb.append("    created: ").append(toIndentedString(created)).append("\n");
+    sb.append("    modified: ").append(toIndentedString(modified)).append("\n");
+    sb.append("    componentType: ").append(toIndentedString(componentType)).append("\n");
+    sb.append("    status: ").append(toIndentedString(status)).append("\n");
+    sb.append("    location: ").append(toIndentedString(location)).append("\n");
+    sb.append("    shareable: ").append(toIndentedString(shareable)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/src/gen/java/io/swagger/model/DCAEServiceComponentRequest.java b/src/gen/java/io/swagger/model/DCAEServiceComponentRequest.java
new file mode 100644
index 0000000..f65bf38
--- /dev/null
+++ b/src/gen/java/io/swagger/model/DCAEServiceComponentRequest.java
@@ -0,0 +1,152 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DCAEServiceComponentRequest   {
+
+  @NotEmpty
+  private String componentId = null;
+  @NotEmpty
+  private String componentType = null;
+  @NotEmpty
+  private String componentSource = null;
+  @NotNull
+  private Integer shareable = null;
+
+  /**
+   **/
+  public DCAEServiceComponentRequest componentId(String componentId) {
+    this.componentId = componentId;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "The id format is unique to the source", required = true)
+  @JsonProperty("componentId")
+  public String getComponentId() {
+    return componentId;
+  }
+  public void setComponentId(String componentId) {
+    this.componentId = componentId;
+  }
+
+  /**
+   **/
+  public DCAEServiceComponentRequest componentType(String componentType) {
+    this.componentType = componentType;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "", required = true)
+  @JsonProperty("componentType")
+  public String getComponentType() {
+    return componentType;
+  }
+  public void setComponentType(String componentType) {
+    this.componentType = componentType;
+  }
+
+
+  @ApiModelProperty(value = "Specifies the name of the underying source service that is responsible for this components", required = true,
+          allowableValues = "DCAEController, DMaaPController")
+  @JsonProperty("componentSource")
+  public String getComponentSource() {
+    return componentSource;
+  }
+  public void setComponentSource(String componentSource) {
+    this.componentSource = componentSource;
+  }
+
+
+  /**
+   * Used to determine if this component can be shared amongst different DCAE services
+   **/
+  public DCAEServiceComponentRequest shareable(Integer shareable) {
+    this.shareable = shareable;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Used to determine if this component can be shared amongst different DCAE services", required = true)
+  @JsonProperty("shareable")
+  public Integer getShareable() {
+    return shareable;
+  }
+  public void setShareable(Integer shareable) {
+    this.shareable = shareable;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DCAEServiceComponentRequest dCAEServiceComponentRequest = (DCAEServiceComponentRequest) o;
+    return Objects.equals(componentId, dCAEServiceComponentRequest.componentId) &&
+        Objects.equals(componentType, dCAEServiceComponentRequest.componentType) &&
+        Objects.equals(shareable, dCAEServiceComponentRequest.shareable);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(componentId, componentType, shareable);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DCAEServiceComponentRequest {\n");
+    
+    sb.append("    componentId: ").append(toIndentedString(componentId)).append("\n");
+    sb.append("    componentType: ").append(toIndentedString(componentType)).append("\n");
+    sb.append("    componentSource: ").append(toIndentedString(componentSource)).append("\n");
+    sb.append("    shareable: ").append(toIndentedString(shareable)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/src/gen/java/io/swagger/model/DCAEServiceGroupByResults.java b/src/gen/java/io/swagger/model/DCAEServiceGroupByResults.java
new file mode 100644
index 0000000..f8f0449
--- /dev/null
+++ b/src/gen/java/io/swagger/model/DCAEServiceGroupByResults.java
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.DCAEServiceGroupByResultsPropertyValues;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DCAEServiceGroupByResults   {
+  
+  private String propertyName = null;
+  private List<DCAEServiceGroupByResultsPropertyValues> propertyValues = new ArrayList<DCAEServiceGroupByResultsPropertyValues>();
+
+  /**
+   * Property name of DCAE service that the group by operation was performed on
+   **/
+  public DCAEServiceGroupByResults propertyName(String propertyName) {
+    this.propertyName = propertyName;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Property name of DCAE service that the group by operation was performed on")
+  @JsonProperty("propertyName")
+  public String getPropertyName() {
+    return propertyName;
+  }
+  public void setPropertyName(String propertyName) {
+    this.propertyName = propertyName;
+  }
+
+  /**
+   **/
+  public DCAEServiceGroupByResults propertyValues(List<DCAEServiceGroupByResultsPropertyValues> propertyValues) {
+    this.propertyValues = propertyValues;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("propertyValues")
+  public List<DCAEServiceGroupByResultsPropertyValues> getPropertyValues() {
+    return propertyValues;
+  }
+  public void setPropertyValues(List<DCAEServiceGroupByResultsPropertyValues> propertyValues) {
+    this.propertyValues = propertyValues;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DCAEServiceGroupByResults dCAEServiceGroupByResults = (DCAEServiceGroupByResults) o;
+    return Objects.equals(propertyName, dCAEServiceGroupByResults.propertyName) &&
+        Objects.equals(propertyValues, dCAEServiceGroupByResults.propertyValues);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(propertyName, propertyValues);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DCAEServiceGroupByResults {\n");
+    
+    sb.append("    propertyName: ").append(toIndentedString(propertyName)).append("\n");
+    sb.append("    propertyValues: ").append(toIndentedString(propertyValues)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/src/gen/java/io/swagger/model/DCAEServiceGroupByResultsPropertyValues.java b/src/gen/java/io/swagger/model/DCAEServiceGroupByResultsPropertyValues.java
new file mode 100644
index 0000000..0d39b51
--- /dev/null
+++ b/src/gen/java/io/swagger/model/DCAEServiceGroupByResultsPropertyValues.java
@@ -0,0 +1,135 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.ws.rs.core.Link;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DCAEServiceGroupByResultsPropertyValues   {
+  
+  private Integer count = null;
+  private String propertyValue = null;
+  private Link dcaeServiceQueryLink = null;
+
+  /**
+   **/
+  public DCAEServiceGroupByResultsPropertyValues count(Integer count) {
+    this.count = count;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("count")
+  public Integer getCount() {
+    return count;
+  }
+  public void setCount(Integer count) {
+    this.count = count;
+  }
+
+  /**
+   **/
+  public DCAEServiceGroupByResultsPropertyValues propertyValue(String propertyValue) {
+    this.propertyValue = propertyValue;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("propertyValue")
+  public String getPropertyValue() {
+    return propertyValue;
+  }
+  public void setPropertyValue(String propertyValue) {
+    this.propertyValue = propertyValue;
+  }
+
+  /**
+   * Link.title is the DCAE service property value. Following this link will provide a list of DCAE services that all have this property value.
+   **/
+  public DCAEServiceGroupByResultsPropertyValues dcaeServiceQueryLink(Link dcaeServiceQueryLink) {
+    this.dcaeServiceQueryLink = dcaeServiceQueryLink;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Link.title is the DCAE service property value. Following this link will provide a list of DCAE services that all have this property value.")
+  @JsonProperty("dcaeServiceQueryLink")
+  public Link getDcaeServiceQueryLink() {
+    return dcaeServiceQueryLink;
+  }
+  public void setDcaeServiceQueryLink(Link dcaeServiceQueryLink) {
+    this.dcaeServiceQueryLink = dcaeServiceQueryLink;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DCAEServiceGroupByResultsPropertyValues dCAEServiceGroupByResultsPropertyValues = (DCAEServiceGroupByResultsPropertyValues) o;
+    return Objects.equals(count, dCAEServiceGroupByResultsPropertyValues.count) &&
+        Objects.equals(propertyValue, dCAEServiceGroupByResultsPropertyValues.propertyValue) &&
+        Objects.equals(dcaeServiceQueryLink, dCAEServiceGroupByResultsPropertyValues.dcaeServiceQueryLink);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(count, propertyValue, dcaeServiceQueryLink);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DCAEServiceGroupByResultsPropertyValues {\n");
+    
+    sb.append("    count: ").append(toIndentedString(count)).append("\n");
+    sb.append("    propertyValue: ").append(toIndentedString(propertyValue)).append("\n");
+    sb.append("    dcaeServiceQueryLink: ").append(toIndentedString(dcaeServiceQueryLink)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/src/gen/java/io/swagger/model/DCAEServiceRequest.java b/src/gen/java/io/swagger/model/DCAEServiceRequest.java
new file mode 100644
index 0000000..06f6935
--- /dev/null
+++ b/src/gen/java/io/swagger/model/DCAEServiceRequest.java
@@ -0,0 +1,204 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.Valid;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DCAEServiceRequest   {
+
+  @NotEmpty
+  private String typeId = null;
+  @NotEmpty
+  private String vnfId = null;
+  @NotEmpty
+  private String vnfType = null;
+  @NotEmpty
+  private String vnfLocation = null;
+  private String deploymentRef = null;
+  @NotEmpty
+  @Valid
+  private List<DCAEServiceComponentRequest> components = new ArrayList<DCAEServiceComponentRequest>();
+
+  /**
+   **/
+  public DCAEServiceRequest typeId(String typeId) {
+    this.typeId = typeId;
+    return this;
+  }
+
+  
+  @ApiModelProperty(required = true, value = "Id of the associated DCAE service type")
+  @JsonProperty("typeId")
+  public String getTypeId() {
+    return typeId;
+  }
+  public void setTypeId(String typeId) {
+    this.typeId = typeId;
+  }
+
+  /**
+   **/
+  public DCAEServiceRequest vnfId(String vnfId) {
+    this.vnfId = vnfId;
+    return this;
+  }
+
+  
+  @ApiModelProperty(required = true, value = "Id of the associated VNF that this service is monitoring")
+  @JsonProperty("vnfId")
+  public String getVnfId() {
+    return vnfId;
+  }
+  public void setVnfId(String vnfId) {
+    this.vnfId = vnfId;
+  }
+
+  /**
+   **/
+  public DCAEServiceRequest vnfType(String vnfType) {
+    this.vnfType = vnfType;
+    return this;
+  }
+
+
+  @ApiModelProperty(required = true, value = "The type of the associated VNF that this service is monitoring")
+  @JsonProperty("vnfType")
+  public String getVnfType() {
+    return vnfType;
+  }
+  public void setVnfType(String vnfType) {
+    this.vnfType = vnfType;
+  }
+
+  /**
+   **/
+  public DCAEServiceRequest vnfLocation(String vnfLocation) {
+    this.vnfLocation = vnfLocation;
+    return this;
+  }
+
+
+  @ApiModelProperty(required = true, value = "Location identifier of the associated VNF that this service is monitoring")
+  @JsonProperty("vnfLocation")
+  public String getVnfLocation() {
+    return vnfLocation;
+  }
+  public void setVnfLocation(String vnfLocation) {
+    this.vnfLocation = vnfLocation;
+  }
+
+  /**
+   * Reference to a Cloudify deployment
+   **/
+  public DCAEServiceRequest deploymentRef(String deploymentRef) {
+    this.deploymentRef = deploymentRef;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "Reference to a Cloudify deployment")
+  @JsonProperty("deploymentRef")
+  public String getDeploymentRef() {
+    return deploymentRef;
+  }
+  public void setDeploymentRef(String deploymentRef) {
+    this.deploymentRef = deploymentRef;
+  }
+
+  /**
+   **/
+  public DCAEServiceRequest components(List<DCAEServiceComponentRequest> components) {
+    this.components = components;
+    return this;
+  }
+
+
+  @ApiModelProperty(required = true, value = "List of DCAE service components that this service is composed of")
+  @JsonProperty("components")
+  public List<DCAEServiceComponentRequest> getComponents() {
+    return components;
+  }
+  public void setComponents(List<DCAEServiceComponentRequest> components) {
+    this.components = components;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    DCAEServiceRequest dCAEServiceRequest = (DCAEServiceRequest) o;
+    return Objects.equals(typeId, dCAEServiceRequest.typeId) &&
+        Objects.equals(vnfId, dCAEServiceRequest.vnfId) &&
+        Objects.equals(vnfType, dCAEServiceRequest.vnfType) &&
+        Objects.equals(vnfLocation, dCAEServiceRequest.vnfLocation) &&
+        Objects.equals(deploymentRef, dCAEServiceRequest.deploymentRef) &&
+        Objects.equals(components, dCAEServiceRequest.components);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(typeId, vnfId, vnfType, vnfLocation, deploymentRef, components);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class DCAEServiceRequest {\n");
+    
+    sb.append("    typeId: ").append(toIndentedString(typeId)).append("\n");
+    sb.append("    vnfId: ").append(toIndentedString(vnfId)).append("\n");
+    sb.append("    vnfType: ").append(toIndentedString(vnfType)).append("\n");
+    sb.append("    vnfLocation: ").append(toIndentedString(vnfLocation)).append("\n");
+    sb.append("    deploymentRef: ").append(toIndentedString(deploymentRef)).append("\n");
+    sb.append("    components: ").append(toIndentedString(components)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/src/gen/java/io/swagger/model/DCAEServiceType.java b/src/gen/java/io/swagger/model/DCAEServiceType.java
new file mode 100644
index 0000000..5598604
--- /dev/null
+++ b/src/gen/java/io/swagger/model/DCAEServiceType.java
@@ -0,0 +1,134 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.ws.rs.core.Link;
+import java.util.Date;
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public final class DCAEServiceType extends DCAEServiceTypeRequest {
+
+    @NotEmpty
+    private String typeId = null;
+    @NotEmpty
+    private Link selfLink = null;
+    @NotEmpty
+    private Date created = null;
+    private Date deactivated = null;
+
+
+    @ApiModelProperty(required = true, value = "Unique identifier for this DCAE service type")
+    @JsonProperty("typeId")
+    public String getTypeId() {
+        return typeId;
+    }
+
+    public void setTypeId(String typeId) {
+        this.typeId = typeId;
+    }
+
+
+    @ApiModelProperty(required = true, value = "Link to self where the Link.title is typeName")
+    @JsonProperty("selfLink")
+    public Link getSelfLink() {
+        return selfLink;
+    }
+
+    public void setSelfLink(Link selfLink) {
+        this.selfLink = selfLink;
+    }
+
+
+    @ApiModelProperty(required = true, value = "Created timestamp for this DCAE service type in epoch time")
+    @JsonProperty("created")
+    public Date getCreated() {
+        return created;
+    }
+
+    public void setCreated(Date created) {
+        this.created = created;
+    }
+
+
+    @ApiModelProperty(required = false, value = "Deactivated timestamp for this DCAE service type in epoch time")
+    @JsonProperty("deactivated")
+    public Date getDeactivated() {
+        return deactivated;
+    }
+
+    public void setDeactivated(Date deactivated) {
+        this.deactivated = deactivated;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DCAEServiceType dCAEServiceType = (DCAEServiceType) o;
+        return Objects.equals(typeId, dCAEServiceType.typeId) &&
+                Objects.equals(selfLink, dCAEServiceType.selfLink) &&
+                Objects.equals(created, dCAEServiceType.created) &&
+                Objects.equals(deactivated, dCAEServiceType.deactivated) &&
+                super.equals((DCAEServiceTypeRequest) o);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(typeId, selfLink, created, deactivated) + super.hashCode();
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class DCAEServiceType {\n");
+
+        sb.append("    typeId: ").append(toIndentedString(typeId)).append("\n");
+        sb.append("    selfLink: ").append(toIndentedString(selfLink)).append("\n");
+        sb.append("    created: ").append(toIndentedString(created)).append("\n");
+        sb.append("    deactivated: ").append(toIndentedString(deactivated)).append("\n");
+        sb.append(super.toString()).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+}
+
diff --git a/src/gen/java/io/swagger/model/DCAEServiceTypeRequest.java b/src/gen/java/io/swagger/model/DCAEServiceTypeRequest.java
new file mode 100644
index 0000000..7cd3577
--- /dev/null
+++ b/src/gen/java/io/swagger/model/DCAEServiceTypeRequest.java
@@ -0,0 +1,227 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModelProperty;
+import org.hibernate.validator.constraints.NotEmpty;
+
+import javax.validation.constraints.NotNull;
+import java.util.ArrayList;
+import java.util.List;
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class DCAEServiceTypeRequest {
+
+    @NotEmpty
+    private String owner = null;
+    @NotEmpty
+    private String typeName = null;
+    @NotNull
+    private Integer typeVersion = 1;
+    @NotEmpty
+    private String blueprintTemplate = null;
+
+    // REVIEW: Look to deprecate these depending upon how the ASDC integration goes
+    private List<String> serviceIds = null;
+    private List<String> vnfTypes = new ArrayList<String>();
+
+    private List<String> serviceLocations = null;
+
+    // TODO: This should eventually become required fields
+    private String asdcServiceId = null;
+    private String asdcResourceId = null;
+    private String asdcServiceURL = null;
+
+
+    /**
+     **/
+    public DCAEServiceTypeRequest owner(String owner) {
+        this.owner = owner;
+        return this;
+    }
+
+
+    @ApiModelProperty(required = true, value = "")
+    @JsonProperty("owner")
+    public String getOwner() {
+        return owner;
+    }
+
+    public void setOwner(String owner) {
+        this.owner = owner;
+    }
+
+
+    @ApiModelProperty(required = true, value = "Descriptive name for this DCAE service type")
+    @JsonProperty("typeName")
+    public String getTypeName() {
+        return typeName;
+    }
+
+    public void setTypeName(String typeName) {
+        this.typeName = typeName;
+    }
+
+
+    @ApiModelProperty(required = true, value = "Version number for this DCAE service type")
+    @JsonProperty("typeVersion")
+    public Integer getTypeVersion() {
+        return this.typeVersion;
+    }
+
+    public void setTypeVersion(Integer typeVersion) {
+        this.typeVersion = typeVersion;
+    }
+
+    /**
+     **/
+    public DCAEServiceTypeRequest vnfTypes(List<String> vnfTypes) {
+        this.vnfTypes = vnfTypes;
+        return this;
+    }
+
+
+    @ApiModelProperty(required = false, value = "")
+    @JsonProperty("vnfTypes")
+    public List<String> getVnfTypes() {
+        return vnfTypes;
+    }
+
+    public void setVnfTypes(List<String> vnfTypes) {
+        this.vnfTypes = vnfTypes;
+    }
+
+    /**
+     * String representation of a Cloudify blueprint with unbound variables
+     **/
+    public DCAEServiceTypeRequest blueprintTemplate(String blueprintTemplate) {
+        this.blueprintTemplate = blueprintTemplate;
+        return this;
+    }
+
+
+    @ApiModelProperty(required = true, value = "String representation of a Cloudify blueprint with unbound variables")
+    @JsonProperty("blueprintTemplate")
+    public String getBlueprintTemplate() {
+        return blueprintTemplate;
+    }
+
+    public void setBlueprintTemplate(String blueprintTemplate) {
+        this.blueprintTemplate = blueprintTemplate;
+    }
+
+    @ApiModelProperty(required = false, value = "List of service locations that are used to associate with DCAE service type. DCAE service types with this propery as null or empty means them apply for every service location.")
+    @JsonProperty("serviceLocations")
+    public List<String> getServiceLocations() {
+        return this.serviceLocations;
+    }
+
+    public void setServiceLocations(List<String> serviceLocations) {
+        this.serviceLocations = serviceLocations;
+    }
+
+    @ApiModelProperty(required = false, value = "List of service ids that are used to associate with DCAE service type. DCAE service types with this propery as null or empty means them apply for every service id.")
+    @JsonProperty("serviceIds")
+    public List<String> getServiceIds() {
+        return this.serviceIds;
+    }
+
+    public void setServiceIds(List<String> serviceIds) {
+        this.serviceIds = serviceIds;
+    }
+
+    @ApiModelProperty(required = false, value = "Id of service this DCAE service type is associated with. Value source is from ASDC's notification event's field `serviceInvariantUUID`.")
+    @JsonProperty("asdcServiceId")
+    public String getAsdcServiceId() {
+        return asdcServiceId;
+    }
+
+    public void setAsdcServiceId(String asdcServiceId) {
+        this.asdcServiceId = asdcServiceId;
+    }
+
+    @ApiModelProperty(required = false, value = "Id of vf/vnf instance this DCAE service type is associated with. Value source is from ASDC's notification event's field `resourceInvariantUUID`.")
+    @JsonProperty("asdcResourceId")
+    public String getAsdcResourceId() {
+        return asdcResourceId;
+    }
+
+    public void setAsdcResourceId(String asdcResourceId) {
+        this.asdcResourceId = asdcResourceId;
+    }
+
+    @ApiModelProperty(required = false, value = "URL to the ASDC service model")
+    @JsonProperty("asdcServiceURL")
+    public String getAsdcServiceURL() {
+        return asdcServiceURL;
+    }
+
+    public void setAsdcServiceURL(String asdcServiceURL) {
+        this.asdcServiceURL = asdcServiceURL;
+    }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        DCAEServiceTypeRequest dCAEServiceTypeRequest = (DCAEServiceTypeRequest) o;
+        return Objects.equals(owner, dCAEServiceTypeRequest.owner) &&
+                Objects.equals(vnfTypes, dCAEServiceTypeRequest.vnfTypes) &&
+                Objects.equals(blueprintTemplate, dCAEServiceTypeRequest.blueprintTemplate);
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(owner, vnfTypes, blueprintTemplate);
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append("class DCAEServiceTypeRequest {\n");
+
+        sb.append("    owner: ").append(toIndentedString(owner)).append("\n");
+        sb.append("    vnfTypes: ").append(toIndentedString(vnfTypes)).append("\n");
+        sb.append("    blueprintTemplate: ").append(toIndentedString(blueprintTemplate)).append("\n");
+        sb.append("}");
+        return sb.toString();
+    }
+
+    /**
+     * Convert the given object to string with each line indented by 4 spaces
+     * (except the first line).
+     */
+    private String toIndentedString(Object o) {
+        if (o == null) {
+            return "null";
+        }
+        return o.toString().replace("\n", "\n    ");
+    }
+}
+
diff --git a/src/gen/java/io/swagger/model/InlineResponse200.java b/src/gen/java/io/swagger/model/InlineResponse200.java
new file mode 100644
index 0000000..0c44fdf
--- /dev/null
+++ b/src/gen/java/io/swagger/model/InlineResponse200.java
@@ -0,0 +1,137 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.DCAEServiceType;
+import io.swagger.model.InlineResponse200Links;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class InlineResponse200   {
+  
+  private InlineResponse200Links links = null;
+  private Integer totalCount = null;
+  private List<DCAEServiceType> items = new ArrayList<DCAEServiceType>();
+
+  /**
+   **/
+  public InlineResponse200 links(InlineResponse200Links links) {
+    this.links = links;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("links")
+  public InlineResponse200Links getLinks() {
+    return links;
+  }
+  public void setLinks(InlineResponse200Links links) {
+    this.links = links;
+  }
+
+  /**
+   **/
+  public InlineResponse200 totalCount(Integer totalCount) {
+    this.totalCount = totalCount;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("totalCount")
+  public Integer getTotalCount() {
+    return totalCount;
+  }
+  public void setTotalCount(Integer totalCount) {
+    this.totalCount = totalCount;
+  }
+
+  /**
+   **/
+  public InlineResponse200 items(List<DCAEServiceType> items) {
+    this.items = items;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("items")
+  public List<DCAEServiceType> getItems() {
+    return items;
+  }
+  public void setItems(List<DCAEServiceType> items) {
+    this.items = items;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200 inlineResponse200 = (InlineResponse200) o;
+    return Objects.equals(links, inlineResponse200.links) &&
+        Objects.equals(totalCount, inlineResponse200.totalCount) &&
+        Objects.equals(items, inlineResponse200.items);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(links, totalCount, items);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200 {\n");
+    
+    sb.append("    links: ").append(toIndentedString(links)).append("\n");
+    sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
+    sb.append("    items: ").append(toIndentedString(items)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/src/gen/java/io/swagger/model/InlineResponse2001.java b/src/gen/java/io/swagger/model/InlineResponse2001.java
new file mode 100644
index 0000000..88e3816
--- /dev/null
+++ b/src/gen/java/io/swagger/model/InlineResponse2001.java
@@ -0,0 +1,137 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import io.swagger.model.DCAEService;
+import io.swagger.model.InlineResponse200Links;
+import java.util.ArrayList;
+import java.util.List;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-20T02:21:09.269Z")
+public class InlineResponse2001   {
+  
+  private InlineResponse200Links links = null;
+  private Integer totalCount = null;
+  private List<DCAEService> items = new ArrayList<DCAEService>();
+
+  /**
+   **/
+  public InlineResponse2001 links(InlineResponse200Links links) {
+    this.links = links;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("links")
+  public InlineResponse200Links getLinks() {
+    return links;
+  }
+  public void setLinks(InlineResponse200Links links) {
+    this.links = links;
+  }
+
+  /**
+   **/
+  public InlineResponse2001 totalCount(Integer totalCount) {
+    this.totalCount = totalCount;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("totalCount")
+  public Integer getTotalCount() {
+    return totalCount;
+  }
+  public void setTotalCount(Integer totalCount) {
+    this.totalCount = totalCount;
+  }
+
+  /**
+   **/
+  public InlineResponse2001 items(List<DCAEService> items) {
+    this.items = items;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("items")
+  public List<DCAEService> getItems() {
+    return items;
+  }
+  public void setItems(List<DCAEService> items) {
+    this.items = items;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse2001 inlineResponse2001 = (InlineResponse2001) o;
+    return Objects.equals(links, inlineResponse2001.links) &&
+        Objects.equals(totalCount, inlineResponse2001.totalCount) &&
+        Objects.equals(items, inlineResponse2001.items);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(links, totalCount, items);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse2001 {\n");
+    
+    sb.append("    links: ").append(toIndentedString(links)).append("\n");
+    sb.append("    totalCount: ").append(toIndentedString(totalCount)).append("\n");
+    sb.append("    items: ").append(toIndentedString(items)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/src/gen/java/io/swagger/model/InlineResponse200Links.java b/src/gen/java/io/swagger/model/InlineResponse200Links.java
new file mode 100644
index 0000000..bff7254
--- /dev/null
+++ b/src/gen/java/io/swagger/model/InlineResponse200Links.java
@@ -0,0 +1,117 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import javax.ws.rs.core.Link;
+
+
+
+/**
+ * Pagination links
+ **/
+
+@ApiModel(description = "Pagination links")
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class InlineResponse200Links   {
+  
+  private Link previousLink = null;
+  private Link nextLink = null;
+
+  /**
+   **/
+  public InlineResponse200Links previousLink(Link previousLink) {
+    this.previousLink = previousLink;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("previousLink")
+  public Link getPreviousLink() {
+    return previousLink;
+  }
+  public void setPreviousLink(Link previousLink) {
+    this.previousLink = previousLink;
+  }
+
+  /**
+   **/
+  public InlineResponse200Links nextLink(Link nextLink) {
+    this.nextLink = nextLink;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("nextLink")
+  public Link getNextLink() {
+    return nextLink;
+  }
+  public void setNextLink(Link nextLink) {
+    this.nextLink = nextLink;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    InlineResponse200Links inlineResponse200Links = (InlineResponse200Links) o;
+    return Objects.equals(previousLink, inlineResponse200Links.previousLink) &&
+        Objects.equals(nextLink, inlineResponse200Links.nextLink);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(previousLink, nextLink);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class InlineResponse200Links {\n");
+    
+    sb.append("    previousLink: ").append(toIndentedString(previousLink)).append("\n");
+    sb.append("    nextLink: ").append(toIndentedString(nextLink)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+
diff --git a/src/gen/java/io/swagger/model/Link.java b/src/gen/java/io/swagger/model/Link.java
new file mode 100644
index 0000000..3c69b26
--- /dev/null
+++ b/src/gen/java/io/swagger/model/Link.java
@@ -0,0 +1,133 @@
+/*-
+ * ============LICENSE_START=======================================================
+ * dcae-inventory
+ * ================================================================================
+ * Copyright (C) 2017 AT&T Intellectual Property. All rights reserved.
+ * ================================================================================
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ============LICENSE_END=========================================================
+ */
+
+package io.swagger.model;
+
+import java.util.Objects;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+
+
+
+
+
+@javax.annotation.Generated(value = "class io.swagger.codegen.languages.JavaJerseyServerCodegen", date = "2016-04-18T20:16:22.119Z")
+public class Link   {
+  
+  private String title = null;
+  private String rel = null;
+  private String href = null;
+
+  /**
+   **/
+  public Link title(String title) {
+    this.title = title;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("title")
+  public String getTitle() {
+    return title;
+  }
+  public void setTitle(String title) {
+    this.title = title;
+  }
+
+  /**
+   **/
+  public Link rel(String rel) {
+    this.rel = rel;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("rel")
+  public String getRel() {
+    return rel;
+  }
+  public void setRel(String rel) {
+    this.rel = rel;
+  }
+
+  /**
+   **/
+  public Link href(String href) {
+    this.href = href;
+    return this;
+  }
+
+  
+  @ApiModelProperty(value = "")
+  @JsonProperty("href")
+  public String getHref() {
+    return href;
+  }
+  public void setHref(String href) {
+    this.href = href;
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    Link link = (Link) o;
+    return Objects.equals(title, link.title) &&
+        Objects.equals(rel, link.rel) &&
+        Objects.equals(href, link.href);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(title, rel, href);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class Link {\n");
+    
+    sb.append("    title: ").append(toIndentedString(title)).append("\n");
+    sb.append("    rel: ").append(toIndentedString(rel)).append("\n");
+    sb.append("    href: ").append(toIndentedString(href)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+}
+