<artifactId>catalog-mgr</artifactId>\r
<name>openo/commontosca/catalog/catalog-mgr</name>\r
<packaging>jar</packaging>\r
+ <properties>\r
+ <httpclient.version>4.4.1</httpclient.version>\r
+ </properties>\r
\r
<build>\r
<plugins>\r
<scope>test</scope>\r
</dependency>\r
<!-- UT end -->\r
+ <!-- httpclient-->\r
+ <dependency>\r
+ <groupId>org.apache.httpcomponents</groupId>\r
+ <artifactId>httpclient</artifactId>\r
+ <version>${httpclient.version}</version>\r
+ <exclusions>\r
+ <!-- provided by jcl-over-slf4j to enable logging via logback -->\r
+ <exclusion>\r
+ <groupId>commons-logging</groupId>\r
+ <artifactId>commons-logging</artifactId>\r
+ </exclusion>\r
+ </exclusions>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.httpcomponents</groupId>\r
+ <artifactId>httpcore</artifactId>\r
+ <version>${httpclient.version}</version>\r
+ </dependency>\r
+ <dependency>\r
+ <groupId>org.apache.httpcomponents</groupId>\r
+ <artifactId>httpmime</artifactId>\r
+ <version>${httpclient.version}</version>\r
+ </dependency>\r
</dependencies>\r
</project>\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog;\r
\r
+import com.fasterxml.jackson.annotation.JsonInclude;\r
+\r
import io.dropwizard.Application;\r
import io.dropwizard.assets.AssetsBundle;\r
import io.dropwizard.db.DataSourceFactory;\r
import io.swagger.jaxrs.config.BeanConfig;\r
import io.swagger.jaxrs.listing.ApiListingResource;\r
\r
-import java.util.EnumSet;\r
-\r
-import javax.servlet.DispatcherType;\r
-\r
import org.eclipse.jetty.servlets.CrossOriginFilter;\r
import org.glassfish.jersey.media.multipart.MultiPartFeature;\r
import org.openo.commontosca.catalog.common.Config;\r
+import org.openo.commontosca.catalog.common.HttpServerAddrConfig;\r
+import org.openo.commontosca.catalog.common.HttpServerPathConfig;\r
import org.openo.commontosca.catalog.common.MsbAddrConfig;\r
import org.openo.commontosca.catalog.common.ServiceRegistrer;\r
+import org.openo.commontosca.catalog.db.dao.DaoManager;\r
+import org.openo.commontosca.catalog.db.entity.NodeTemplateData;\r
+import org.openo.commontosca.catalog.db.entity.PackageData;\r
import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;\r
import org.openo.commontosca.catalog.db.entity.ServiceTemplateMappingData;\r
import org.openo.commontosca.catalog.health.ConsoleHealthCheck;\r
import org.openo.commontosca.catalog.resources.PackageResource;\r
import org.openo.commontosca.catalog.resources.TemplateResource;\r
-import org.openo.commontosca.catalog.common.HttpServerAddrConfig;\r
-import org.openo.commontosca.catalog.common.HttpServerPathConfig;\r
-import org.openo.commontosca.catalog.db.dao.DaoManager;\r
-import org.openo.commontosca.catalog.db.entity.NodeTemplateData;\r
-import org.openo.commontosca.catalog.db.entity.PackageData;\r
+\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-import com.fasterxml.jackson.annotation.JsonInclude;\r
+import java.util.EnumSet;\r
+import javax.servlet.DispatcherType;\r
+\r
\r
public class CatalogApp extends Application<CatalogAppConfiguration> {\r
\r
- private static final Logger LOGGER = LoggerFactory.getLogger(CatalogApp.class);\r
-\r
- public static void main(String[] args) throws Exception {\r
- new CatalogApp().run(args);\r
- }\r
-\r
- @Override\r
- public String getName() {\r
- return "OPENO-Catalog";\r
- }\r
-\r
- private final HibernateBundle<CatalogAppConfiguration> bundle =\r
- new HibernateBundle<CatalogAppConfiguration>(ServiceTemplateData.class,\r
- PackageData.class, NodeTemplateData.class, ServiceTemplateMappingData.class) {\r
- @Override\r
- public DataSourceFactory getDataSourceFactory(CatalogAppConfiguration configuration) {\r
- return configuration.getDataSourceFactory();\r
- }\r
- };\r
-\r
- @Override\r
- public void initialize(Bootstrap<CatalogAppConfiguration> bootstrap) {\r
- bootstrap.addBundle(new AssetsBundle("/api-doc", "/api-doc", "index.html", "api-doc"));\r
- initDB(bootstrap);\r
- }\r
-\r
- private void initDao() {\r
- DaoManager.getInstance().setSessionFactory(bundle.getSessionFactory());\r
- }\r
-\r
- private void initDB(Bootstrap<CatalogAppConfiguration> bootstrap) {\r
- bootstrap.addBundle(bundle);\r
- bootstrap.addBundle(new MigrationsBundle<CatalogAppConfiguration>() {\r
- @Override\r
- public DataSourceFactory getDataSourceFactory(CatalogAppConfiguration configuration) {\r
- return configuration.getDataSourceFactory();\r
- }\r
- });\r
- }\r
-\r
- @Override\r
- public void run(CatalogAppConfiguration configuration, Environment environment) {\r
- LOGGER.info("Start to initialize catalogue.");\r
- MsbAddrConfig.setMsbAddress(configuration.getMsbServerAddr());\r
- HttpServerAddrConfig.setHttpServerAddress(configuration.getHttpServerAddr());\r
- HttpServerPathConfig.setHttpServerPath(configuration.getHttpServerPath());\r
- initDao();\r
- final ConsoleHealthCheck healthCheck = new ConsoleHealthCheck(configuration.getTemplate());\r
- environment.healthChecks().register("template", healthCheck);\r
-\r
- environment.jersey().register(new PackageResource());\r
- environment.jersey().register(new TemplateResource());\r
- // environment.jersey().register(new VNFHostImageResource());\r
- // environment.jersey().register(new VNFSoftwareVersionResource());\r
-\r
- // register rest interface\r
- environment.jersey().packages("org.openo.commontosca.catalog.resources");\r
- // upload file by inputstream need to register MultiPartFeature\r
- environment.jersey().register(MultiPartFeature.class);\r
-\r
- initSwaggerConfig(environment, configuration);\r
- initCometd(environment);\r
- Config.setConfigration(configuration);\r
- initService();\r
- LOGGER.info("Initialize catalogue finished.");\r
- }\r
-\r
- /**\r
- * initialize swagger configuration.\r
- * \r
- * @param environment environment information\r
- * @param configuration catalogue configuration\r
- */\r
- private void initSwaggerConfig(Environment environment, CatalogAppConfiguration configuration) {\r
- environment.jersey().register(new ApiListingResource());\r
- environment.getObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);\r
-\r
- BeanConfig config = new BeanConfig();\r
- config.setTitle("Open-o Catalog Service rest API");\r
- config.setVersion("1.0.0");\r
- config.setResourcePackage("org.openo.commontosca.catalog.resources");\r
- // set rest api basepath in swagger\r
- SimpleServerFactory simpleServerFactory =\r
- (SimpleServerFactory) configuration.getServerFactory();\r
- String basePath = simpleServerFactory.getApplicationContextPath();\r
- String rootPath = simpleServerFactory.getJerseyRootPath();\r
- rootPath = rootPath.substring(0, rootPath.indexOf("/*"));\r
- basePath =\r
- basePath.equals("/") ? rootPath : (new StringBuilder()).append(basePath)\r
- .append(rootPath).toString();\r
- config.setBasePath(basePath);\r
- config.setScan(true);\r
- }\r
- private void initService()\r
- {\r
- Thread registerCatalogService=new Thread(new ServiceRegistrer());\r
- registerCatalogService.setName("register catalog service to Microservice Bus");\r
- registerCatalogService.start();\r
- }\r
- /**\r
- * initialize cometd server.\r
- * \r
- * @param environment environment information\r
- */\r
- private void initCometd(Environment environment) {\r
- environment.getApplicationContext().addFilter(CrossOriginFilter.class,\r
- "/api/nsoccataloguenotification/v1/*",\r
- EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR));// add\r
- // filter\r
- environment\r
- .getApplicationContext()\r
- .addServlet("org.cometd.server.CometDServlet",\r
- "/api/nsoccataloguenotification/v1/*").setInitOrder(1);// add\r
- // servlet\r
- environment\r
- .getApplicationContext()\r
- .addServlet("CometdServlet",\r
- "/api/nsoccataloguenotification/v1").setInitOrder(2);// add\r
- // servlet\r
- }\r
+ private static final Logger LOGGER = LoggerFactory.getLogger(CatalogApp.class);\r
+\r
+ public static void main(String[] args) throws Exception {\r
+ new CatalogApp().run(args);\r
+ }\r
+\r
+ @Override\r
+ public String getName() {\r
+ return "OPENO-Catalog";\r
+ }\r
+\r
+ private final HibernateBundle<CatalogAppConfiguration> bundle =\r
+ new HibernateBundle<CatalogAppConfiguration>(ServiceTemplateData.class, PackageData.class,\r
+ NodeTemplateData.class, ServiceTemplateMappingData.class) {\r
+ @Override\r
+ public DataSourceFactory getDataSourceFactory(CatalogAppConfiguration configuration) {\r
+ return configuration.getDataSourceFactory();\r
+ }\r
+ };\r
+\r
+ @Override\r
+ public void initialize(Bootstrap<CatalogAppConfiguration> bootstrap) {\r
+ bootstrap.addBundle(new AssetsBundle("/api-doc", "/api-doc", "index.html", "api-doc"));\r
+ initDb(bootstrap);\r
+ }\r
+\r
+ private void initDao() {\r
+ DaoManager.getInstance().setSessionFactory(bundle.getSessionFactory());\r
+ }\r
+\r
+ private void initDb(Bootstrap<CatalogAppConfiguration> bootstrap) {\r
+ bootstrap.addBundle(bundle);\r
+ bootstrap.addBundle(new MigrationsBundle<CatalogAppConfiguration>() {\r
+ @Override\r
+ public DataSourceFactory getDataSourceFactory(CatalogAppConfiguration configuration) {\r
+ return configuration.getDataSourceFactory();\r
+ }\r
+ });\r
+ }\r
+\r
+ @Override\r
+ public void run(CatalogAppConfiguration configuration, Environment environment) {\r
+ LOGGER.info("Start to initialize catalogue.");\r
+ MsbAddrConfig.setMsbAddress(configuration.getMsbServerAddr());\r
+ HttpServerAddrConfig.setHttpServerAddress(configuration.getHttpServerAddr());\r
+ HttpServerPathConfig.setHttpServerPath(configuration.getHttpServerPath());\r
+ initDao();\r
+ final ConsoleHealthCheck healthCheck = new ConsoleHealthCheck(configuration.getTemplate());\r
+ environment.healthChecks().register("template", healthCheck);\r
+\r
+ environment.jersey().register(new PackageResource());\r
+ environment.jersey().register(new TemplateResource());\r
+ // environment.jersey().register(new VNFHostImageResource());\r
+ // environment.jersey().register(new VNFSoftwareVersionResource());\r
+\r
+ // register rest interface\r
+ environment.jersey().packages("org.openo.commontosca.catalog.resources");\r
+ // upload file by inputstream need to register MultiPartFeature\r
+ environment.jersey().register(MultiPartFeature.class);\r
+\r
+ initSwaggerConfig(environment, configuration);\r
+ initCometd(environment);\r
+ Config.setConfigration(configuration);\r
+ initService();\r
+ LOGGER.info("Initialize catalogue finished.");\r
+ }\r
+\r
+ /**\r
+ * initialize swagger configuration.\r
+ * \r
+ * @param environment environment information\r
+ * @param configuration catalogue configuration\r
+ */\r
+ private void initSwaggerConfig(Environment environment, CatalogAppConfiguration configuration) {\r
+ environment.jersey().register(new ApiListingResource());\r
+ environment.getObjectMapper().setSerializationInclusion(JsonInclude.Include.NON_NULL);\r
+\r
+ BeanConfig config = new BeanConfig();\r
+ config.setTitle("Open-o Catalog Service rest API");\r
+ config.setVersion("1.0.0");\r
+ config.setResourcePackage("org.openo.commontosca.catalog.resources");\r
+ // set rest api basepath in swagger\r
+ SimpleServerFactory simpleServerFactory =\r
+ (SimpleServerFactory) configuration.getServerFactory();\r
+ String basePath = simpleServerFactory.getApplicationContextPath();\r
+ String rootPath = simpleServerFactory.getJerseyRootPath();\r
+ rootPath = rootPath.substring(0, rootPath.indexOf("/*"));\r
+ basePath =\r
+ basePath.equals("/") ? rootPath : (new StringBuilder()).append(basePath).append(rootPath)\r
+ .toString();\r
+ config.setBasePath(basePath);\r
+ config.setScan(true);\r
+ }\r
+\r
+ private void initService() {\r
+ Thread registerCatalogService = new Thread(new ServiceRegistrer());\r
+ registerCatalogService.setName("register catalog service to Microservice Bus");\r
+ registerCatalogService.start();\r
+ }\r
+\r
+ /**\r
+ * initialize cometd server.\r
+ * \r
+ * @param environment environment information\r
+ */\r
+ private void initCometd(Environment environment) {\r
+ // add filter\r
+ environment.getApplicationContext().addFilter(CrossOriginFilter.class,\r
+ "/api/nsoccataloguenotification/v1/*",\r
+ EnumSet.of(DispatcherType.REQUEST, DispatcherType.ERROR));\r
+ // add servlet\r
+ environment.getApplicationContext()\r
+ .addServlet("org.cometd.server.CometDServlet", "/api/nsoccataloguenotification/v1/*")\r
+ .setInitOrder(1);\r
+ // add servlet\r
+ environment.getApplicationContext()\r
+ .addServlet("CometdServlet", "/api/nsoccataloguenotification/v1").setInitOrder(2);\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog;\r
\r
+import com.fasterxml.jackson.annotation.JsonProperty;\r
+import io.dropwizard.Configuration;\r
+import io.dropwizard.db.DataSourceFactory;\r
+import org.hibernate.validator.constraints.NotEmpty;\r
+\r
import javax.validation.Valid;\r
import javax.validation.constraints.NotNull;\r
\r
-import org.hibernate.validator.constraints.NotEmpty;\r
-\r
-import com.fasterxml.jackson.annotation.JsonProperty;\r
\r
-import io.dropwizard.Configuration;\r
-import io.dropwizard.db.DataSourceFactory;\r
\r
\r
public class CatalogAppConfiguration extends Configuration {\r
- @NotEmpty\r
- private String template;\r
-\r
- @NotEmpty\r
- private String defaultName = "OPENO-Catalog";\r
-\r
- @NotEmpty\r
- private String msbServerAddr;\r
-\r
- @NotEmpty\r
- private String httpServerAddr;\r
-\r
- @NotEmpty\r
- private String opentoscaServerAddr;\r
-\r
- @NotEmpty\r
- private String yamlParseAddr;\r
-\r
- @NotEmpty\r
- private String cataloguePath;\r
- @NotEmpty\r
- private String httpServerPath;\r
- @NotEmpty\r
- private String ldapServerIp;\r
-\r
- @NotEmpty\r
- private String ldapServerPort;\r
-\r
- @NotEmpty\r
- private String ldapLogindn;\r
-\r
- @NotEmpty\r
- private String ldapPassword;\r
-\r
- @NotEmpty\r
- private String ldapVersion;\r
- @Valid\r
- @NotNull\r
- private DataSourceFactory database = new DataSourceFactory();\r
-\r
- @JsonProperty("database")\r
- public DataSourceFactory getDataSourceFactory() {\r
- return database;\r
- }\r
-\r
- @JsonProperty("database")\r
- public void setDataSourceFactory(DataSourceFactory dataSourceFactory) {\r
- this.database = dataSourceFactory;\r
- }\r
-\r
- @JsonProperty\r
- public String getTemplate() {\r
- return template;\r
- }\r
-\r
- @JsonProperty\r
- public void setTemplate(String template) {\r
- this.template = template;\r
- }\r
-\r
- @JsonProperty\r
- public String getDefaultName() {\r
- return defaultName;\r
- }\r
-\r
- @JsonProperty\r
- public void setDefaultName(String name) {\r
- this.defaultName = name;\r
- }\r
-\r
- @JsonProperty\r
- public String getMsbServerAddr() {\r
- return msbServerAddr;\r
- }\r
-\r
- @JsonProperty\r
- public void setMsbServerAddr(String msbServerAddr) {\r
- this.msbServerAddr = msbServerAddr;\r
- }\r
-\r
- @JsonProperty\r
- public String getHttpServerAddr() {\r
- return httpServerAddr;\r
- }\r
-\r
- @JsonProperty\r
- public void setHttpServerAddr(String httpServerAddr) {\r
- this.httpServerAddr = httpServerAddr;\r
- }\r
-\r
- @JsonProperty\r
- public String getOpentoscaServerAddr() {\r
- return opentoscaServerAddr;\r
- }\r
-\r
- @JsonProperty\r
- public void setOpentoscaServerAddr(String opentoscaServerAddr) {\r
- this.opentoscaServerAddr = opentoscaServerAddr;\r
- }\r
-\r
- @JsonProperty\r
- public String getYamlParseAddr() {\r
- return yamlParseAddr;\r
- }\r
-\r
- @JsonProperty\r
- public void setYamlParseAddr(String yamlParseAddr) {\r
- this.yamlParseAddr = yamlParseAddr;\r
- }\r
-\r
- @JsonProperty\r
- public String getCataloguePath() {\r
- return cataloguePath;\r
- }\r
-\r
- @JsonProperty\r
- public void setCataloguePath(String cataloguePath) {\r
- this.cataloguePath = cataloguePath;\r
- }\r
-\r
- @JsonProperty\r
- public String getLdapServerIp() {\r
- return ldapServerIp;\r
- }\r
-\r
- @JsonProperty\r
- public void setLdapServerIp(String ldapServerIp) {\r
- this.ldapServerIp = ldapServerIp;\r
- }\r
-\r
- @JsonProperty\r
- public String getLdapServerPort() {\r
- return ldapServerPort;\r
- }\r
-\r
- @JsonProperty\r
- public void setLdapServerPort(String ldapServerPort) {\r
- this.ldapServerPort = ldapServerPort;\r
- }\r
-\r
- @JsonProperty\r
- public String getLdapLogindn() {\r
- return ldapLogindn;\r
- }\r
-\r
- @JsonProperty\r
- public void setLdapLogindn(String ldapLogindn) {\r
- this.ldapLogindn = ldapLogindn;\r
- }\r
-\r
- @JsonProperty\r
- public String getLdapPassword() {\r
- return ldapPassword;\r
- }\r
-\r
- @JsonProperty\r
- public void setLdapPassword(String ldapPassword) {\r
- this.ldapPassword = ldapPassword;\r
- }\r
-\r
- @JsonProperty\r
- public String getLdapVersion() {\r
- return ldapVersion;\r
- }\r
-\r
- @JsonProperty\r
- public void setLdapVersion(String ldapVersion) {\r
- this.ldapVersion = ldapVersion;\r
- }\r
-\r
- @JsonProperty\r
- public String getHttpServerPath() {\r
- return httpServerPath;\r
- }\r
-\r
- @JsonProperty\r
- public void setHttpServerPath(String httpServerPath) {\r
- this.httpServerPath = httpServerPath;\r
- }\r
+ @NotEmpty\r
+ private String template;\r
+\r
+ @NotEmpty\r
+ private String defaultName = "OPENO-Catalog";\r
+\r
+ @NotEmpty\r
+ private String msbServerAddr;\r
+\r
+ @NotEmpty\r
+ private String httpServerAddr;\r
+\r
+ @NotEmpty\r
+ private String opentoscaServerAddr;\r
+\r
+ @NotEmpty\r
+ private String yamlParseAddr;\r
+\r
+ @NotEmpty\r
+ private String wso2HostIp;\r
+\r
+ @NotEmpty\r
+ private String wso2HostPort;\r
+\r
+ @NotEmpty\r
+ private String cataloguePath;\r
+ @NotEmpty\r
+ private String httpServerPath;\r
+ @NotEmpty\r
+ private String ldapServerIp;\r
+\r
+ @NotEmpty\r
+ private String ldapServerPort;\r
+\r
+ @NotEmpty\r
+ private String ldapLogindn;\r
+\r
+ @NotEmpty\r
+ private String ldapPassword;\r
+\r
+ @NotEmpty\r
+ private String ldapVersion;\r
+ @Valid\r
+ @NotNull\r
+ private DataSourceFactory database = new DataSourceFactory();\r
+\r
+ @JsonProperty("database")\r
+ public DataSourceFactory getDataSourceFactory() {\r
+ return database;\r
+ }\r
+\r
+ @JsonProperty("database")\r
+ public void setDataSourceFactory(DataSourceFactory dataSourceFactory) {\r
+ this.database = dataSourceFactory;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getTemplate() {\r
+ return template;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setTemplate(String template) {\r
+ this.template = template;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getDefaultName() {\r
+ return defaultName;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setDefaultName(String name) {\r
+ this.defaultName = name;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getMsbServerAddr() {\r
+ return msbServerAddr;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setMsbServerAddr(String msbServerAddr) {\r
+ this.msbServerAddr = msbServerAddr;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getHttpServerAddr() {\r
+ return httpServerAddr;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setHttpServerAddr(String httpServerAddr) {\r
+ this.httpServerAddr = httpServerAddr;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getOpentoscaServerAddr() {\r
+ return opentoscaServerAddr;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setOpentoscaServerAddr(String opentoscaServerAddr) {\r
+ this.opentoscaServerAddr = opentoscaServerAddr;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getYamlParseAddr() {\r
+ return yamlParseAddr;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setYamlParseAddr(String yamlParseAddr) {\r
+ this.yamlParseAddr = yamlParseAddr;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getWso2HostIp() {\r
+ return wso2HostIp;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setWso2HostIp(String wso2HostIp) {\r
+ this.wso2HostIp = wso2HostIp;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getWso2HostPort() {\r
+ return wso2HostPort;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setWso2HostPort(String wso2HostPort) {\r
+ this.wso2HostPort = wso2HostPort;\r
+ }\r
+\r
+ public String getWso2BaseUrl() {\r
+ return "http://" + this.wso2HostIp + ":" + this.wso2HostPort;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getCataloguePath() {\r
+ return cataloguePath;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setCataloguePath(String cataloguePath) {\r
+ this.cataloguePath = cataloguePath;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getLdapServerIp() {\r
+ return ldapServerIp;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setLdapServerIp(String ldapServerIp) {\r
+ this.ldapServerIp = ldapServerIp;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getLdapServerPort() {\r
+ return ldapServerPort;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setLdapServerPort(String ldapServerPort) {\r
+ this.ldapServerPort = ldapServerPort;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getLdapLogindn() {\r
+ return ldapLogindn;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setLdapLogindn(String ldapLogindn) {\r
+ this.ldapLogindn = ldapLogindn;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getLdapPassword() {\r
+ return ldapPassword;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setLdapPassword(String ldapPassword) {\r
+ this.ldapPassword = ldapPassword;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getLdapVersion() {\r
+ return ldapVersion;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setLdapVersion(String ldapVersion) {\r
+ this.ldapVersion = ldapVersion;\r
+ }\r
+\r
+ @JsonProperty\r
+ public String getHttpServerPath() {\r
+ return httpServerPath;\r
+ }\r
+\r
+ @JsonProperty\r
+ public void setHttpServerPath(String httpServerPath) {\r
+ this.httpServerPath = httpServerPath;\r
+ }\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.cometd;\r
\r
-/**\r
- * @author 10189609\r
- * \r
- */\r
+\r
public class CometdException extends Exception {\r
- private static final long serialVersionUID = 497640895744777904L;\r
-\r
- public static final int ERROR_CODE_BAYEUX = 0;\r
- public static final int ERROR_CODE_PRARM_ERROR = 1;\r
- public static final int ERROR_CODE_SESSION_ERROR = 2;\r
- public static final int ERROR_CODE_SUBSCRIBE_TIMEOUT = 3;\r
-\r
- private int errorCode = -1;\r
-\r
- public CometdException(String message) {\r
- super(message);\r
- }\r
-\r
- public CometdException(Throwable e) {\r
- super(e);\r
- }\r
-\r
- public CometdException(int code, String message) {\r
- super(message);\r
- this.errorCode = code;\r
- }\r
-\r
- public int getErrorCode() {\r
- return this.errorCode;\r
- }\r
-\r
- @Override\r
- public String toString() {\r
- String s = getClass().getName();\r
- String message = getLocalizedMessage();\r
- message = (message != null) ? (s + ": " + message) : s;\r
- return "errorcode: " + this.errorCode + ";" + message;\r
- }\r
+ private static final long serialVersionUID = 497640895744777904L;\r
+\r
+ public static final int ERROR_CODE_BAYEUX = 0;\r
+ public static final int ERROR_CODE_PRARM_ERROR = 1;\r
+ public static final int ERROR_CODE_SESSION_ERROR = 2;\r
+ public static final int ERROR_CODE_SUBSCRIBE_TIMEOUT = 3;\r
+\r
+ private int errorCode = -1;\r
+\r
+ public CometdException(String message) {\r
+ super(message);\r
+ }\r
+\r
+ public CometdException(Throwable e1) {\r
+ super(e1);\r
+ }\r
+\r
+ public CometdException(int code, String message) {\r
+ super(message);\r
+ this.errorCode = code;\r
+ }\r
+\r
+ public int getErrorCode() {\r
+ return this.errorCode;\r
+ }\r
+\r
+ @Override\r
+ public String toString() {\r
+ String str = getClass().getName();\r
+ String message = getLocalizedMessage();\r
+ message = (message != null) ? (str + ": " + message) : str;\r
+ return "errorcode: " + this.errorCode + ";" + message;\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.cometd;\r
\r
-import java.io.IOException;\r
+package org.openo.commontosca.catalog.cometd;\r
\r
import org.cometd.bayeux.server.BayeuxServer;\r
import org.cometd.bayeux.server.ConfigurableServerChannel;\r
import org.cometd.bayeux.server.LocalSession;\r
import org.cometd.bayeux.server.ServerChannel;\r
\r
-/**\r
- * @author 10189609\r
- * \r
- */\r
+import java.io.IOException;\r
+\r
public class CometdService {\r
- private BayeuxServer bayeux;\r
- private LocalSession session;\r
+ private BayeuxServer bayeux;\r
+ private LocalSession session;\r
\r
- /**\r
- * meta channel.\r
- */\r
- private static final String bayeuxChannel = "/meta/";\r
+ /**\r
+ * meta channel.\r
+ */\r
+ private static final String bayeuxChannel = "/meta/";\r
\r
- /**\r
- * service channel.\r
- */\r
- private static final String serviceChannel = "/service/";\r
+ /**\r
+ * service channel.\r
+ */\r
+ private static final String serviceChannel = "/service/";\r
\r
- private static CometdService cometdService = null;\r
+ private static CometdService cometdService = null;\r
\r
- public static CometdService getInstance() {\r
- if (cometdService == null) {\r
- cometdService = new CometdService();\r
- }\r
- return cometdService;\r
+ /**\r
+ * get cometd service instance.\r
+ * \r
+ * @return cometdService\r
+ */\r
+ public static CometdService getInstance() {\r
+ if (cometdService == null) {\r
+ cometdService = new CometdService();\r
}\r
+ return cometdService;\r
+ }\r
\r
- public void publish(String channel, Object message) throws CometdException {\r
- if (bayeux == null) {\r
- this.bayeux = CometdUtil.getBayeuxServer();\r
- checkBayeuxServer();\r
- this.session = this.bayeux.newLocalSession("openo_catalogue_local_session");\r
- this.session.handshake();\r
- }\r
- String jsonMsg;\r
- try {\r
- jsonMsg = CometdUtil.convertBean2Json(message);\r
- } catch (IOException e) {\r
- throw new CometdException(e);\r
- }\r
-\r
- checkAndInit(channel);\r
- ServerChannel serverChannel = this.bayeux.getChannel(channel);\r
- serverChannel.publish(this.session, jsonMsg);\r
+ /**\r
+ * publish commetd.\r
+ * @param channel commetd channel\r
+ * @param message message to commet\r
+ * @throws CometdException e1\r
+ */\r
+ public void publish(String channel, Object message) throws CometdException {\r
+ if (bayeux == null) {\r
+ this.bayeux = CometdUtil.getBayeuxServer();\r
+ checkBayeuxServer();\r
+ this.session = this.bayeux.newLocalSession("openo_catalogue_local_session");\r
+ this.session.handshake();\r
}\r
-\r
- private void checkBayeuxServer() throws CometdException {\r
- if (this.bayeux == null) {\r
- throw new CometdException(CometdException.ERROR_CODE_BAYEUX, "bayeux is null.");\r
- }\r
+ String jsonMsg;\r
+ try {\r
+ jsonMsg = CometdUtil.convertBean2Json(message);\r
+ } catch (IOException e1) {\r
+ throw new CometdException(e1);\r
}\r
\r
- private void checkAndInit(String channel) throws CometdException {\r
- checkBayeuxServer();\r
- checkSession();\r
- checkChannel(channel);\r
- bayeux.createChannelIfAbsent(channel, new ConfigurableServerChannel.Initializer() {\r
- @Override\r
- public void configureChannel(ConfigurableServerChannel channel) {\r
- channel.setPersistent(true);\r
- channel.setLazy(true);\r
- }\r
- });\r
+ checkAndInit(channel);\r
+ ServerChannel serverChannel = this.bayeux.getChannel(channel);\r
+ serverChannel.publish(this.session, jsonMsg);\r
+ }\r
+\r
+ private void checkBayeuxServer() throws CometdException {\r
+ if (this.bayeux == null) {\r
+ throw new CometdException(CometdException.ERROR_CODE_BAYEUX, "bayeux is null.");\r
}\r
+ }\r
\r
- private void checkSession() throws CometdException {\r
- if (session == null || !session.isConnected()) {\r
- throw new CometdException(CometdException.ERROR_CODE_SESSION_ERROR,\r
- "session is invalid.");\r
- }\r
+ private void checkAndInit(String channel) throws CometdException {\r
+ checkBayeuxServer();\r
+ checkSession();\r
+ checkChannel(channel);\r
+ bayeux.createChannelIfAbsent(channel, new ConfigurableServerChannel.Initializer() {\r
+ @Override\r
+ public void configureChannel(ConfigurableServerChannel channel) {\r
+ channel.setPersistent(true);\r
+ channel.setLazy(true);\r
+ }\r
+ });\r
+ }\r
+\r
+ private void checkSession() throws CometdException {\r
+ if (session == null || !session.isConnected()) {\r
+ throw new CometdException(CometdException.ERROR_CODE_SESSION_ERROR, "session is invalid.");\r
}\r
+ }\r
\r
- private void checkChannel(String channel) throws CometdException {\r
- if (channel == null || "".equals(channel)) {\r
- throw new CometdException(CometdException.ERROR_CODE_PRARM_ERROR, "channel is null.");\r
- }\r
- if (channel.startsWith(bayeuxChannel)) {\r
- throw new CometdException(CometdException.ERROR_CODE_PRARM_ERROR, "channel [" + channel\r
- + "] is bayeuxChannel.");\r
- }\r
- if (channel.startsWith(serviceChannel)) {\r
- throw new CometdException(CometdException.ERROR_CODE_PRARM_ERROR, "channel [" + channel\r
- + "] is serviceChannel.");\r
- }\r
+ private void checkChannel(String channel) throws CometdException {\r
+ if (channel == null || "".equals(channel)) {\r
+ throw new CometdException(CometdException.ERROR_CODE_PRARM_ERROR, "channel is null.");\r
+ }\r
+ if (channel.startsWith(bayeuxChannel)) {\r
+ throw new CometdException(CometdException.ERROR_CODE_PRARM_ERROR, "channel [" + channel\r
+ + "] is bayeuxChannel.");\r
+ }\r
+ if (channel.startsWith(serviceChannel)) {\r
+ throw new CometdException(CometdException.ERROR_CODE_PRARM_ERROR, "channel [" + channel\r
+ + "] is serviceChannel.");\r
}\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.cometd;\r
-\r
-import java.io.IOException;\r
\r
-import javax.servlet.GenericServlet;\r
-import javax.servlet.ServletException;\r
-import javax.servlet.ServletRequest;\r
-import javax.servlet.ServletResponse;\r
-import javax.servlet.UnavailableException;\r
-import javax.servlet.http.HttpServletResponse;\r
+package org.openo.commontosca.catalog.cometd;\r
\r
import org.cometd.annotation.Listener;\r
import org.cometd.annotation.ServerAnnotationProcessor;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-/**\r
- * @author 10189609\r
- * \r
- */\r
+import java.io.IOException;\r
+\r
+import javax.servlet.GenericServlet;\r
+import javax.servlet.ServletException;\r
+import javax.servlet.ServletRequest;\r
+import javax.servlet.ServletResponse;\r
+import javax.servlet.UnavailableException;\r
+import javax.servlet.http.HttpServletResponse;\r
+\r
+\r
+\r
public class CometdServlet extends GenericServlet {\r
\r
- private static final long serialVersionUID = 1L;\r
+ private static final long serialVersionUID = 1L;\r
\r
- private static final Logger logger = LoggerFactory.getLogger(CometdServlet.class);\r
+ private static final Logger logger = LoggerFactory.getLogger(CometdServlet.class);\r
+\r
+ @Override\r
+ public void init() throws ServletException {\r
+ super.init();\r
+\r
+ final BayeuxServer bayeux =\r
+ (BayeuxServer) getServletContext().getAttribute(BayeuxServer.ATTRIBUTE);\r
+ if (bayeux == null) {\r
+ throw new UnavailableException("No BayeuxServer!");\r
+ }\r
\r
- @Override\r
- public void init() throws ServletException {\r
- super.init();\r
+ // Allow anybody to handshake\r
+ bayeux.getChannel(ServerChannel.META_HANDSHAKE).addAuthorizer(GrantAuthorizer.GRANT_PUBLISH);\r
\r
- final BayeuxServer bayeux =\r
- (BayeuxServer) getServletContext().getAttribute(BayeuxServer.ATTRIBUTE);\r
- if (bayeux == null) {\r
- throw new UnavailableException("No BayeuxServer!");\r
- }\r
+ // start server processor\r
+ ServerAnnotationProcessor processor = new ServerAnnotationProcessor(bayeux);\r
+ processor.process(new Monitor());\r
\r
- // Allow anybody to handshake\r
- bayeux.getChannel(ServerChannel.META_HANDSHAKE)\r
- .addAuthorizer(GrantAuthorizer.GRANT_PUBLISH);\r
+ CometdUtil.setBayeuxServer(bayeux);\r
+ }\r
\r
- // start server processor\r
- ServerAnnotationProcessor processor = new ServerAnnotationProcessor(bayeux);\r
- processor.process(new Monitor());\r
+ @Override\r
+ public void service(ServletRequest paramServletRequest, ServletResponse paramServletResponse)\r
+ throws ServletException, IOException {\r
+ ((HttpServletResponse) paramServletResponse).sendError(503);\r
+ }\r
\r
- CometdUtil.setBayeuxServer(bayeux);\r
+ @Service("monitor")\r
+ public static class Monitor {\r
+ @Listener("/meta/subscribe")\r
+ public void monitorSubscribe(ServerSession session, ServerMessage message) {\r
+ logger.info("Monitored subscribe from " + session + " for "\r
+ + message.get(Message.SUBSCRIPTION_FIELD));\r
}\r
\r
- @Override\r
- public void service(ServletRequest paramServletRequest, ServletResponse paramServletResponse)\r
- throws ServletException, IOException {\r
- ((HttpServletResponse) paramServletResponse).sendError(503);\r
+ @Listener("/meta/unsubscribe")\r
+ public void monitorUnsubscribe(ServerSession session, ServerMessage message) {\r
+ logger.info("Monitored unsubscribe from " + session + " for "\r
+ + message.get(Message.SUBSCRIPTION_FIELD));\r
}\r
\r
- @Service("monitor")\r
- public static class Monitor {\r
- @Listener("/meta/subscribe")\r
- public void monitorSubscribe(ServerSession session, ServerMessage message) {\r
- logger.info("Monitored subscribe from " + session + " for "\r
- + message.get(Message.SUBSCRIPTION_FIELD));\r
- }\r
-\r
- @Listener("/meta/unsubscribe")\r
- public void monitorUnsubscribe(ServerSession session, ServerMessage message) {\r
- logger.info("Monitored unsubscribe from " + session + " for "\r
- + message.get(Message.SUBSCRIPTION_FIELD));\r
- }\r
-\r
- @Listener("/meta/*")\r
- public void monitorMeta(ServerSession session, ServerMessage message) {\r
- logger.debug(message.toString());\r
- }\r
+ @Listener("/meta/*")\r
+ public void monitorMeta(ServerSession session, ServerMessage message) {\r
+ logger.debug(message.toString());\r
}\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-/**\r
-* Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)\r
-*\r
-* Licensed under the Apache License, Version 2.0 (the "License");\r
-* you may not use this file except in compliance with the License.\r
-* You may obtain a copy of the License at\r
-*\r
-* http://www.apache.org/licenses/LICENSE-2.0\r
-*\r
-* Unless required by applicable law or agreed to in writing, software\r
-* distributed under the License is distributed on an "AS IS" BASIS,\r
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
-* See the License for the specific language governing permissions and\r
-* limitations under the License.\r
-*/\r
+\r
package org.openo.commontosca.catalog.cometd;\r
\r
+import com.fasterxml.jackson.databind.ObjectMapper;\r
+import org.cometd.bayeux.server.BayeuxServer;\r
+\r
import java.io.IOException;\r
import java.util.Map;\r
\r
-import org.cometd.bayeux.server.BayeuxServer;\r
\r
-import com.fasterxml.jackson.databind.ObjectMapper;\r
\r
-/**\r
- * @author 10189609\r
- *\r
- */\r
public class CometdUtil {\r
- private static BayeuxServer bayeuxServer;\r
+ private static BayeuxServer bayeuxServer;\r
+\r
+ public static BayeuxServer getBayeuxServer() {\r
+ return bayeuxServer;\r
+ }\r
+\r
+ public static void setBayeuxServer(BayeuxServer bayeuxServer) {\r
+ CometdUtil.bayeuxServer = bayeuxServer;\r
+ }\r
\r
- public static BayeuxServer getBayeuxServer() {\r
- return bayeuxServer;\r
- }\r
+ public static String convertBean2Json(Object object) throws IOException {\r
+ ObjectMapper mapper = new ObjectMapper();\r
+ return mapper.writeValueAsString(object);\r
+ }\r
\r
- public static void setBayeuxServer(BayeuxServer bayeuxServer) {\r
- CometdUtil.bayeuxServer = bayeuxServer;\r
- }\r
- \r
- public static String convertBean2Json(Object object) throws IOException {\r
- ObjectMapper mapper = new ObjectMapper();\r
- return mapper.writeValueAsString(object);\r
- }\r
- \r
- @SuppressWarnings("rawtypes")\r
- public static Map convertJson2Map(String json) throws IOException {\r
- ObjectMapper mapper = new ObjectMapper();\r
- return mapper.readValue(json, Map.class);\r
- }\r
+ @SuppressWarnings("rawtypes")\r
+ public static Map convertJson2Map(String json) throws IOException {\r
+ ObjectMapper mapper = new ObjectMapper();\r
+ return mapper.readValue(json, Map.class);\r
+ }\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.common;
public class CommonConstant {
+ // Package Status
+ public static final String PACKAGE_STATUS_DELETING = "deleting";
+ public static final String PACKAGE_STATUS_DELETE_FAIL = "deletefail";
- public final static String HTTP_HEADER_CONTENT_RANGE = "Content-Range";
-
- // Package Status
- public static final String PACKAGE_STATUS_DELETING = "deleting";
-
- public static final String PACKAGE_STATUS_DELETE_FAIL = "deletefail";
-
- public static final String PACKAGE_XML_FORMAT = "xml";
+ public static final String PACKAGE_XML_FORMAT = "xml";
- public final static String CATALOG_CSAR_DIR_NAME = "/csar";
- public static final String PACKAGE_YAML_FORMAT = "yaml";
+ public static final String PACKAGE_YAML_FORMAT = "yaml";
- // host image progress
+ // host image progress
- public static final String TOSCA_METADATA = "TOSCA-Metadata";
+ public static final String TOSCA_METADATA = "TOSCA-Metadata";
- public static final String CSAR_VERSION_META = "version";
+ public static final String CSAR_VERSION_META = "version";
- public static final String CSAR_TYPE_META = "type";
+ public static final String CSAR_TYPE_META = "type";
- public static final String CSAR_PROVIDER_META = "provider";
+ public static final String CSAR_PROVIDER_META = "provider";
- public static final String DEFINITIONS = "Definitions";
+ public static final String DEFINITIONS = "Definitions";
- public static final String CSAR_META = "csar.meta";
+ public static final String CSAR_META = "csar.meta";
- public static final String CSAR_SUFFIX = ".csar";
+ public static final String CSAR_SUFFIX = ".csar";
+ public static final String HTTP_HEADER_CONTENT_RANGE = "Content-Range";
+
+ public static final String CATALOG_CSAR_DIR_NAME = "/csar";
}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.common;\r
\r
import lombok.AllArgsConstructor;\r
import lombok.Data;\r
import lombok.NoArgsConstructor;\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
-\r
@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
public class CommonErrorResponse {\r
\r
- private String code;\r
+ private String code;\r
+\r
+ private String message;\r
\r
- private String message;\r
\r
- /**\r
- * @param message2\r
- * @return\r
- */\r
- public static Object failure(String message) {\r
- return message;\r
- }\r
+ public static Object failure(String message) {\r
+ return message;\r
+ }\r
\r
- public CommonErrorResponse(String message) {\r
- super();\r
- this.message = message;\r
- }\r
+ public CommonErrorResponse(String message) {\r
+ super();\r
+ this.message = message;\r
+ }\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.common;\r
\r
import org.openo.commontosca.catalog.CatalogAppConfiguration;\r
\r
\r
public class Config {\r
- private static CatalogAppConfiguration configration;\r
+ private static CatalogAppConfiguration configration;\r
\r
- public static CatalogAppConfiguration getConfigration() {\r
- return configration;\r
- }\r
+ public static CatalogAppConfiguration getConfigration() {\r
+ return configration;\r
+ }\r
\r
- public static void setConfigration(CatalogAppConfiguration config) {\r
- configration = config;\r
- }\r
+ public static void setConfigration(CatalogAppConfiguration config) {\r
+ configration = config;\r
+ }\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.common;
import java.text.SimpleDateFormat;
import java.util.Date;
public class DateTimeUtil {
- public static String getCurrentTime() {
- return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
- }
+ public static String getCurrentTime() {
+ return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(new Date());
+ }
- public static String getFormatTime(Date date) {
- return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(date);
- }
+ public static String getFormatTime(Date date) {
+ return new SimpleDateFormat("yyyy-MM-dd hh:mm:ss").format(date);
+ }
- public static String getFormatTime(Date date, String format) {
- return new SimpleDateFormat(format).format(date);
- }
+ public static String getFormatTime(Date date, String format) {
+ return new SimpleDateFormat(format).format(date);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.common;
public enum EnumUploadStatus {
- Create_Directory_Success, Create_Directory_Fail, File_Exist, Upload_From_Break_Success, Upload_From_Break_Failed, Upload_New_File_Success, Upload_New_File_Failed
+ Create_Directory_Success, Create_Directory_Fail, File_Exist,
+ Upload_From_Break_Success, Upload_From_Break_Failed, Upload_New_File_Success,
+ Upload_New_File_Failed
}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.common;\r
\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
+\r
import java.io.BufferedOutputStream;\r
import java.io.File;\r
import java.io.FileOutputStream;\r
import java.util.zip.ZipEntry;\r
import java.util.zip.ZipFile;\r
\r
-import org.slf4j.Logger;\r
-import org.slf4j.LoggerFactory;\r
\r
public final class FileUtil {\r
\r
- public static final Logger LOG = LoggerFactory.getLogger(FileUtil.class);\r
+ public static final Logger LOG = LoggerFactory.getLogger(FileUtil.class);\r
\r
- private static final int BUFFER_SIZE = 2 * 1024 * 1024;\r
+ private static final int BUFFER_SIZE = 2 * 1024 * 1024;\r
\r
- private static final int TRY_COUNT = 3;\r
+ private static final int TRY_COUNT = 3;\r
\r
- private FileUtil() {\r
+ private FileUtil() {\r
\r
- }\r
+ }\r
\r
- /**\r
- * create dir\r
- * \r
- * @param dir\r
- */\r
- public static boolean createDirectory(String dir) {\r
- File folder = new File(dir);\r
- int tryCount = 0;\r
- while (tryCount < TRY_COUNT) {\r
- tryCount++;\r
- if (!folder.exists() && !folder.mkdirs()) {\r
- continue;\r
- } else {\r
- return true;\r
- }\r
- }\r
\r
- return folder.exists();\r
+ /**\r
+ * create dir.\r
+ * @param dir dir to create\r
+ * @return boolean\r
+ */\r
+ public static boolean createDirectory(String dir) {\r
+ File folder = new File(dir);\r
+ int tryCount = 0;\r
+ while (tryCount < TRY_COUNT) {\r
+ tryCount++;\r
+ if (!folder.exists() && !folder.mkdirs()) {\r
+ continue;\r
+ } else {\r
+ return true;\r
+ }\r
}\r
\r
- public static boolean deleteFile(File file) {\r
- String hintInfo = file.isDirectory() ? "dir " : "file ";\r
- boolean isFileDeleted = file.delete();\r
- boolean isFileExist = file.exists();\r
- if (!isFileExist) {\r
- if (isFileDeleted) {\r
- LOG.info("delete " + hintInfo + file.getAbsolutePath());\r
- } else {\r
- isFileDeleted = true;\r
- LOG.info("file not exist. no need delete " + hintInfo + file.getAbsolutePath());\r
- }\r
- } else {\r
- LOG.info("fail to delete " + hintInfo + file.getAbsolutePath());\r
- }\r
- return isFileDeleted;\r
+ return folder.exists();\r
+ }\r
+\r
+ /**\r
+ * delete file.\r
+ * @param file the file to delete\r
+ * @return boolean\r
+ */\r
+ public static boolean deleteFile(File file) {\r
+ String hintInfo = file.isDirectory() ? "dir " : "file ";\r
+ boolean isFileDeleted = file.delete();\r
+ boolean isFileExist = file.exists();\r
+ if (!isFileExist) {\r
+ if (isFileDeleted) {\r
+ LOG.info("delete " + hintInfo + file.getAbsolutePath());\r
+ } else {\r
+ isFileDeleted = true;\r
+ LOG.info("file not exist. no need delete " + hintInfo + file.getAbsolutePath());\r
+ }\r
+ } else {\r
+ LOG.info("fail to delete " + hintInfo + file.getAbsolutePath());\r
}\r
-\r
- /**\r
- * unzip zip file\r
- * \r
- * @param zipFileName\r
- * @param unzip dir\r
- * @throws IOException\r
- */\r
- public static ArrayList<String> unzip(String zipFileName, String extPlace) throws IOException {\r
- ZipFile zipFile = null;\r
- ArrayList<String> unzipFileNams = new ArrayList<String>();\r
-\r
+ return isFileDeleted;\r
+ }\r
+\r
+\r
+ /**\r
+ * unzip zip file.\r
+ * @param zipFileName file name to zip\r
+ * @param extPlace extPlace\r
+ * @return unzip file name\r
+ * @throws IOException e1\r
+ */\r
+ public static ArrayList<String> unzip(String zipFileName, String extPlace) throws IOException {\r
+ ZipFile zipFile = null;\r
+ ArrayList<String> unzipFileNams = new ArrayList<String>();\r
+\r
+ try {\r
+ zipFile = new ZipFile(zipFileName);\r
+ Enumeration<?> fileEn = zipFile.entries();\r
+ byte[] buffer = new byte[BUFFER_SIZE];\r
+\r
+ while (fileEn.hasMoreElements()) {\r
+ InputStream input = null;\r
+ BufferedOutputStream bos = null;\r
try {\r
- zipFile = new ZipFile(zipFileName);\r
- Enumeration<?> fileEn = zipFile.entries();\r
- byte[] buffer = new byte[BUFFER_SIZE];\r
-\r
- while (fileEn.hasMoreElements()) {\r
- InputStream input = null;\r
- BufferedOutputStream bos = null;\r
- try {\r
- ZipEntry entry = (ZipEntry) fileEn.nextElement();\r
- if (entry.isDirectory()) {\r
- continue;\r
- }\r
-\r
- input = zipFile.getInputStream(entry);\r
- File file = new File(extPlace, entry.getName());\r
- if (!file.getParentFile().exists()) {\r
- createDirectory(file.getParentFile().getAbsolutePath());\r
- }\r
-\r
- bos = new BufferedOutputStream(new FileOutputStream(file));\r
- while (true) {\r
- int length = input.read(buffer);\r
- if (length == -1) {\r
- break;\r
- }\r
- bos.write(buffer, 0, length);\r
- }\r
- unzipFileNams.add(file.getAbsolutePath());\r
- } finally {\r
- closeOutputStream(bos);\r
- closeInputStream(input);\r
- }\r
+ ZipEntry entry = (ZipEntry) fileEn.nextElement();\r
+ if (entry.isDirectory()) {\r
+ continue;\r
+ }\r
+\r
+ input = zipFile.getInputStream(entry);\r
+ File file = new File(extPlace, entry.getName());\r
+ if (!file.getParentFile().exists()) {\r
+ createDirectory(file.getParentFile().getAbsolutePath());\r
+ }\r
+\r
+ bos = new BufferedOutputStream(new FileOutputStream(file));\r
+ while (true) {\r
+ int length = input.read(buffer);\r
+ if (length == -1) {\r
+ break;\r
}\r
+ bos.write(buffer, 0, length);\r
+ }\r
+ unzipFileNams.add(file.getAbsolutePath());\r
} finally {\r
- closeZipFile(zipFile);\r
+ closeOutputStream(bos);\r
+ closeInputStream(input);\r
}\r
- return unzipFileNams;\r
+ }\r
+ } finally {\r
+ closeZipFile(zipFile);\r
}\r
-\r
- /**\r
- * close InputStream\r
- * \r
- * @param inputStream\r
- */\r
- private static void closeInputStream(InputStream inputStream) {\r
- try {\r
- if (inputStream != null) {\r
- inputStream.close();\r
- }\r
- } catch (Exception e) {\r
- LOG.info("close InputStream error!");\r
- }\r
+ return unzipFileNams;\r
+ }\r
+\r
+ /**\r
+ * close InputStream.\r
+ * \r
+ * @param inputStream the inputstream to close\r
+ */\r
+ private static void closeInputStream(InputStream inputStream) {\r
+ try {\r
+ if (inputStream != null) {\r
+ inputStream.close();\r
+ }\r
+ } catch (Exception e1) {\r
+ LOG.info("close InputStream error!");\r
}\r
-\r
- /**\r
- * close OutputStream\r
- * \r
- * @param outputStream\r
- */\r
- private static void closeOutputStream(OutputStream outputStream) {\r
- try {\r
- if (outputStream != null) {\r
- outputStream.close();\r
- }\r
- } catch (Exception e) {\r
- LOG.info("close OutputStream error!");\r
- }\r
+ }\r
+\r
+ /**\r
+ * close OutputStream.\r
+ * \r
+ * @param outputStream the output stream to close\r
+ */\r
+ private static void closeOutputStream(OutputStream outputStream) {\r
+ try {\r
+ if (outputStream != null) {\r
+ outputStream.close();\r
+ }\r
+ } catch (Exception e1) {\r
+ LOG.info("close OutputStream error!");\r
}\r
-\r
- /**\r
- * close zipFile\r
- * \r
- * @param zipFile\r
- */\r
- private static void closeZipFile(ZipFile zipFile) {\r
- try {\r
- if (zipFile != null) {\r
- zipFile.close();\r
- zipFile = null;\r
- }\r
- } catch (IOException e) {\r
- LOG.info("close ZipFile error!");\r
- }\r
+ }\r
+\r
+ /**\r
+ * close zipFile.\r
+ * \r
+ * @param zipFile the zipFile to close\r
+ */\r
+ private static void closeZipFile(ZipFile zipFile) {\r
+ try {\r
+ if (zipFile != null) {\r
+ zipFile.close();\r
+ zipFile = null;\r
+ }\r
+ } catch (IOException e1) {\r
+ LOG.info("close ZipFile error!");\r
}\r
+ }\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.common;
+import org.apache.commons.net.ftp.FTP;
+import org.apache.commons.net.ftp.FTPClient;
+import org.apache.commons.net.ftp.FTPFile;
+import org.apache.commons.net.ftp.FTPReply;
+
import java.io.FileOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.apache.commons.net.ftp.FTP;
-import org.apache.commons.net.ftp.FTPClient;
-import org.apache.commons.net.ftp.FTPFile;
-import org.apache.commons.net.ftp.FTPReply;
+
/**
- * FTP client user for upload or delete files in ftp client
+ * FTP client user for upload or delete files in ftp client.
*/
public class FtpClient {
- private FTPClient ftpClient;
+ private FTPClient ftpClient;
- public static final String ZIP = ".zip";
+ public static final String ZIP = ".zip";
- public FtpClient(String host, String username, String password, int port) throws Exception {
- ftpClient = new FTPClient();
- connect(host, username, password, port);
- }
+ public FtpClient(String host, String username, String password, int port) throws Exception {
+ ftpClient = new FTPClient();
+ connect(host, username, password, port);
+ }
- private void connect(String host, String user, String pwd, int port) throws Exception {
- ftpClient.connect(host, port);
- if (!FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
- ftpClient.disconnect();
- throw new Exception("Exception in connecting to FTP Server");
- }
- ftpClient.login(user, pwd);
- ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
- ftpClient.enterLocalPassiveMode();
+ private void connect(String host, String user, String pwd, int port) throws Exception {
+ ftpClient.connect(host, port);
+ if (!FTPReply.isPositiveCompletion(ftpClient.getReplyCode())) {
+ ftpClient.disconnect();
+ throw new Exception("Exception in connecting to FTP Server");
}
-
- public void disconnect() throws Exception {
- if (this.ftpClient.isConnected()) {
- this.ftpClient.logout();
- this.ftpClient.disconnect();
- }
+ ftpClient.login(user, pwd);
+ ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
+ ftpClient.enterLocalPassiveMode();
+ }
+
+ /**
+ * disconnect to ftp.
+ * @throws Exception e
+ */
+ public void disconnect() throws Exception {
+ if (this.ftpClient.isConnected()) {
+ this.ftpClient.logout();
+ this.ftpClient.disconnect();
}
-
- public void get(String remoteFilePath, String localFilePath) throws IOException {
- FileOutputStream fos = new FileOutputStream(localFilePath);
- this.ftpClient.retrieveFile(remoteFilePath, fos);
- fos.close();
+ }
+
+ /**
+ * get remote file.
+ * @param remoteFilePath remote file path
+ * @param localFilePath local file path
+ * @throws IOException e
+ */
+ public void get(String remoteFilePath, String localFilePath) throws IOException {
+ FileOutputStream fos = new FileOutputStream(localFilePath);
+ this.ftpClient.retrieveFile(remoteFilePath, fos);
+ fos.close();
+ }
+
+ public void delete(String filePath) throws IOException {
+ ftpClient.dele(filePath);
+ }
+
+
+ /**
+ * upload a file to FTP client. support resuming.
+ * @param startPosition start position to upload
+ * @param endPosition end position of upload
+ * @param inputstream upload inputstream
+ * @param remote remote path
+ * @return enum
+ * @throws IOException e
+ */
+ public EnumUploadStatus upload(int startPosition, int endPosition, InputStream inputstream,
+ String remote) throws IOException {
+ // set transfer mode: PassiveMode
+ ftpClient.enterLocalPassiveMode();
+ // set transfer file type: binary
+ ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
+ ftpClient.setControlEncoding("GBK");
+ String remoteFileName = remote;
+ if (remote.contains("/")) {
+ remoteFileName = remote.substring(remote.lastIndexOf("/") + 1);
+ if (createDirecroty(remote, ftpClient) == EnumUploadStatus.Create_Directory_Fail) {
+ return EnumUploadStatus.Create_Directory_Fail;
+ }
}
- public void delete(String filePath) throws IOException {
- ftpClient.dele(filePath);
+ long lstartPos = 0;
+ FTPFile[] files = ftpClient.listFiles(new String(remoteFileName.getBytes("GBK"), "iso-8859-1"));
+ if (files.length == 1) {
+ lstartPos = files[0].getSize();
+ }
+ if (lstartPos > endPosition) {
+ return EnumUploadStatus.File_Exist;
+ }
+ if (lstartPos < startPosition) {
+ lstartPos = startPosition;
+ } else if (lstartPos > startPosition && lstartPos < endPosition) {
+ lstartPos = startPosition;
}
- /**
- * upload a file to FTP client. support resuming
- *
- * @param local
- * @param remote
- * @return
- * @throws IOException
- */
- public EnumUploadStatus upload(int startPosition, int endPosition, InputStream inputstream,
- String remote) throws IOException {
- // set transfer mode: PassiveMode
- ftpClient.enterLocalPassiveMode();
- // set transfer file type: binary
- ftpClient.setFileType(FTP.BINARY_FILE_TYPE);
- ftpClient.setControlEncoding("GBK");
- String remoteFileName = remote;
- if (remote.contains("/")) {
- remoteFileName = remote.substring(remote.lastIndexOf("/") + 1);
- if (CreateDirecroty(remote, ftpClient) == EnumUploadStatus.Create_Directory_Fail) {
- return EnumUploadStatus.Create_Directory_Fail;
- }
- }
-
- long lStartPos = 0;
- FTPFile[] files =
- ftpClient.listFiles(new String(remoteFileName.getBytes("GBK"), "iso-8859-1"));
- if (files.length == 1) {
- lStartPos = files[0].getSize();
- }
- if (lStartPos > endPosition) {
- return EnumUploadStatus.File_Exist;
- }
- if (lStartPos < startPosition) {
- lStartPos = startPosition;
- } else if (lStartPos > startPosition && lStartPos < endPosition) {
- lStartPos = startPosition;
+ return uploadFile(remoteFileName, inputstream, ftpClient, lstartPos);
+ }
+
+ /**
+ * Create a remote server directory recursively.
+ *
+ * @param remote remote directory
+ * @param ftpClient ftpclient
+ * @return enum
+ * @throws IOException e
+ */
+ public EnumUploadStatus createDirecroty(String remote, FTPClient ftpClient) throws IOException {
+ String directory = remote.substring(0, remote.lastIndexOf("/") + 1);
+ if (!directory.equalsIgnoreCase("/")
+ && !ftpClient.changeWorkingDirectory(new String(directory.getBytes("GBK"), "iso-8859-1"))) {
+ int start = 0;
+ int end = 0;
+ if (directory.startsWith("/")) {
+ start = 1;
+ } else {
+ start = 0;
+ }
+ end = directory.indexOf("/", start);
+ while (true) {
+ String subDirectory =
+ new String(remote.substring(start, end).getBytes("GBK"), "iso-8859-1");
+ if (!ftpClient.changeWorkingDirectory(subDirectory)) {
+ if (ftpClient.makeDirectory(subDirectory)) {
+ ftpClient.changeWorkingDirectory(subDirectory);
+ } else {
+ return EnumUploadStatus.Create_Directory_Fail;
+ }
}
- return uploadFile(remoteFileName, inputstream, ftpClient, lStartPos);
- }
+ start = end + 1;
+ end = directory.indexOf("/", start);
- /**
- * Create a remote server directory recursively
- *
- * @param remote
- * @param ftpClient
- * @return
- * @throws IOException
- */
- public EnumUploadStatus CreateDirecroty(String remote, FTPClient ftpClient) throws IOException {
- String directory = remote.substring(0, remote.lastIndexOf("/") + 1);
- if (!directory.equalsIgnoreCase("/")
- && !ftpClient.changeWorkingDirectory(new String(directory.getBytes("GBK"),
- "iso-8859-1"))) {
- int start = 0;
- int end = 0;
- if (directory.startsWith("/")) {
- start = 1;
- } else {
- start = 0;
- }
- end = directory.indexOf("/", start);
- while (true) {
- String subDirectory =
- new String(remote.substring(start, end).getBytes("GBK"), "iso-8859-1");
- if (!ftpClient.changeWorkingDirectory(subDirectory)) {
- if (ftpClient.makeDirectory(subDirectory)) {
- ftpClient.changeWorkingDirectory(subDirectory);
- } else {
- return EnumUploadStatus.Create_Directory_Fail;
- }
- }
-
- start = end + 1;
- end = directory.indexOf("/", start);
-
- // check whether all directories are created or not
- if (end <= start) {
- break;
- }
- }
+ // check whether all directories are created or not
+ if (end <= start) {
+ break;
}
- return EnumUploadStatus.Create_Directory_Success;
+ }
}
-
- /**
- * upload file to client
- *
- * @param remoteFile remote file name
- * @param localFile local file name, including absolute path
- * @param ftpClient FTPClient class
- * @param lStartPos starting position
- * @return
- * @throws IOException
- */
- public EnumUploadStatus uploadFile(String remoteFile, InputStream inputstream,
- FTPClient ftpClient, long lStartPos) throws IOException {
- OutputStream out =
- ftpClient.appendFileStream(new String(remoteFile.getBytes("GBK"), "iso-8859-1"));
- if (out == null) {
- out = ftpClient.storeFileStream(new String(remoteFile.getBytes("GBK"), "iso-8859-1"));
- }
- if (lStartPos > 0) {
- ftpClient.setRestartOffset(lStartPos);
- }
- byte[] bytes = new byte[512];
- int c;
- while ((c = inputstream.read(bytes, 0, 512)) > 0) {
- out.write(bytes, 0, c);
- }
- out.flush();
- out.close();
- boolean result = ftpClient.completePendingCommand();
- if (lStartPos > 0) {
- return result ? EnumUploadStatus.Upload_From_Break_Success
- : EnumUploadStatus.Upload_From_Break_Failed;
- } else {
- return result ? EnumUploadStatus.Upload_New_File_Success
- : EnumUploadStatus.Upload_New_File_Failed;
- }
+ return EnumUploadStatus.Create_Directory_Success;
+ }
+
+ /**
+ * upload file to client.
+ *
+ * @param remoteFile remote file name
+ * @param localFile local file name including absolute path
+ * @param ftpClient FTPClient class
+ * @param lStartPos starting position
+ * @return enum
+ * @throws IOException e
+ */
+ /**
+ * upload file to client.
+ * @param remoteFile remote file name
+ * @param inputstream inputstream to upload file
+ * @param ftpClient ftp client
+ * @param lstartPos start position
+ * @return enum
+ * @throws IOException e
+ */
+ public EnumUploadStatus uploadFile(String remoteFile, InputStream inputstream,
+ FTPClient ftpClient, long lstartPos) throws IOException {
+ OutputStream out =
+ ftpClient.appendFileStream(new String(remoteFile.getBytes("GBK"), "iso-8859-1"));
+ if (out == null) {
+ out = ftpClient.storeFileStream(new String(remoteFile.getBytes("GBK"), "iso-8859-1"));
+ }
+ if (lstartPos > 0) {
+ ftpClient.setRestartOffset(lstartPos);
+ }
+ byte[] bytes = new byte[512];
+ int count;
+ while ((count = inputstream.read(bytes, 0, 512)) > 0) {
+ out.write(bytes, 0, count);
+ }
+ out.flush();
+ out.close();
+ boolean result = ftpClient.completePendingCommand();
+ if (lstartPos > 0) {
+ return result ? EnumUploadStatus.Upload_From_Break_Success
+ : EnumUploadStatus.Upload_From_Break_Failed;
+ } else {
+ return result ? EnumUploadStatus.Upload_New_File_Success
+ : EnumUploadStatus.Upload_New_File_Failed;
}
+ }
}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.common;\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
+\r
public class HttpServerAddrConfig {\r
\r
- protected static String httpServerAddress;\r
+ protected static String httpServerAddress;\r
\r
- public static String getHttpServerAddress() {\r
- return httpServerAddress;\r
- }\r
+ public static String getHttpServerAddress() {\r
+ return httpServerAddress;\r
+ }\r
\r
- public static void setHttpServerAddress(String httpServerAddress) {\r
- HttpServerAddrConfig.httpServerAddress = httpServerAddress;\r
- }\r
+ public static void setHttpServerAddress(String httpServerAddress) {\r
+ HttpServerAddrConfig.httpServerAddress = httpServerAddress;\r
+ }\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.common;\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
+\r
public class HttpServerPathConfig {\r
- protected static String httpServerPath;\r
+ protected static String httpServerPath;\r
\r
- public static String getHttpServerPath() {\r
- return httpServerPath;\r
- }\r
+ public static String getHttpServerPath() {\r
+ return httpServerPath;\r
+ }\r
\r
- public static void setHttpServerPath(String httpServerPath) {\r
- HttpServerPathConfig.httpServerPath = httpServerPath;\r
- }\r
+ public static void setHttpServerPath(String httpServerPath) {\r
+ HttpServerPathConfig.httpServerPath = httpServerPath;\r
+ }\r
}\r
+++ /dev/null
-/**\r
- * Copyright 2016 [ZTE] and others.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.openo.commontosca.catalog.common;\r
-\r
-/**\r
- * micro-service bus utility class;\r
- * \r
- * @author 10186401\r
- * \r
- */\r
-public class MSBUtil {\r
-\r
- public static String getRocBaseUrl() {\r
- return Config.getConfigration().getMsbServerAddr() + getRocApiRootDomain();\r
- }\r
-\r
- private static String getRocApiRootDomain() {\r
- return "/api/roc/v1";\r
- }\r
-\r
- public static String getNsocLifecycleBaseUrl() {\r
- return Config.getConfigration().getMsbServerAddr() + getNsocLifeCycleRootDomain();\r
- }\r
-\r
- private static String getNsocLifeCycleRootDomain() {\r
- return "/api/nsoc/v1";\r
- }\r
-\r
- public static String getVimBaseUrl() {\r
- return Config.getConfigration().getMsbServerAddr() + getVimRootDomain();\r
- }\r
-\r
- private static String getVimRootDomain() {\r
- return "/api/vim/v1";\r
- }\r
-\r
- public static String getPackageUrl() {\r
- return Config.getConfigration().getMsbServerAddr() + "/api/nsoc/v1/csar/";\r
- }\r
-\r
- public static String getYamlParseBaseUrl() {\r
- return Config.getConfigration().getYamlParseAddr() + "/api/yamlparser/v1";\r
- }\r
-}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.common;\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
public class MsbAddrConfig {\r
\r
- protected static String msbAddress;\r
+ protected static String msbAddress;\r
\r
- public static String getMsbAddress() {\r
- return msbAddress;\r
- }\r
+ public static String getMsbAddress() {\r
+ return msbAddress;\r
+ }\r
\r
- public static void setMsbAddress(String msbAddress) {\r
- MsbAddrConfig.msbAddress = msbAddress;\r
- }\r
+ public static void setMsbAddress(String msbAddress) {\r
+ MsbAddrConfig.msbAddress = msbAddress;\r
+ }\r
\r
}\r
--- /dev/null
+/**\r
+ * Copyright 2016 [ZTE] and others.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.openo.commontosca.catalog.common;\r
+\r
+/**\r
+ * micro-service bus utility class.\r
+ * \r
+ */\r
+public class MsbUtil {\r
+\r
+ public static String getRocBaseUrl() {\r
+ return Config.getConfigration().getMsbServerAddr() + getRocApiRootDomain();\r
+ }\r
+\r
+ private static String getRocApiRootDomain() {\r
+ return "/api/roc/v1";\r
+ }\r
+\r
+ public static String getNsocLifecycleBaseUrl() {\r
+ return Config.getConfigration().getMsbServerAddr() + getNsocLifeCycleRootDomain();\r
+ }\r
+\r
+ private static String getNsocLifeCycleRootDomain() {\r
+ return "/api/nsoc/v1";\r
+ }\r
+\r
+ public static String getVimBaseUrl() {\r
+ return Config.getConfigration().getMsbServerAddr() + getVimRootDomain();\r
+ }\r
+\r
+ private static String getVimRootDomain() {\r
+ return "/api/vim/v1";\r
+ }\r
+\r
+ public static String getPackageUrl() {\r
+ return Config.getConfigration().getMsbServerAddr() + "/api/nsoc/v1/csar/";\r
+ }\r
+\r
+ public static String getYamlParseBaseUrl() {\r
+ return Config.getConfigration().getYamlParseAddr() + "/api/yamlparser/v1";\r
+ }\r
+}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.common;\r
\r
import javax.ws.rs.core.Response;\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
+\r
public class RestUtil {\r
- /**\r
- * @param e\r
- * @return\r
- */\r
- public static Response getRestException(String errorMsg) {\r
- String code = "001";\r
- return Response.status(Response.Status.INTERNAL_SERVER_ERROR)\r
- .entity(new CommonErrorResponse(code, errorMsg)).build();\r
- }\r
+\r
+ /**\r
+ * get rest exception.\r
+ * @param errorMsg error message\r
+ * @return Response\r
+ */\r
+ public static Response getRestException(String errorMsg) {\r
+ String code = "001";\r
+ return Response.status(Response.Status.INTERNAL_SERVER_ERROR)\r
+ .entity(new CommonErrorResponse(code, errorMsg)).build();\r
+ }\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.common;\r
-\r
-\r
\r
-import java.util.ArrayList;\r
-import java.util.Iterator;\r
+package org.openo.commontosca.catalog.common;\r
\r
import org.openo.commontosca.catalog.externalservice.msb.MicroserviceBusConsumer;\r
import org.openo.commontosca.catalog.externalservice.msb.ServiceRegisterEntity;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-/**\r
- * @author 10159474\r
- *\r
- */\r
-public class ServiceRegistrer implements Runnable {\r
- private final ArrayList<ServiceRegisterEntity> serviceEntityList =\r
- new ArrayList<ServiceRegisterEntity>();\r
- private static final Logger LOG = LoggerFactory.getLogger(ServiceRegistrer.class);\r
+import java.util.ArrayList;\r
+import java.util.Iterator;\r
\r
- public ServiceRegistrer() {\r
- initServiceEntity();\r
- }\r
+public class ServiceRegistrer implements Runnable {\r
+ private final ArrayList<ServiceRegisterEntity> serviceEntityList =\r
+ new ArrayList<ServiceRegisterEntity>();\r
+ private static final Logger LOG = LoggerFactory.getLogger(ServiceRegistrer.class);\r
\r
- @Override\r
- public void run() {\r
- LOG.info("start microservice register");\r
- boolean flag = false;\r
- ServiceRegisterEntity entity = new ServiceRegisterEntity();\r
- int retry = 0;\r
- while (retry < 1000 && serviceEntityList.size() > 0) {\r
- Iterator<ServiceRegisterEntity> it = serviceEntityList.iterator();\r
- while (it.hasNext()) {\r
- entity = it.next();\r
- LOG.info("start" + entity.getServiceName() + " catalog microservice register.retry:"\r
- + retry);\r
- flag = MicroserviceBusConsumer.registerService(entity);\r
- if (flag == false) {\r
- LOG.warn(entity.getServiceName()\r
- + " microservice register failed, sleep 30S and try again.");\r
- ThreadSleep(30000);\r
- } else {\r
- LOG.info(entity.getServiceName() + " microservice register success!");\r
- it.remove();\r
- }\r
- }\r
- retry++;\r
+ public ServiceRegistrer() {\r
+ initServiceEntity();\r
+ }\r
\r
+ @Override\r
+ public void run() {\r
+ LOG.info("start microservice register");\r
+ boolean flag = false;\r
+ ServiceRegisterEntity entity = new ServiceRegisterEntity();\r
+ int retry = 0;\r
+ while (retry < 1000 && serviceEntityList.size() > 0) {\r
+ Iterator<ServiceRegisterEntity> it = serviceEntityList.iterator();\r
+ while (it.hasNext()) {\r
+ entity = it.next();\r
+ LOG.info("start" + entity.getServiceName() + " catalog microservice register.retry:"\r
+ + retry);\r
+ flag = MicroserviceBusConsumer.registerService(entity);\r
+ if (flag == false) {\r
+ LOG.warn(entity.getServiceName()\r
+ + " microservice register failed, sleep 30S and try again.");\r
+ threadSleep(30000);\r
+ } else {\r
+ LOG.info(entity.getServiceName() + " microservice register success!");\r
+ it.remove();\r
}\r
- LOG.info("catalog microservice register end.");\r
+ }\r
+ retry++;\r
\r
}\r
+ LOG.info("catalog microservice register end.");\r
\r
- private void ThreadSleep(int second) {\r
- LOG.info("start sleep ....");\r
- try {\r
- Thread.sleep(second);\r
- } catch (InterruptedException e) {\r
- LOG.error("thread sleep error.errorMsg:" + e.getMessage());\r
- }\r
- LOG.info("sleep end .");\r
- }\r
+ }\r
\r
- private void initServiceEntity() {\r
- ServiceRegisterEntity catalogEntity = new ServiceRegisterEntity();\r
- catalogEntity.setServiceName("catalog");\r
- catalogEntity.setProtocol("REST");\r
- catalogEntity.setVersion("v1");\r
- catalogEntity.setUrl("/openoapi/catalog/v1");\r
- catalogEntity.setSingleNode(null, "8200", 0);\r
- catalogEntity.setVisualRange("1");\r
- serviceEntityList.add(catalogEntity);\r
- ServiceRegisterEntity httpServiceEntity = new ServiceRegisterEntity();\r
- httpServiceEntity.setServiceName("/files/catalog-http");\r
- httpServiceEntity.setProtocol("REST");\r
- httpServiceEntity.setVersion("v1");\r
- httpServiceEntity.setUrl("/");\r
- httpServiceEntity.setSingleNode(null, "8201", 0);\r
- httpServiceEntity.setVisualRange("1");\r
- serviceEntityList.add(httpServiceEntity);\r
+ /**\r
+ * sleep thread.\r
+ * @param second sleep second\r
+ */\r
+ private void threadSleep(int seconds) {\r
+ LOG.info("start sleep ....");\r
+ try {\r
+ Thread.sleep(seconds);\r
+ } catch (InterruptedException e1) {\r
+ LOG.error("thread sleep error.errorMsg:" + e1.getMessage());\r
}\r
+ LOG.info("sleep end .");\r
+ }\r
+\r
+ private void initServiceEntity() {\r
+ ServiceRegisterEntity catalogEntity = new ServiceRegisterEntity();\r
+ catalogEntity.setServiceName("catalog");\r
+ catalogEntity.setProtocol("REST");\r
+ catalogEntity.setVersion("v1");\r
+ catalogEntity.setUrl("/openoapi/catalog/v1");\r
+ catalogEntity.setSingleNode(null, "8200", 0);\r
+ catalogEntity.setVisualRange("1");\r
+ serviceEntityList.add(catalogEntity);\r
+ ServiceRegisterEntity httpServiceEntity = new ServiceRegisterEntity();\r
+ httpServiceEntity.setServiceName("/files/catalog-http");\r
+ httpServiceEntity.setProtocol("REST");\r
+ httpServiceEntity.setVersion("v1");\r
+ httpServiceEntity.setUrl("/");\r
+ httpServiceEntity.setSingleNode(null, "8201", 0);\r
+ httpServiceEntity.setVisualRange("1");\r
+ serviceEntityList.add(httpServiceEntity);\r
+ }\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.common;
+import com.google.gson.Gson;
+
+import org.openo.commontosca.catalog.model.common.EnumToscaNodeTypeDefinition;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
import java.util.Collection;
import java.util.UUID;
-import org.openo.commontosca.catalog.model.common.EnumToscaNodeTypeDefinition;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import com.google.gson.Gson;
/**
- * common utility class
- *
- * @author 10186401
+ * common utility class.
*
*/
public class ToolUtil {
- private static final Logger LOG = LoggerFactory.getLogger(ToolUtil.class);
+ private static final Logger LOG = LoggerFactory.getLogger(ToolUtil.class);
- public final static String CATALOGUE_CSAR_DIR_NAME = "csar";
+ public static final String CATALOGUE_CSAR_DIR_NAME = "csar";
- public final static String CATALOGUE_IMAGE_DIR_NAME = "image";
+ public static final String CATALOGUE_IMAGE_DIR_NAME = "image";
- public static final int FILE_PERCENT = 1024 * 1024; // 1M
-
- public static boolean isEmptyString(String val) {
- return val == null || "".equals(val);
- }
-
- public static boolean isTrimedEmptyString(String val) {
- return val == null || "".equals(val.trim());
- }
+ public static final int FILE_PERCENT = 1024 * 1024; // 1M
- public static boolean isTrimedEmptyArray(String[] val) {
- return val == null || val.length == 0;
- }
+ public static boolean isEmptyString(String val) {
+ return val == null || "".equals(val);
+ }
- public static String[] TrimedStringArray(String[] val) {
- if (isTrimedEmptyArray(val)) {
- return val;
- }
+ public static boolean isTrimedEmptyString(String val) {
+ return val == null || "".equals(val.trim());
+ }
- String[] rets = new String[val.length];
- for (int i = 0; i < val.length; i++) {
- rets[i] = val[i].trim();
- }
- return rets;
- }
+ public static boolean isTrimedEmptyArray(String[] val) {
+ return val == null || val.length == 0;
+ }
- public static boolean isEmptyCollection(Collection<?> coll) {
- return null == coll || coll.isEmpty();
+ /**
+ * trimed string.
+ *
+ * @param val string array to trim
+ * @return String[]
+ */
+ public static String[] trimedStringArray(String[] val) {
+ if (isTrimedEmptyArray(val)) {
+ return val;
}
- /**
- * store chunk file to local temp directory
- *
- * @param dirName
- * @param fileName
- * @param uploadedInputStream
- * @return
- * @throws IOException
- */
- public static String storeChunkFileInLocal(String dirName, String fileName,
- InputStream uploadedInputStream) throws IOException {
- File tmpDir = new File(dirName);
- LOG.info("tmpdir = " + File.separator + dirName);
- if (!tmpDir.exists()) {
- tmpDir.mkdirs();
- }
- File file = new File(tmpDir + File.separator + fileName);
- OutputStream os = null;
- try {
- int read = 0;
- byte[] bytes = new byte[1024];
- os = new FileOutputStream(file, true);
- while ((read = uploadedInputStream.read(bytes)) != -1) {
- os.write(bytes, 0, read);
- }
- os.flush();
- return file.getAbsolutePath();
- } finally {
- if (os != null) {
- os.close();
- }
- }
+ String[] rets = new String[val.length];
+ for (int i = 0; i < val.length; i++) {
+ rets[i] = val[i].trim();
}
-
- public static String getTempDir(String dirName, String fileName) {
- // File tmpDir = new File(File.separator + dirName);
- return Class.class.getClass().getResource("/").getPath() + dirName + File.separator + fileName.replace(".csar", "");
+ return rets;
+ }
+
+ public static boolean isEmptyCollection(Collection<?> coll) {
+ return null == coll || coll.isEmpty();
+ }
+
+ /**
+ * store chunk file to local temp directory.
+ *
+ * @param dirName directory name
+ * @param fileName file name
+ * @param uploadedInputStream upload input stream
+ * @return String
+ * @throws IOException e
+ */
+ public static String storeChunkFileInLocal(String dirName, String fileName,
+ InputStream uploadedInputStream) throws IOException {
+ File tmpDir = new File(dirName);
+ LOG.info("tmpdir = " + File.separator + dirName);
+ if (!tmpDir.exists()) {
+ tmpDir.mkdirs();
}
-
- public static String getUnzipDir(String dirName) {
- File tmpDir = new File(File.separator + dirName);
- return tmpDir.getAbsolutePath().replace(".csar", "");
+ File file = new File(tmpDir + File.separator + fileName);
+ OutputStream os = null;
+ try {
+ int read = 0;
+ byte[] bytes = new byte[1024];
+ os = new FileOutputStream(file, true);
+ while ((read = uploadedInputStream.read(bytes)) != -1) {
+ os.write(bytes, 0, read);
+ }
+ os.flush();
+ return file.getAbsolutePath();
+ } finally {
+ if (os != null) {
+ os.close();
+ }
}
-
- public static boolean deleteFile(String dirName, String fileName) {
- File tmpDir = new File(getCataloguePath() + File.separator + dirName);
- if (!tmpDir.exists()) {
- return true;
- }
- File file = new File(tmpDir.getAbsolutePath() + File.separator + fileName);
- if (file.exists()) {
- return file.delete();
- }
- return true;
+ }
+
+ /**
+ * get temp dirctory when upload package.
+ *
+ * @param dirName temp directory name
+ * @param fileName package name
+ * @return String
+ */
+ public static String getTempDir(String dirName, String fileName) {
+ // File tmpDir = new File(File.separator + dirName);
+ return Class.class.getClass().getResource("/").getPath() + dirName + File.separator
+ + fileName.replace(".csar", "");
+ }
+
+ public static String getUnzipDir(String dirName) {
+ File tmpDir = new File(File.separator + dirName);
+ return tmpDir.getAbsolutePath().replace(".csar", "");
+ }
+
+ /**
+ * delete file.
+ *
+ * @param dirName the directory of file
+ * @param fileName file name
+ * @return boolean
+ */
+ public static boolean deleteFile(String dirName, String fileName) {
+ File tmpDir = new File(getCataloguePath() + File.separator + dirName);
+ if (!tmpDir.exists()) {
+ return true;
}
-
- public static String getCataloguePath() {
- return Config.getConfigration().getCataloguePath();
+ File file = new File(tmpDir.getAbsolutePath() + File.separator + fileName);
+ if (file.exists()) {
+ return file.delete();
}
-
- public static String getCatalogueCsarPath() {
- return getCataloguePath() + File.separator + CATALOGUE_CSAR_DIR_NAME;
+ return true;
+ }
+
+ public static String getCataloguePath() {
+ return Config.getConfigration().getCataloguePath();
+ }
+
+ public static String getCatalogueCsarPath() {
+ return getCataloguePath() + File.separator + CATALOGUE_CSAR_DIR_NAME;
+ }
+
+ public static String getCatalogueImagePath() {
+ return getCataloguePath() + File.separator + CATALOGUE_IMAGE_DIR_NAME;
+ }
+
+ /**
+ * get file size.
+ *
+ * @param file file which to get the size
+ * @param fileUnit file unit
+ * @return String file size
+ */
+ public static String getFileSize(File file, int fileUnit) {
+ String fileSize = "";
+ DecimalFormat format = new DecimalFormat("#0.00");
+ if (file.exists()) {
+ fileSize = format.format((double) file.length() / fileUnit) + "M";
}
-
- public static String getCatalogueImagePath() {
- return getCataloguePath() + File.separator + CATALOGUE_IMAGE_DIR_NAME;
+ return fileSize;
+ }
+
+ public static String formatFileSize(double fileLength, int fileUnit) {
+ DecimalFormat format = new DecimalFormat("#0.00");
+ return format.format(fileLength / fileUnit) + "M";
+ }
+
+ /**
+ * get file size by content.
+ *
+ * @param contentRange content range
+ * @return String
+ */
+ public static String getFileSizeByContent(String contentRange) {
+ String size =
+ contentRange.substring(contentRange.indexOf("/") + 1, contentRange.length()).trim();
+ return formatFileSize(Double.parseDouble(size), FILE_PERCENT);
+ }
+
+ /**
+ * fix package format.
+ *
+ * @param csarId package ID
+ * @return String
+ */
+ public static String formatCsar(String csarId) {
+ String result = csarId;
+ if (csarId.indexOf(".csar") < 0) {
+ result += ".csar";
}
-
- public static String getFileSize(File file, int fileUnit) {
- String fileSize = "";
- DecimalFormat format = new DecimalFormat("#0.00");
- if (file.exists()) {
- fileSize = format.format((double) file.length() / fileUnit) + "M";
- }
- return fileSize;
+ return result;
+ }
+
+ /**
+ * judge the package format is xml or not.
+ *
+ * @param fileLocation package location
+ * @param unzipDir the directory where the package unzip to
+ * @return boolean
+ * @throws IOException e
+ */
+ public static boolean isXmlCsar(String fileLocation, String unzipDir) throws IOException {
+ String tempfolder = unzipDir;
+ ArrayList<String> unzipFiles = FileUtil.unzip(fileLocation, tempfolder);
+ if (unzipFiles.isEmpty()) {
+ return true;
}
-
- public static String formatFileSize(double fileLength, int fileUnit) {
- DecimalFormat format = new DecimalFormat("#0.00");
- return format.format(fileLength / fileUnit) + "M";
- }
-
- public static String getFileSizeByContent(String contentRange) {
- String size =
- contentRange.substring(contentRange.indexOf("/") + 1, contentRange.length()).trim();
- return formatFileSize(Double.parseDouble(size), FILE_PERCENT);
- }
-
- public static String formatCsar(String csarId) {
- String result = csarId;
- if (csarId.indexOf(".csar") < 0) {
- result += ".csar";
- }
- return result;
- }
-
- public static boolean isXMLCsar(String fileLocation, String unzipDir) throws IOException {
- String tempfolder = unzipDir;
- ArrayList<String> unzipFiles = FileUtil.unzip(fileLocation, tempfolder);
- if (unzipFiles.isEmpty()) {
- return true;
- }
- for (String unzipFile : unzipFiles) {
- if (isYamlFile(new File(unzipFile))) {
- return false;
- }
- }
- return true;
- }
-
-
- public static boolean deleteDir(File dir) {
- if (dir.isDirectory()) {
- String[] children = dir.list();
- for (int i = 0; i < children.length; i++) {
- boolean success = deleteDir(new File(dir, children[i]));
- if (!success) {
- return false;
- }
- }
- }
- return dir.delete();
- }
-
- // public static boolean unZipCsar(String fileLocation) throws IOException {
- // String tempfolder=System.getProperty("java.io.tmpdir");
- // ArrayList<String> unzipFiles = FileUtil.unzip(fileLocation, tempfolder);
- // if(unzipFiles.isEmpty()){
- // return true;
- // }
- // }
-
- public static boolean isYamlFile(File file) {
- if (!file.isDirectory() && file.getName().indexOf(".yaml") != -1) {
- return true;
- }
+ for (String unzipFile : unzipFiles) {
+ if (isYamlFile(new File(unzipFile))) {
return false;
+ }
}
-
- public static String removeCSARSuffix(String csarName) {
- return csarName.replaceAll(".csar", "");
- }
-
- public static String addCSARSuffix(String csarName) {
- if (csarName.indexOf(".csar") == -1) {
- return csarName + ".csar";
+ return true;
+ }
+
+
+ /**
+ * delete the file and file directory.
+ *
+ * @param dir file
+ * @return boolean
+ */
+ public static boolean deleteDir(File dir) {
+ if (dir.isDirectory()) {
+ String[] children = dir.list();
+ for (int i = 0; i < children.length; i++) {
+ boolean success = deleteDir(new File(dir, children[i]));
+ if (!success) {
+ return false;
}
- return csarName;
+ }
}
-
- public static boolean isVnfNodetype(String type) {
- if (type.toLowerCase().contains(EnumToscaNodeTypeDefinition.VNFC.getName().toLowerCase())) {
- return false;
- }
- return type.toLowerCase().contains(EnumToscaNodeTypeDefinition.VNF.getName().toLowerCase());
+ return dir.delete();
+ }
+
+ // public static boolean unZipCsar(String fileLocation) throws IOException {
+ // String tempfolder=System.getProperty("java.io.tmpdir");
+ // ArrayList<String> unzipFiles = FileUtil.unzip(fileLocation, tempfolder);
+ // if(unzipFiles.isEmpty()){
+ // return true;
+ // }
+ // }
+
+ /**
+ * judge the file's format is yaml or not.
+ *
+ * @param file file to judge
+ * @return boolean
+ */
+ public static boolean isYamlFile(File file) {
+ if (!file.isDirectory() && file.getName().indexOf(".yaml") != -1) {
+ return true;
}
-
- public static String processFileName(String fileName) {
- int index = fileName.indexOf(".zip");
- if (index == -1) {
- return fileName;
- }
-
- return addCSARSuffix(fileName.replaceAll(".zip", ""));
+ return false;
+ }
+
+ /**
+ * remove the csar suffix.
+ *
+ * @param csarName package name
+ * @return String
+ */
+ public static String removeCsarSuffix(String csarName) {
+ return csarName.replaceAll(".csar", "");
+ }
+
+ /**
+ * add the csar fuffix.
+ *
+ * @param csarName package name
+ * @return String
+ */
+ public static String addCsarSuffix(String csarName) {
+ if (csarName.indexOf(".csar") == -1) {
+ return csarName + ".csar";
}
-
- public static String objectToString(Object o) {
- if (o == null)
- return "";
- Gson gson = new Gson();
- String str = gson.toJson(o);
- return str;
+ return csarName;
+ }
+
+ /**
+ * judge whether the type is vnf node type.
+ *
+ * @param type type
+ * @return boolean
+ */
+ public static boolean isVnfNodetype(String type) {
+ if (type.toLowerCase().contains(EnumToscaNodeTypeDefinition.VNFC.getName().toLowerCase())) {
+ return false;
}
-
- public static String generateId() {
- return UUID.randomUUID().toString();
+ return type.toLowerCase().contains(EnumToscaNodeTypeDefinition.VNF.getName().toLowerCase());
+ }
+
+ /**
+ * process file name.
+ *
+ * @param fileName file's name
+ * @return String
+ */
+ public static String processFileName(String fileName) {
+ int index = fileName.indexOf(".zip");
+ if (index == -1) {
+ return fileName;
}
- public static String formatFileSize(long fileSize) {
- long kb = 1024;
- long mb = kb * 1024;
- long gb = mb * 1024;
-
- if (fileSize >= gb) {
- return String.format("%.1f GB", (float) fileSize / gb);
- } else if (fileSize >= mb) {
- float f = (float) fileSize / mb;
- return String.format(f > 100 ? "%.0f MB" : "%.1f MB", f);
- } else if (fileSize >= kb) {
- float f = (float) fileSize / kb;
- return String.format(f > 100 ? "%.0f KB" : "%.1f KB", f);
- } else
- return String.format("%d B", fileSize);
+ return addCsarSuffix(fileName.replaceAll(".zip", ""));
+ }
+
+ /**
+ * exchange object to string.
+ *
+ * @param obj object
+ * @return String
+ */
+ public static String objectToString(Object obj) {
+ if (obj == null) {
+ return "";
}
-
-
- /**
- *
- * @param jsonString
- * @param tClass
- * @return
- */
- public static <T> T fromJson(String jsonString, Class<T> tClass) {
- Gson gson = new Gson();
- return gson.fromJson(jsonString, tClass);
- }
-
- /**
- *
- * @param t
- * @return
- */
- public static <T> String toJson(T t) {
- Gson gson = new Gson();
- return gson.toJson(t);
+ Gson gson = new Gson();
+ String str = gson.toJson(obj);
+ return str;
+ }
+
+ public static String generateId() {
+ return UUID.randomUUID().toString();
+ }
+
+ /**
+ * get the size format according file size.
+ *
+ * @param fileSize file size
+ * @return size format
+ */
+ public static String getFormatFileSize(long fileSize) {
+ long kb = 1024;
+ long mb = kb * 1024;
+ long gb = mb * 1024;
+
+ if (fileSize >= gb) {
+ return String.format("%.1f GB", (float) fileSize / gb);
+ } else if (fileSize >= mb) {
+ float fi = (float) fileSize / mb;
+ return String.format(fi > 100 ? "%.0f MB" : "%.1f MB", fi);
+ } else if (fileSize >= kb) {
+ float fi = (float) fileSize / kb;
+ return String.format(fi > 100 ? "%.0f KB" : "%.1f KB", fi);
+ } else {
+ return String.format("%d B", fileSize);
}
+ }
+
+ /**
+ * get gson from json.
+ * @param jsonString json string
+ * @param templateClass template class
+ * @return Template
+ */
+ public static <T> T fromJson(String jsonString, Class<T> templateClass) {
+ Gson gson = new Gson();
+ return gson.fromJson(jsonString, templateClass);
+ }
+
+ /**
+ * gson to json.
+ * @param template class name
+ * @return String
+ */
+ public static <T> String toJson(T template) {
+ Gson gson = new Gson();
+ return gson.toJson(template);
+ }
}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.common;\r
\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
+\r
import java.io.BufferedInputStream;\r
import java.io.File;\r
import java.io.FileInputStream;\r
import java.util.zip.ZipEntry;\r
import java.util.zip.ZipOutputStream;\r
\r
-import org.slf4j.Logger;\r
-import org.slf4j.LoggerFactory;\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
public class ZipCompressor {\r
\r
- public static final Logger LOG = LoggerFactory.getLogger(ZipCompressor.class);\r
- static final int BUFFER = 8192;\r
+ public static final Logger LOG = LoggerFactory.getLogger(ZipCompressor.class);\r
+ static final int BUFFER = 8192;\r
\r
- private File zipFile;\r
+ private File zipFile;\r
\r
- public ZipCompressor(String pathName) {\r
- zipFile = new File(pathName);\r
- }\r
+ public ZipCompressor(String pathName) {\r
+ zipFile = new File(pathName);\r
+ }\r
\r
- public void compress(String... pathName) {\r
- ZipOutputStream out = null;\r
- try {\r
- FileOutputStream fileOutputStream = new FileOutputStream(zipFile);\r
- CheckedOutputStream cos = new CheckedOutputStream(fileOutputStream, new CRC32());\r
- out = new ZipOutputStream(cos);\r
- String basedir = "";\r
- for (int i = 0; i < pathName.length; i++) {\r
- compress(new File(pathName[i]), out, basedir);\r
- }\r
- out.close();\r
- } catch (Exception e) {\r
- throw new RuntimeException(e);\r
- }\r
+ /**\r
+ * compress file according several path.\r
+ * @param pathName file path name\r
+ */\r
+ public void compress(String... pathName) {\r
+ ZipOutputStream out = null;\r
+ try {\r
+ FileOutputStream fileOutputStream = new FileOutputStream(zipFile);\r
+ CheckedOutputStream cos = new CheckedOutputStream(fileOutputStream, new CRC32());\r
+ out = new ZipOutputStream(cos);\r
+ String basedir = "";\r
+ for (int i = 0; i < pathName.length; i++) {\r
+ compress(new File(pathName[i]), out, basedir);\r
+ }\r
+ out.close();\r
+ } catch (Exception e1) {\r
+ throw new RuntimeException(e1);\r
}\r
+ }\r
\r
- public void compress(String srcPathName) {\r
- File file = new File(srcPathName);\r
- if (!file.exists())\r
- throw new RuntimeException(srcPathName + "不存在！");\r
- try {\r
- FileOutputStream fileOutputStream = new FileOutputStream(zipFile);\r
- CheckedOutputStream cos = new CheckedOutputStream(fileOutputStream, new CRC32());\r
- ZipOutputStream out = new ZipOutputStream(cos);\r
- String basedir = "";\r
- compress(file, out, basedir);\r
- out.close();\r
- } catch (Exception e) {\r
- throw new RuntimeException(e);\r
- }\r
+ /**\r
+ * compress file according file path.\r
+ * @param srcPathName file path name\r
+ */\r
+ public void compress(String srcPathName) {\r
+ File file = new File(srcPathName);\r
+ if (!file.exists()) {\r
+ throw new RuntimeException(srcPathName + "not exist！");\r
}\r
+ try {\r
+ FileOutputStream fileOutputStream = new FileOutputStream(zipFile);\r
+ CheckedOutputStream cos = new CheckedOutputStream(fileOutputStream, new CRC32());\r
+ ZipOutputStream out = new ZipOutputStream(cos);\r
+ String basedir = "";\r
+ compress(file, out, basedir);\r
+ out.close();\r
+ } catch (Exception e1) {\r
+ throw new RuntimeException(e1);\r
+ }\r
+ }\r
\r
- private void compress(File file, ZipOutputStream out, String basedir) {\r
- /* 判断是目录还是文件 */\r
- if (file.isDirectory()) {\r
- System.out.println("压缩：" + basedir + file.getName());\r
- this.compressDirectory(file, out, basedir);\r
- } else {\r
- System.out.println("压缩：" + basedir + file.getName());\r
- this.compressFile(file, out, basedir);\r
- }\r
+ private void compress(File file, ZipOutputStream out, String basedir) {\r
+ if (file.isDirectory()) {\r
+ System.out.println("compress：" + basedir + file.getName());\r
+ this.compressDirectory(file, out, basedir);\r
+ } else {\r
+ System.out.println("compress：" + basedir + file.getName());\r
+ this.compressFile(file, out, basedir);\r
}\r
+ }\r
\r
- /** 压缩一个目录 */\r
- private void compressDirectory(File dir, ZipOutputStream out, String basedir) {\r
- if (!dir.exists())\r
- return;\r
+ private void compressDirectory(File dir, ZipOutputStream out, String basedir) {\r
+ if (!dir.exists()) {\r
+ return;\r
+ }\r
\r
- File[] files = dir.listFiles();\r
- for (int i = 0; i < files.length; i++) {\r
- /* 递归 */\r
- compress(files[i], out, basedir + dir.getName() + "/");\r
- }\r
+ File[] files = dir.listFiles();\r
+ for (int i = 0; i < files.length; i++) {\r
+ compress(files[i], out, basedir + dir.getName() + "/");\r
}\r
+ }\r
\r
- /** 压缩一个文件 */\r
- private void compressFile(File file, ZipOutputStream out, String basedir) {\r
- if (!file.exists()) {\r
- return;\r
- }\r
- try {\r
- BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));\r
- ZipEntry entry = new ZipEntry(basedir + file.getName());\r
- out.putNextEntry(entry);\r
- int count;\r
- byte data[] = new byte[BUFFER];\r
- while ((count = bis.read(data, 0, BUFFER)) != -1) {\r
- out.write(data, 0, count);\r
- }\r
- bis.close();\r
- } catch (Exception e) {\r
- throw new RuntimeException(e);\r
- }\r
+ private void compressFile(File file, ZipOutputStream out, String basedir) {\r
+ if (!file.exists()) {\r
+ return;\r
+ }\r
+ try {\r
+ byte data[] = new byte[BUFFER];\r
+ BufferedInputStream bis = new BufferedInputStream(new FileInputStream(file));\r
+ ZipEntry entry = new ZipEntry(basedir + file.getName());\r
+ out.putNextEntry(entry);\r
+ int count;\r
+ while ((count = bis.read(data, 0, BUFFER)) != -1) {\r
+ out.write(data, 0, count);\r
+ }\r
+ bis.close();\r
+ } catch (Exception e1) {\r
+ throw new RuntimeException(e1);\r
}\r
+ }\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.common;
-/**
- ** @author 10159474
- */
+
public enum CatalogResuorceType {
- SERVICETEMPLATE, PACKAGE, NODETEMPLATE, TEMPLATE, SERVICETEMPLATEMAPPING;
+ SERVICETEMPLATE, PACKAGE, NODETEMPLATE, TEMPLATE, SERVICETEMPLATEMAPPING;
- public static CatalogResuorceType getType(String type) {
- return valueOf(type);
- }
+ public static CatalogResuorceType getType(String type) {
+ return valueOf(type);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.common;
-/**
- * *@author 10159474
- *
- */
public enum Parameters {
- oid, name, provider, version, deletionPending, type, status, csarId, vendor, serviceTemplateId, nodeTemplateId, mappingId, nodeType;
+ oid, name, provider, version, deletionPending,
+ type, status, csarId, vendor, serviceTemplateId,
+ nodeTemplateId, mappingId, nodeType;
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.dao;
-import java.util.List;
-import java.util.Map;
+import io.dropwizard.hibernate.AbstractDAO;
+import io.dropwizard.util.Generics;
import org.hibernate.Criteria;
import org.hibernate.HibernateException;
import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.util.HqlFactory;
-import io.dropwizard.hibernate.AbstractDAO;
-import io.dropwizard.util.Generics;
+import java.util.List;
+import java.util.Map;
+
/**
- * a base class for Hibernate DAO classes
+ * a base class for Hibernate DAO classes. provide the common methods to create,delete,update and
+ * query data.
*
- * provide the common methods to create,delete,update and query data
- *
- * *@author 10159474
- *
- * @param <T>
*/
public class BaseDao<T> extends AbstractDAO<T> {
- public BaseDao(SessionFactory sessionFactory) {
- super(sessionFactory);
- this.sessionFactory = sessionFactory;
- this.entityClass = Generics.getTypeParameter(getClass());
- }
-
- public String[] excludeProperties;
- private SessionFactory sessionFactory;
- protected Session session;
- private final Class<?> entityClass;
-
- @Override
- protected Session currentSession() {
- return this.session;
+ /**
+ * base dao constructor.
+ *
+ * @param sessionFactory session factory
+ */
+ public BaseDao(SessionFactory sessionFactory) {
+ super(sessionFactory);
+ this.sessionFactory = sessionFactory;
+ this.entityClass = Generics.getTypeParameter(getClass());
+ }
+
+ public String[] excludeProperties;
+ private SessionFactory sessionFactory;
+ protected Session session;
+ private final Class<?> entityClass;
+
+ @Override
+ protected Session currentSession() {
+ return this.session;
+ }
+
+ /**
+ * update data.
+ *
+ * @param data the object to update
+ * @throws CatalogResourceException e1
+ */
+ public void update(T data, String filter) throws CatalogResourceException {
+ try {
+ String hql = HqlFactory.getUpdateHql(data, excludeProperties, filter);
+ beginTransaction();
+ Query query = this.session.createQuery(hql);
+ query.executeUpdate();
+ closeTransaction();
+ } catch (Exception e1) {
+ transactionRollBack();
+ throw new CatalogResourceException("error while updating data.errorMsg:" + e1.getMessage(),
+ e1);
+ } finally {
+ closeSession();
}
-
- /**
- * @param data the object to update
- * @throws CatalogResourceException
- */
- public void update(T data, String filter) throws CatalogResourceException {
- try {
- String hql = HqlFactory.getUpdateHql(data, excludeProperties, filter);
- beginTransaction();
- Query query = this.session.createQuery(hql);
- query.executeUpdate();
- closeTransaction();
- } catch (Exception e) {
- transactionRollBack();
- throw new CatalogResourceException("error while updating data.errorMsg:"
- + e.getMessage(), e);
- } finally {
- closeSession();
- }
+ }
+
+ /**
+ * delete data.
+ *
+ * @param data the object to delete
+ * @throws CatalogResourceException e1
+ */
+ public void delete(T data) throws CatalogResourceException {
+ try {
+ beginTransaction();
+ this.session.delete(data);
+ closeTransaction();
+ } catch (Exception e1) {
+ transactionRollBack();
+ throw new CatalogResourceException("error while deleting data.errorMsg:" + e1.getMessage(),
+ e1);
+ } finally {
+ closeSession();
}
-
- /**
- * @param data the object to delete
- * @throws CatalogResourceException
- */
- public void delete(T data) throws CatalogResourceException {
- try {
- beginTransaction();
- this.session.delete(data);
- closeTransaction();
- } catch (Exception e) {
- transactionRollBack();
- throw new CatalogResourceException("error while deleting data.errorMsg:"
- + e.getMessage(), e);
- } finally {
- closeSession();
- }
+ }
+
+ /**
+ * create data.
+ *
+ * @param data the object to create
+ * @return data
+ * @throws CatalogResourceException e1
+ */
+ public T create(T data) throws CatalogResourceException {
+ try {
+ beginTransaction();
+ session.save(data);
+ closeTransaction();
+ } catch (HibernateException e1) {
+ transactionRollBack();
+ throw new CatalogResourceException("error while creating data.errorMsg:" + e1.getMessage(),
+ e1);
+ } finally {
+ closeSession();
}
-
- /**
- * @param data the object to create
- * @return
- * @throws CatalogResourceException
- */
- public T create(T data) throws CatalogResourceException {
- try {
- beginTransaction();
- session.save(data);
- closeTransaction();
- } catch (HibernateException e) {
- transactionRollBack();
- throw new CatalogResourceException("error while creating data.errorMsg:"
- + e.getMessage(), e);
- } finally {
- closeSession();
- }
- return data;
+ return data;
+ }
+
+ /**
+ * union query.
+ *
+ * @param unionHql union hql
+ * @return list
+ * @throws CatalogResourceException e1
+ */
+ public List<T> unionQuery(String unionHql) throws CatalogResourceException {
+ List<T> data;
+ try {
+ beginTransaction();
+ Query query = this.session.createQuery(unionHql);
+ data = query.list();
+ closeTransaction();
+ } catch (Exception e1) {
+ transactionRollBack();
+ throw new CatalogResourceException("error while union query data.errorMsg:" + e1.getMessage(),
+ e1);
+ } finally {
+ closeSession();
}
-
- public List<T> unionQuery(String unionHql) throws CatalogResourceException {
- List<T> data;
- try {
- beginTransaction();
- Query query = this.session.createQuery(unionHql);
- data = query.list();
- closeTransaction();
- } catch (Exception e) {
- transactionRollBack();
- throw new CatalogResourceException("error while union query data.errorMsg:"
- + e.getMessage(), e);
- } finally {
- closeSession();
- }
- return data;
+ return data;
+ }
+
+ /**
+ * union delete.
+ *
+ * @param unionHql union hql
+ * @return int
+ * @throws CatalogResourceException e1
+ */
+ public int unionDelete(String unionHql) throws CatalogResourceException {
+ int num = 0;
+ try {
+ beginTransaction();
+ Query query = this.session.createQuery(unionHql);
+ num = query.executeUpdate();
+ closeTransaction();
+ } catch (Exception e1) {
+ transactionRollBack();
+ throw new CatalogResourceException("error while union query data.errorMsg:" + e1.getMessage(),
+ e1);
+ } finally {
+ closeSession();
}
-
- public int unionDelete(String unionHql) throws CatalogResourceException {
- int num = 0;
- try {
- beginTransaction();
- Query query = this.session.createQuery(unionHql);
- num = query.executeUpdate();
- closeTransaction();
- } catch (Exception e) {
- transactionRollBack();
- throw new CatalogResourceException("error while union query data.errorMsg:"
- + e.getMessage(), e);
- } finally {
- closeSession();
- }
- return num;
+ return num;
+ }
+
+ /**
+ * query data.
+ *
+ * @param queryParams the condition map used to query objects
+ * @return data list
+ * @throws CatalogResourceException e1
+ */
+ @SuppressWarnings("unchecked")
+ public List<T> query(Map<String, String> queryParams) throws CatalogResourceException {
+ List<T> result = null;
+ try {
+ beginTransaction();
+ Criteria criteria = this.session.createCriteria(entityClass);
+ for (String key : queryParams.keySet()) {
+ criteria.add(Restrictions.eq(key, queryParams.get(key)));
+ }
+ result = (List<T>) criteria.list();
+ closeTransaction();
+ } catch (HibernateException e1) {
+ throw new CatalogResourceException("error while querying data.errorMsg:" + e1.getMessage(),
+ e1);
+ } finally {
+ closeSession();
}
+ return result;
+ }
- /**
- * @param queryParams the condition map used to query objects
- * @return
- * @throws CatalogResourceException
- */
- @SuppressWarnings("unchecked")
- public List<T> query(Map<String, String> queryParams) throws CatalogResourceException {
- List<T> result = null;
- try {
- beginTransaction();
- Criteria criteria = this.session.createCriteria(entityClass);
- for (String key : queryParams.keySet()) {
- criteria.add(Restrictions.eq(key, queryParams.get(key)));
- }
- result = (List<T>) criteria.list();
- closeTransaction();
- } catch (HibernateException e) {
- throw new CatalogResourceException("error while querying data.errorMsg:"
- + e.getMessage(), e);
- } finally {
- closeSession();
- }
- return result;
- }
-
- protected void beginTransaction() {
- this.session = this.sessionFactory.openSession();
- this.session.beginTransaction();
- }
+ protected void beginTransaction() {
+ this.session = this.sessionFactory.openSession();
+ this.session.beginTransaction();
+ }
- protected void closeTransaction() {
- this.session.getTransaction().commit();
- }
+ protected void closeTransaction() {
+ this.session.getTransaction().commit();
+ }
- protected void closeSession() {
- this.session.close();
- }
+ protected void closeSession() {
+ this.session.close();
+ }
- protected void transactionRollBack() {
- this.session.getTransaction().rollback();
- }
+ protected void transactionRollBack() {
+ this.session.getTransaction().rollback();
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.dao;
import org.hibernate.SessionFactory;
import org.openo.commontosca.catalog.db.common.CatalogResuorceType;
/**
- * DAO manager class
- *
- * a class to store DAO instances and provide methods to get these instances
- *
+ * DAO manager class.
+ * a class to store DAO instances and provide methods to get these instances.
*
*/
public class DaoManager {
- private static DaoManager instance = new DaoManager();
-
- private ServiceTemplateDao serviceTemplateDao;
- private PackageDao packageDao;
- private NodeTemplateDao nodeTemplateDao;
- private TemplateDao templateDao;
- private ServiceTemplateMappingDao templateMappingDao;
- private SessionFactory sessionFactory;
-
- private DaoManager() {}
-
- public synchronized static DaoManager getInstance() {
- return instance;
- }
-
- public BaseDao<?> getDao(String type) {
- switch (CatalogResuorceType.getType(type)) {
- case SERVICETEMPLATE:
- return getServiceTemplateDao();
- case PACKAGE:
- return getPackageDao();
- case NODETEMPLATE:
- return getNodeTemplateDao();
- case TEMPLATE:
- return getTemplateDao();
- case SERVICETEMPLATEMAPPING:
- return getTemplateMappingDao();
- default:
- return null;
- }
+ private static DaoManager instance = new DaoManager();
+
+ private ServiceTemplateDao serviceTemplateDao;
+ private PackageDao packageDao;
+ private NodeTemplateDao nodeTemplateDao;
+ private TemplateDao templateDao;
+ private ServiceTemplateMappingDao templateMappingDao;
+ private SessionFactory sessionFactory;
+
+ private DaoManager() {}
+
+ public static synchronized DaoManager getInstance() {
+ return instance;
+ }
+
+ /**
+ * get dao.
+ * @param type data type
+ * @return BaseDao<?>
+ */
+ public BaseDao<?> getDao(String type) {
+ switch (CatalogResuorceType.getType(type)) {
+ case SERVICETEMPLATE:
+ return getServiceTemplateDao();
+ case PACKAGE:
+ return getPackageDao();
+ case NODETEMPLATE:
+ return getNodeTemplateDao();
+ case TEMPLATE:
+ return getTemplateDao();
+ case SERVICETEMPLATEMAPPING:
+ return getTemplateMappingDao();
+ default:
+ return null;
}
-
- public void setSessionFactory(SessionFactory sessionFactory) {
- this.sessionFactory = sessionFactory;
+ }
+
+ public void setSessionFactory(SessionFactory sessionFactory) {
+ this.sessionFactory = sessionFactory;
+ }
+
+ public SessionFactory getSessionFactory() {
+ return sessionFactory;
+ }
+
+ /**
+ * get service template dao.
+ * @return ServiceTemplateDao
+ */
+ public ServiceTemplateDao getServiceTemplateDao() {
+ if (serviceTemplateDao == null) {
+ serviceTemplateDao = new ServiceTemplateDao(sessionFactory);
}
-
- public SessionFactory getSessionFactory() {
- return sessionFactory;
+ return serviceTemplateDao;
+ }
+
+ public void setServiceTemplateDao(ServiceTemplateDao serviceTemplateDao) {
+ this.serviceTemplateDao = serviceTemplateDao;
+ }
+
+ /**
+ * get package dao.
+ * @return PackageDao
+ */
+ public PackageDao getPackageDao() {
+ if (packageDao == null) {
+ packageDao = new PackageDao(sessionFactory);
}
-
- public ServiceTemplateDao getServiceTemplateDao() {
- if (serviceTemplateDao == null)
- serviceTemplateDao = new ServiceTemplateDao(sessionFactory);
- return serviceTemplateDao;
+ return packageDao;
+ }
+
+ public void setPackageDao(PackageDao packageDao) {
+ this.packageDao = packageDao;
+ }
+
+ /**
+ * get node templage dao.
+ * @return NodeTemplateDao
+ */
+ public NodeTemplateDao getNodeTemplateDao() {
+ if (nodeTemplateDao == null) {
+ nodeTemplateDao = new NodeTemplateDao(sessionFactory);
}
-
- public void setServiceTemplateDao(ServiceTemplateDao serviceTemplateDao) {
- this.serviceTemplateDao = serviceTemplateDao;
- }
-
- public PackageDao getPackageDao() {
- if (packageDao == null)
- packageDao = new PackageDao(sessionFactory);
- return packageDao;
+ return nodeTemplateDao;
+ }
+
+ public void setTemplateDao(TemplateDao templateDao) {
+ this.templateDao = templateDao;
+ }
+
+ /**
+ * get template dao.
+ * @return TemplateDao
+ */
+ public TemplateDao getTemplateDao() {
+ if (templateDao == null) {
+ templateDao = new TemplateDao(sessionFactory);
}
-
- public void setPackageDao(PackageDao packageDao) {
- this.packageDao = packageDao;
- }
-
- public NodeTemplateDao getNodeTemplateDao() {
- if (nodeTemplateDao == null)
- nodeTemplateDao = new NodeTemplateDao(sessionFactory);
- return nodeTemplateDao;
- }
-
- public void setTemplateDao(TemplateDao templateDao) {
- this.templateDao = templateDao;
- }
-
- public TemplateDao getTemplateDao() {
- if (templateDao == null)
- templateDao = new TemplateDao(sessionFactory);
- return templateDao;
- }
-
- public void setNodeTemplateDao(NodeTemplateDao nodeTemplateDao) {
- this.nodeTemplateDao = nodeTemplateDao;
- }
-
- public ServiceTemplateMappingDao getTemplateMappingDao() {
- if (templateMappingDao == null)
- templateMappingDao = new ServiceTemplateMappingDao(sessionFactory);
- return templateMappingDao;
- }
-
- public void setTemplateMappingDao(ServiceTemplateMappingDao templateMappingDao) {
- this.templateMappingDao = templateMappingDao;
+ return templateDao;
+ }
+
+ public void setNodeTemplateDao(NodeTemplateDao nodeTemplateDao) {
+ this.nodeTemplateDao = nodeTemplateDao;
+ }
+
+ /**
+ * get template mapping dao.
+ * @return ServiceTemplateMappingDao
+ */
+ public ServiceTemplateMappingDao getTemplateMappingDao() {
+ if (templateMappingDao == null) {
+ templateMappingDao = new ServiceTemplateMappingDao(sessionFactory);
}
- public void setDaoNull()
- {
- this.nodeTemplateDao=null;
- this.templateDao=null;
- this.serviceTemplateDao=null;
- this.packageDao=null;
- this.templateMappingDao=null;
-}}
+ return templateMappingDao;
+ }
+
+ public void setTemplateMappingDao(ServiceTemplateMappingDao templateMappingDao) {
+ this.templateMappingDao = templateMappingDao;
+ }
+
+ /**
+ * set dao null.
+ */
+ public void setDaoNull() {
+ this.nodeTemplateDao = null;
+ this.templateDao = null;
+ this.serviceTemplateDao = null;
+ this.packageDao = null;
+ this.templateMappingDao = null;
+ }
+}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.dao;
import org.hibernate.SessionFactory;
/**
- * host DAO class
- *
- * *@author 10159474
+ * host DAO class.
*
*/
public class NodeTemplateDao extends BaseDao<NodeTemplateData> {
- public NodeTemplateDao(SessionFactory sessionFactory) {
- super(sessionFactory);
- }
+ public NodeTemplateDao(SessionFactory sessionFactory) {
+ super(sessionFactory);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.dao;
import org.hibernate.SessionFactory;
/**
- * host DAO class
- *
- * *@author 10159474
+ * host DAO class.
*
*/
public class PackageDao extends BaseDao<PackageData> {
- public PackageDao(SessionFactory sessionFactory) {
- super(sessionFactory);
- }
+ public PackageDao(SessionFactory sessionFactory) {
+ super(sessionFactory);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.dao;
import org.hibernate.SessionFactory;
import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
- * DAO class
- *
- * *@author 10159474
+ * DAO class.
*
*/
public class ServiceTemplateDao extends BaseDao<ServiceTemplateData> {
- private static final Logger logger = LoggerFactory.getLogger(ServiceTemplateDao.class);
- public ServiceTemplateDao(SessionFactory sessionFactory) {
- super(sessionFactory);
- }
+ public ServiceTemplateDao(SessionFactory sessionFactory) {
+ super(sessionFactory);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.dao;
import org.hibernate.SessionFactory;
import org.openo.commontosca.catalog.db.entity.ServiceTemplateMappingData;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
/**
- * DAO class
- *
- * *@author 10159474
+ * DAO class.
*
*/
public class ServiceTemplateMappingDao extends BaseDao<ServiceTemplateMappingData> {
- private static final Logger logger = LoggerFactory.getLogger(ServiceTemplateMappingDao.class);
- public ServiceTemplateMappingDao(SessionFactory sessionFactory) {
- super(sessionFactory);
- }
+ public ServiceTemplateMappingDao(SessionFactory sessionFactory) {
+ super(sessionFactory);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.dao;
import org.hibernate.HibernateException;
import org.slf4j.LoggerFactory;
/**
- * DAO class
- *
- * *@author 10159474
+ * DAO class.
*
*/
public class TemplateDao extends BaseDao<TemplateData> {
- private static final Logger logger = LoggerFactory.getLogger(TemplateDao.class);
+ private static final Logger logger = LoggerFactory.getLogger(TemplateDao.class);
- public TemplateDao(SessionFactory sessionFactory) {
- super(sessionFactory);
- }
+ public TemplateDao(SessionFactory sessionFactory) {
+ super(sessionFactory);
+ }
- public TemplateData create(TemplateData data) throws CatalogResourceException {
- logger.info("TemplateDao:start add template.info:" + CatalogDbUtil.objectToString(data));
- beginTransaction();
- try {
- this.session.persist(data.getServiceTemplate());
- for (NodeTemplateData nodeData : data.getNodeTemplates()) {
- this.session.persist(nodeData);
- }
- closeTransaction();
- } catch (HibernateException e) {
- logger.error("TemplateDao:error while add template data.errorMsg:" + e.getMessage());
- throw new CatalogResourceException("error while add template data" + e.getMessage(), e);
- } finally {
- closeSession();
- }
- logger.info("TemplateDao: add template end .");
- return data;
+ /**
+ * create template data.
+ */
+ public TemplateData create(TemplateData data) throws CatalogResourceException {
+ logger.info("TemplateDao:start add template.info:" + CatalogDbUtil.objectToString(data));
+ beginTransaction();
+ try {
+ this.session.persist(data.getServiceTemplate());
+ for (NodeTemplateData nodeData : data.getNodeTemplates()) {
+ this.session.persist(nodeData);
+ }
+ closeTransaction();
+ } catch (HibernateException e1) {
+ logger.error("TemplateDao:error while add template data.errorMsg:" + e1.getMessage());
+ throw new CatalogResourceException("error while add template data" + e1.getMessage(), e1);
+ } finally {
+ closeSession();
}
+ logger.info("TemplateDao: add template end .");
+ return data;
+ }
- public void delete(TemplateData data) throws CatalogResourceException {
- logger.info("TemplateDao:start delete template.info:" + CatalogDbUtil.objectToString(data));
- beginTransaction();
- try {
- for (NodeTemplateData nodeData : data.getNodeTemplates()) {
- this.session.delete(nodeData);
- }
- this.session.delete(data.getServiceTemplate());
- closeTransaction();
- } catch (HibernateException e) {
- logger.error("TemplateDao:error while delete template data.errorMsg:" + e.getMessage());
- throw new CatalogResourceException("error while delete template data" + e.getMessage(),
- e);
- } finally {
- closeSession();
- }
- logger.info("TemplateDao: delete template end .");
+ /**
+ * delete template data.
+ */
+ public void delete(TemplateData data) throws CatalogResourceException {
+ logger.info("TemplateDao:start delete template.info:" + CatalogDbUtil.objectToString(data));
+ beginTransaction();
+ try {
+ for (NodeTemplateData nodeData : data.getNodeTemplates()) {
+ this.session.delete(nodeData);
+ }
+ this.session.delete(data.getServiceTemplate());
+ closeTransaction();
+ } catch (HibernateException e1) {
+ logger.error("TemplateDao:error while delete template data.errorMsg:" + e1.getMessage());
+ throw new CatalogResourceException("error while delete template data" + e1.getMessage(), e1);
+ } finally {
+ closeSession();
}
+ logger.info("TemplateDao: delete template end .");
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.entity;
public class BaseData {
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
-
@Entity
@Table(name = "catalog_node_template_table")
@JsonIgnoreProperties(ignoreUnknown = true)
public class NodeTemplateData extends BaseData {
- @Id
- @Column(name = "NODETEMPLATEID")
- private String nodeTemplateId;
- @Column(name = "NAME")
- private String name;
+ @Id
+ @Column(name = "NODETEMPLATEID")
+ private String nodeTemplateId;
+ @Column(name = "NAME")
+ private String name;
- @Column(name = "SERVICETEMPLATEID")
- private String serviceTemplateId;
+ @Column(name = "SERVICETEMPLATEID")
+ private String serviceTemplateId;
- @Column(name = "TYPE")
- private String type;
+ @Column(name = "TYPE")
+ private String type;
- @Column(name = "PROPERTIES")
- private String properties;
+ @Column(name = "PROPERTIES")
+ private String properties;
- @Column(name = "RELATIONSHIPS")
- private String relationShips;
+ @Column(name = "RELATIONSHIPS")
+ private String relationShips;
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- public String getServiceTemplateId() {
- return serviceTemplateId;
- }
+ public String getServiceTemplateId() {
+ return serviceTemplateId;
+ }
- public void setServiceTemplateId(String serviceTemplateId) {
- this.serviceTemplateId = serviceTemplateId;
- }
+ public void setServiceTemplateId(String serviceTemplateId) {
+ this.serviceTemplateId = serviceTemplateId;
+ }
- public String getType() {
- return type;
- }
+ public String getType() {
+ return type;
+ }
- public void setType(String type) {
- this.type = type;
- }
+ public void setType(String type) {
+ this.type = type;
+ }
- public String getProperties() {
- return properties;
- }
+ public String getProperties() {
+ return properties;
+ }
- public void setProperties(String properties) {
- this.properties = properties;
- }
+ public void setProperties(String properties) {
+ this.properties = properties;
+ }
- public String getRelationShips() {
- return relationShips;
- }
+ public String getRelationShips() {
+ return relationShips;
+ }
- public void setRelationShips(String relationShips) {
- this.relationShips = relationShips;
- }
+ public void setRelationShips(String relationShips) {
+ this.relationShips = relationShips;
+ }
- public void setNodeTemplateId(String nodeTemplateId) {
- this.nodeTemplateId = nodeTemplateId;
- }
+ public void setNodeTemplateId(String nodeTemplateId) {
+ this.nodeTemplateId = nodeTemplateId;
+ }
- public String getNodeTemplateId() {
- return nodeTemplateId;
- }
+ public String getNodeTemplateId() {
+ return nodeTemplateId;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.entity;
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@JsonIgnoreProperties(ignoreUnknown = true)
public class PackageData extends BaseData {
- @Id
- @Column(name = "CSARID")
- private String csarId;
- @Column(name = "DOWNLOADURi")
- private String downloadUri;
-
- @Column(name = "NAME")
- private String name;
-
- @Column(name = "SIZE")
- private String size;
- @Column(name = "VERSION")
- private String version;
-
- @Column(name = "PROVIDER")
- private String provider;
- @Column(name = "TYPE")
- private String type;
- @Column(name = "FORMAT")
- private String format;
-
- @Column(name = "DELETIONPENDING")
- private String deletionPending;
-
- @Column(name = "MODIFYTIME")
- private String modifyTime;
- @Column(name = "OPERATIONALSTATE")
- private String operationalState;
- @Column(name = "USAGESTATE")
- private String usageState;
- @Column(name = "CREATETIME")
- private String createTime;
- @Column(name = "ONBOARDSTATE")
- private String onBoardState;
- @Column(name = "PROCESSSTATE")
- private String processState;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getOnBoardState() {
- return onBoardState;
- }
-
- public void setOnBoardState(String onBoardState) {
- this.onBoardState = onBoardState;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getProvider() {
- return provider;
- }
-
- public void setProvider(String provider) {
- this.provider = provider;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getDownloadUri() {
- return downloadUri;
- }
-
- public void setDownloadUri(String downloadUri) {
- this.downloadUri = downloadUri;
- }
-
- public String getSize() {
- return size;
- }
-
- public void setSize(String size) {
- this.size = size;
- }
-
- public String getFormat() {
- return format;
- }
-
- public void setFormat(String format) {
- this.format = format;
- }
-
- public String getDeletionPending() {
- return deletionPending;
- }
-
- public void setDeletionPending(String deletionPending) {
- this.deletionPending = deletionPending;
- }
-
- public String getModifyTime() {
- return modifyTime;
- }
-
- public void setModifyTime(String modifyTime) {
- this.modifyTime = modifyTime;
- }
-
- public String getOperationalState() {
- return operationalState;
- }
-
- public void setOperationalState(String operationalState) {
- this.operationalState = operationalState;
- }
-
- public String getUsageState() {
- return usageState;
- }
-
- public void setUsageState(String usageState) {
- this.usageState = usageState;
- }
-
- public String getCreateTime() {
- return createTime;
- }
+ @Id
+ @Column(name = "CSARID")
+ private String csarId;
+ @Column(name = "DOWNLOADURi")
+ private String downloadUri;
+
+ @Column(name = "NAME")
+ private String name;
+
+ @Column(name = "SIZE")
+ private String size;
+ @Column(name = "VERSION")
+ private String version;
+
+ @Column(name = "PROVIDER")
+ private String provider;
+ @Column(name = "TYPE")
+ private String type;
+ @Column(name = "FORMAT")
+ private String format;
+
+ @Column(name = "DELETIONPENDING")
+ private String deletionPending;
+
+ @Column(name = "MODIFYTIME")
+ private String modifyTime;
+ @Column(name = "OPERATIONALSTATE")
+ private String operationalState;
+ @Column(name = "USAGESTATE")
+ private String usageState;
+ @Column(name = "CREATETIME")
+ private String createTime;
+ @Column(name = "ONBOARDSTATE")
+ private String onBoardState;
+ @Column(name = "PROCESSSTATE")
+ private String processState;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getOnBoardState() {
+ return onBoardState;
+ }
+
+ public void setOnBoardState(String onBoardState) {
+ this.onBoardState = onBoardState;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getProvider() {
+ return provider;
+ }
+
+ public void setProvider(String provider) {
+ this.provider = provider;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getDownloadUri() {
+ return downloadUri;
+ }
+
+ public void setDownloadUri(String downloadUri) {
+ this.downloadUri = downloadUri;
+ }
+
+ public String getSize() {
+ return size;
+ }
+
+ public void setSize(String size) {
+ this.size = size;
+ }
+
+ public String getFormat() {
+ return format;
+ }
+
+ public void setFormat(String format) {
+ this.format = format;
+ }
+
+ public String getDeletionPending() {
+ return deletionPending;
+ }
+
+ public void setDeletionPending(String deletionPending) {
+ this.deletionPending = deletionPending;
+ }
+
+ public String getModifyTime() {
+ return modifyTime;
+ }
+
+ public void setModifyTime(String modifyTime) {
+ this.modifyTime = modifyTime;
+ }
+
+ public String getOperationalState() {
+ return operationalState;
+ }
+
+ public void setOperationalState(String operationalState) {
+ this.operationalState = operationalState;
+ }
+
+ public String getUsageState() {
+ return usageState;
+ }
+
+ public void setUsageState(String usageState) {
+ this.usageState = usageState;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
- }
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
- public void setCsarId(String csarId) {
- this.csarId = csarId;
- }
+ public void setCsarId(String csarId) {
+ this.csarId = csarId;
+ }
- public String getCsarId() {
- return csarId;
- }
+ public String getCsarId() {
+ return csarId;
+ }
- public String getProcessState() {
- return processState;
- }
+ public String getProcessState() {
+ return processState;
+ }
- public void setProcessState(String processState) {
- this.processState = processState;
- }
+ public void setProcessState(String processState) {
+ this.processState = processState;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
@Entity
@Table(name = "catalog_service_template_table")
@JsonIgnoreProperties(ignoreUnknown = true)
public class ServiceTemplateData extends BaseData {
- @Id
- @Column(name = "SERVICETEMPLATEID")
- private String serviceTemplateId;
- @Column(name = "TEMPLATENAME")
- private String templateName;
+ @Id
+ @Column(name = "SERVICETEMPLATEID")
+ private String serviceTemplateId;
+ @Column(name = "TEMPLATENAME")
+ private String templateName;
- @Column(name = "TYPE")
- private String type;
+ @Column(name = "TYPE")
+ private String type;
- @Column(name = "VENDOR")
- private String vendor;
+ @Column(name = "VENDOR")
+ private String vendor;
- @Column(name = "VERSION")
- private String version;
+ @Column(name = "VERSION")
+ private String version;
- @Column(name = "CSARID")
- private String csarId;
+ @Column(name = "CSARID")
+ private String csarId;
- @Column(name = "INPUTS")
- private String inputs;
+ @Column(name = "INPUTS")
+ private String inputs;
- @Column(name = "DOWNLOADURI")
- private String downloadUri;
+ @Column(name = "DOWNLOADURI")
+ private String downloadUri;
- @Column(name = "ROWDATA")
- private String rowData;
- @Column(name = "OPERATIONS")
- private String operations;
+ @Column(name = "ROWDATA")
+ private String rowData;
+ @Column(name = "OPERATIONS")
+ private String operations;
- public String getRowData() {
- return rowData;
- }
+ public String getRowData() {
+ return rowData;
+ }
- public void setRowData(String rowData) {
- this.rowData = rowData;
- }
+ public void setRowData(String rowData) {
+ this.rowData = rowData;
+ }
- public String getOperations() {
- return operations;
- }
+ public String getOperations() {
+ return operations;
+ }
- public void setOperations(String operations) {
- this.operations = operations;
- }
+ public void setOperations(String operations) {
+ this.operations = operations;
+ }
- public String getTemplateName() {
- return templateName;
- }
+ public String getTemplateName() {
+ return templateName;
+ }
- public void setTemplateName(String templateName) {
- this.templateName = templateName;
- }
+ public void setTemplateName(String templateName) {
+ this.templateName = templateName;
+ }
- public String getType() {
- return type;
- }
+ public String getType() {
+ return type;
+ }
- public void setType(String type) {
- this.type = type;
- }
+ public void setType(String type) {
+ this.type = type;
+ }
- public String getVendor() {
- return vendor;
- }
+ public String getVendor() {
+ return vendor;
+ }
- public void setVendor(String vendor) {
- this.vendor = vendor;
- }
+ public void setVendor(String vendor) {
+ this.vendor = vendor;
+ }
- public String getVersion() {
- return version;
- }
+ public String getVersion() {
+ return version;
+ }
- public void setVersion(String version) {
- this.version = version;
- }
+ public void setVersion(String version) {
+ this.version = version;
+ }
- public String getCsarId() {
- return csarId;
- }
+ public String getCsarId() {
+ return csarId;
+ }
- public void setCsarId(String csarId) {
- this.csarId = csarId;
- }
+ public void setCsarId(String csarId) {
+ this.csarId = csarId;
+ }
- public String getInputs() {
- return inputs;
- }
+ public String getInputs() {
+ return inputs;
+ }
- public void setInputs(String inputs) {
- this.inputs = inputs;
- }
+ public void setInputs(String inputs) {
+ this.inputs = inputs;
+ }
- public String getDownloadUri() {
- return downloadUri;
- }
+ public String getDownloadUri() {
+ return downloadUri;
+ }
- public void setDownloadUri(String downloadUri) {
- this.downloadUri = downloadUri;
- }
+ public void setDownloadUri(String downloadUri) {
+ this.downloadUri = downloadUri;
+ }
- public void setServiceTemplateId(String serviceTemplateId) {
- this.serviceTemplateId = serviceTemplateId;
- }
+ public void setServiceTemplateId(String serviceTemplateId) {
+ this.serviceTemplateId = serviceTemplateId;
+ }
- public String getServiceTemplateId() {
- return serviceTemplateId;
- }
+ public String getServiceTemplateId() {
+ return serviceTemplateId;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.Id;
import javax.persistence.Table;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-
@Entity
@Table(name = "catalog_model_substitution_mapping_table")
@JsonIgnoreProperties(ignoreUnknown = true)
public class ServiceTemplateMappingData extends BaseData {
- @Id
- @Column(name = "MAPPINGID")
- private String mappingId;
+ @Id
+ @Column(name = "MAPPINGID")
+ private String mappingId;
- @Column(name = "NODETYPE")
- private String nodeType;
+ @Column(name = "NODETYPE")
+ private String nodeType;
- @Column(name = "SERVICETEMPLATEID")
- private String serviceTemplateId;
+ @Column(name = "SERVICETEMPLATEID")
+ private String serviceTemplateId;
- @Column(name = "REQUIREMENTS")
- private String requirements;
+ @Column(name = "REQUIREMENTS")
+ private String requirements;
- @Column(name = "CAPABILITIES")
- private String capabilities;
+ @Column(name = "CAPABILITIES")
+ private String capabilities;
- public String getMappingId() {
- return mappingId;
- }
+ public String getMappingId() {
+ return mappingId;
+ }
- public void setMappingId(String mappingId) {
- this.mappingId = mappingId;
- }
+ public void setMappingId(String mappingId) {
+ this.mappingId = mappingId;
+ }
- public String getNodeType() {
- return nodeType;
- }
+ public String getNodeType() {
+ return nodeType;
+ }
- public void setNodeType(String nodeType) {
- this.nodeType = nodeType;
- }
+ public void setNodeType(String nodeType) {
+ this.nodeType = nodeType;
+ }
- public String getServiceTemplateId() {
- return serviceTemplateId;
- }
+ public String getServiceTemplateId() {
+ return serviceTemplateId;
+ }
- public void setServiceTemplateId(String serviceTemplateId) {
- this.serviceTemplateId = serviceTemplateId;
- }
+ public void setServiceTemplateId(String serviceTemplateId) {
+ this.serviceTemplateId = serviceTemplateId;
+ }
- public String getRequirements() {
- return requirements;
- }
+ public String getRequirements() {
+ return requirements;
+ }
- public void setRequirements(String requirements) {
- this.requirements = requirements;
- }
+ public void setRequirements(String requirements) {
+ this.requirements = requirements;
+ }
- public String getCapabilities() {
- return capabilities;
- }
+ public String getCapabilities() {
+ return capabilities;
+ }
- public void setCapabilities(String capabilities) {
- this.capabilities = capabilities;
- }
+ public void setCapabilities(String capabilities) {
+ this.capabilities = capabilities;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.entity;
import java.util.ArrayList;
public class TemplateData extends BaseData {
- private ServiceTemplateData serviceTemplate;
- private ArrayList<NodeTemplateData> nodeTemplates = new ArrayList<NodeTemplateData>();
+ private ServiceTemplateData serviceTemplate;
+ private ArrayList<NodeTemplateData> nodeTemplates = new ArrayList<NodeTemplateData>();
- public ServiceTemplateData getServiceTemplate() {
- return serviceTemplate;
- }
+ public ServiceTemplateData getServiceTemplate() {
+ return serviceTemplate;
+ }
- public void setServiceTemplate(ServiceTemplateData serviceTemplate) {
- this.serviceTemplate = serviceTemplate;
- }
+ public void setServiceTemplate(ServiceTemplateData serviceTemplate) {
+ this.serviceTemplate = serviceTemplate;
+ }
- public ArrayList<NodeTemplateData> getNodeTemplates() {
- return nodeTemplates;
- }
+ public ArrayList<NodeTemplateData> getNodeTemplates() {
+ return nodeTemplates;
+ }
- public void setNodeTemplates(ArrayList<NodeTemplateData> nodeTemplates) {
- this.nodeTemplates = nodeTemplates;
- }
+ public void setNodeTemplates(ArrayList<NodeTemplateData> nodeTemplates) {
+ this.nodeTemplates = nodeTemplates;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.exception;
-/**
- *
- */
public class CatalogResourceException extends ErrorCodeException {
- private static final long serialVersionUID = 5699508780537383310L;
+ private static final long serialVersionUID = 5699508780537383310L;
- public CatalogResourceException(int errcode) {
- super(errcode, "");
- }
+ public CatalogResourceException(int errcode) {
+ super(errcode, "");
+ }
- public CatalogResourceException(int errcode, Throwable cause) {
- super(cause, errcode);
- }
+ public CatalogResourceException(int errcode, Throwable cause) {
+ super(cause, errcode);
+ }
- public CatalogResourceException(int errcode, String message, Throwable cause) {
- super(cause, errcode, message);
- }
+ public CatalogResourceException(int errcode, String message, Throwable cause) {
+ super(cause, errcode, message);
+ }
- public CatalogResourceException() {
- super(9999999, null);
- }
+ public CatalogResourceException() {
+ super(9999999, null);
+ }
- public CatalogResourceException(String message) {
- super(9999999, message);
- }
+ public CatalogResourceException(String message) {
+ super(9999999, message);
+ }
- public CatalogResourceException(Throwable cause) {
- super(cause, 9999999);
- }
+ public CatalogResourceException(Throwable cause) {
+ super(cause, 9999999);
+ }
- public CatalogResourceException(String message, Throwable cause) {
- super(cause, 9999999, message);
- }
+ public CatalogResourceException(String message, Throwable cause) {
+ super(cause, 9999999, message);
+ }
- public CatalogResourceException(Throwable source, int errID, String debugMessage,
- String[] arguments) {
- super(source, errID, debugMessage, arguments);
- }
+ /**
+ * catalog resource exception.
+ * @param source throwable source
+ * @param errId error Id
+ * @param debugMessage debug message
+ * @param arguments arguments
+ */
+ public CatalogResourceException(Throwable source, int errId, String debugMessage,
+ String[] arguments) {
+ super(source, errId, debugMessage, arguments);
+ }
- public CatalogResourceException(Throwable source, int category, int code, String debugMessage,
- String[] arguments) {
- super(source, category, code, debugMessage, arguments);
- }
+ public CatalogResourceException(Throwable source, int category, int code, String debugMessage,
+ String[] arguments) {
+ super(source, category, code, debugMessage, arguments);
+ }
- public int getErrcode() {
- return super.getErrorCode();
- }
+ public int getErrcode() {
+ return super.getErrorCode();
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.exception;
-/**
- * *@author 10159474
- *
- */
public class ErrorCodeException extends Exception {
- private static final long serialVersionUID = 3220072444842529499L;
- private int categoryCode = 0;
- private int errorCode = 1;
- private String[] arguments = null;
-
- private static String defaultText = null;
-
-
- public static void setDefaultText(String text) {
- defaultText = text;
- }
-
-
- public static String getDefaultText() {
- return defaultText;
- }
-
+ private static final long serialVersionUID = 3220072444842529499L;
+ private int categoryCode = 0;
+ private int errorCode = 1;
+ private String[] arguments = null;
- public ErrorCodeException(int code, String debugMessage) {
- this(code, debugMessage, null);
- }
+ private static String defaultText = null;
- public ErrorCodeException(int code, String debugMessage, String[] arguments) {
- super(debugMessage);
- this.errorCode = code;
- this.arguments = arguments;
- }
+ public static void setDefaultText(String text) {
+ defaultText = text;
+ }
- public ErrorCodeException(Throwable source, int code) {
- this(source, code, (String[]) null);
- }
+ public static String getDefaultText() {
+ return defaultText;
+ }
- public ErrorCodeException(Throwable source, int code, String[] arguments) {
- super(source);
- this.errorCode = code;
- this.arguments = arguments;
- }
+ public ErrorCodeException(int code, String debugMessage) {
+ this(code, debugMessage, null);
+ }
+ /**
+ * error code exception.
+ * @param code error code
+ * @param debugMessage debug message
+ * @param arguments arguments
+ */
+ public ErrorCodeException(int code, String debugMessage, String[] arguments) {
+ super(debugMessage);
+ this.errorCode = code;
+ this.arguments = arguments;
+ }
- public ErrorCodeException(Throwable source, int code, String debugMessage) {
- this(source, code, debugMessage, null);
- }
+ public ErrorCodeException(Throwable source, int code) {
+ this(source, code, (String[]) null);
+ }
- public ErrorCodeException(Throwable source, int code, String debugMessage, String[] arguments) {
- super(debugMessage, source);
- this.errorCode = code;
- this.arguments = arguments;
- }
+ /**
+ * error code exception.
+ * @param source Throwable
+ * @param code error code
+ * @param arguments arguments
+ */
+ public ErrorCodeException(Throwable source, int code, String[] arguments) {
+ super(source);
+ this.errorCode = code;
+ this.arguments = arguments;
+ }
- public ErrorCodeException(int category, int code, String debugMessage) {
- this(category, code, debugMessage, null);
- }
+ public ErrorCodeException(Throwable source, int code, String debugMessage) {
+ this(source, code, debugMessage, null);
+ }
+ /**
+ * error code exception.
+ * @param source Throwable
+ * @param code error code
+ * @param debugMessage debug message
+ * @param arguments arguments
+ */
+ public ErrorCodeException(Throwable source, int code, String debugMessage, String[] arguments) {
+ super(debugMessage, source);
+ this.errorCode = code;
+ this.arguments = arguments;
+ }
- public ErrorCodeException(int category, int code, String debugMessage, String[] arguments) {
- super(debugMessage);
- this.categoryCode = category;
- this.errorCode = code;
- this.arguments = arguments;
- }
+ public ErrorCodeException(int category, int code, String debugMessage) {
+ this(category, code, debugMessage, null);
+ }
- public ErrorCodeException(Throwable source, int category, int code) {
- this(source, category, code, (String[]) null);
- }
+ public ErrorCodeException(int category, int code, String debugMessage, String[] arguments) {
+ super(debugMessage);
+ this.categoryCode = category;
+ this.errorCode = code;
+ this.arguments = arguments;
+ }
- public ErrorCodeException(Throwable source, int category, int code, String[] arguments) {
- super(source);
- this.categoryCode = category;
- this.errorCode = code;
- this.arguments = arguments;
- }
+ public ErrorCodeException(Throwable source, int category, int code) {
+ this(source, category, code, (String[]) null);
+ }
- public ErrorCodeException(Throwable source, int category, int code, String debugMessage) {
- this(source, category, code, debugMessage, null);
- }
+ public ErrorCodeException(Throwable source, int category, int code, String[] arguments) {
+ super(source);
+ this.categoryCode = category;
+ this.errorCode = code;
+ this.arguments = arguments;
+ }
- public ErrorCodeException(Throwable source, int category, int code, String debugMessage,
- String[] arguments) {
- super(debugMessage, source);
- this.categoryCode = category;
- this.errorCode = code;
- this.arguments = arguments;
- }
+ public ErrorCodeException(Throwable source, int category, int code, String debugMessage) {
+ this(source, category, code, debugMessage, null);
+ }
- public int getCategory() {
- return categoryCode;
- }
- public int getErrorCode() {
- return errorCode;
- }
+ public ErrorCodeException(Throwable source, int category, int code, String debugMessage,
+ String[] arguments) {
+ super(debugMessage, source);
+ this.categoryCode = category;
+ this.errorCode = code;
+ this.arguments = arguments;
+ }
- public String[] getArguments() {
- return arguments;
- }
+ public int getCategory() {
+ return categoryCode;
+ }
+
+ public int getErrorCode() {
+ return errorCode;
+ }
+
+
+ public String[] getArguments() {
+ return arguments;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+package org.openo.commontosca.catalog.db.resource;
import org.openo.commontosca.catalog.db.common.Parameters;
+import org.openo.commontosca.catalog.db.entity.PackageData;
+import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
+
import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.util.CatalogDbUtil;
import org.openo.commontosca.catalog.db.util.HqlFactory;
-import org.openo.commontosca.catalog.db.entity.PackageData;
-import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
import org.openo.commontosca.catalog.db.wrapper.PackageHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
public class PackageManager {
- private static final Logger LOGGER = LoggerFactory.getLogger(PackageManager.class);
- private static PackageManager manager;
- PackageHandler handler = new PackageHandler();
-
- public synchronized static PackageManager getInstance() {
- if (manager == null) {
- manager = new PackageManager();
- }
- return manager;
+ private static final Logger LOGGER = LoggerFactory.getLogger(PackageManager.class);
+ private static PackageManager manager;
+ PackageHandler handler = new PackageHandler();
+
+ /**
+ * get PackageManager instance.
+ * @return PackageManager instance
+ */
+ public static synchronized PackageManager getInstance() {
+ if (manager == null) {
+ manager = new PackageManager();
}
+ return manager;
+ }
- private PackageManager() {}
+ private PackageManager() {}
- public PackageData addPackage(PackageData packageData) throws CatalogResourceException {
- LOGGER.info("start add package info to db.info:"
- + CatalogDbUtil.objectToString(packageData));
- PackageData data = handler.create(packageData);
- LOGGER.info(" package info to db end.info:" + CatalogDbUtil.objectToString(data));
- return data;
- }
+ /**
+ * add package.
+ * @param packageData package data
+ * @return PackageData
+ * @throws CatalogResourceException e
+ */
+ public PackageData addPackage(PackageData packageData) throws CatalogResourceException {
+ LOGGER.info("start add package info to db.info:" + CatalogDbUtil.objectToString(packageData));
+ PackageData data = handler.create(packageData);
+ LOGGER.info(" package info to db end.info:" + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- public ArrayList<PackageData> queryPackageByCsarId(String package_csarId)
- throws CatalogResourceException {
- Map<String, String> queryParam = new HashMap<String, String>();
- queryParam.put(Parameters.csarId.name(), package_csarId);
- LOGGER.info("start query package info by csarid." + package_csarId);
- ArrayList<PackageData> data = handler.query(queryParam);
- LOGGER.info("query package info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
- }
+ /**
+ * query package by package id.
+ * @param csarId package id
+ * @return package data list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<PackageData> queryPackageByCsarId(String csarId)
+ throws CatalogResourceException {
+ Map<String, String> queryParam = new HashMap<String, String>();
+ queryParam.put(Parameters.csarId.name(), csarId);
+ LOGGER.info("start query package info by csarid." + csarId);
+ ArrayList<PackageData> data = handler.query(queryParam);
+ LOGGER.info("query package info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- public ArrayList<PackageData> queryPackage(String name, String provider, String version,
- String deletionPending, String type) throws CatalogResourceException {
- LOGGER.info("start query package info.name:" + name + " provider:" + provider + " version:"
- + version + " type:" + type);
- Map<String, String> queryParam = new HashMap<String, String>();
- if (CatalogDbUtil.isNotEmpty(name))
- queryParam.put(Parameters.name.name(), name);
- if (CatalogDbUtil.isNotEmpty(version))
- queryParam.put(Parameters.version.name(), version);
- if (CatalogDbUtil.isNotEmpty(deletionPending))
- queryParam.put(Parameters.deletionPending.name(), deletionPending);
- if (CatalogDbUtil.isNotEmpty(type))
- queryParam.put(Parameters.type.name(), type);
- if (CatalogDbUtil.isNotEmpty(provider))
- queryParam.put(Parameters.provider.name(), provider);
- ArrayList<PackageData> data = handler.query(queryParam);
- LOGGER.info("query package info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
+ /**
+ * query package by condition.
+ * @param name package name
+ * @param provider package provider
+ * @param version package version
+ * @param deletionPending deletionPending
+ * @param type package type
+ * @return package data list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<PackageData> queryPackage(String name, String provider, String version,
+ String deletionPending, String type) throws CatalogResourceException {
+ LOGGER.info("start query package info.name:" + name + " provider:" + provider + " version:"
+ + version + " type:" + type);
+ Map<String, String> queryParam = new HashMap<String, String>();
+ if (CatalogDbUtil.isNotEmpty(name)) {
+ queryParam.put(Parameters.name.name(), name);
}
-
- public void deletePackage(String package_oid) throws CatalogResourceException {
- LOGGER.info("start delete package info by id." + package_oid);
- handler.delete(package_oid);
- LOGGER.info(" delete package info end id." + package_oid);
+ if (CatalogDbUtil.isNotEmpty(version)) {
+ queryParam.put(Parameters.version.name(), version);
}
-
- public void deletePackageByServiceTemplateId(String serviceTemplateId)
- throws CatalogResourceException {
- LOGGER.info("start delete package info by serviceTemplateid." + serviceTemplateId);
- ServiceTemplateData serviceTemplate = new ServiceTemplateData();
- serviceTemplate.setServiceTemplateId(serviceTemplateId);
- String filter =
- HqlFactory.getDeleteHqlByFilter(PackageData.class, serviceTemplate,
- Parameters.csarId.name());
- int data = handler.unionDelete(filter);
-
- LOGGER.info("delete serviceTemplate info end.num:" + data);
+ if (CatalogDbUtil.isNotEmpty(deletionPending)) {
+ queryParam.put(Parameters.deletionPending.name(), deletionPending);
}
-
- public ArrayList<PackageData> queryPackageByServiceTemplateId(String serviceTemplateId)
- throws CatalogResourceException {
- LOGGER.info("start query package info by serviceTemplateid." + serviceTemplateId);
- ServiceTemplateData serviceTemplate = new ServiceTemplateData();
- serviceTemplate.setServiceTemplateId(serviceTemplateId);
- String filter =
- HqlFactory.getQueryHqlByFilter(PackageData.class, serviceTemplate,
- Parameters.csarId.name());
- ArrayList<PackageData> data = handler.unionQuery(filter);
- LOGGER.info("query package info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
+ if (CatalogDbUtil.isNotEmpty(type)) {
+ queryParam.put(Parameters.type.name(), type);
}
-
- public void updatePackage(PackageData packageData, String csarId)
- throws CatalogResourceException {
- LOGGER.info("start update package info by id." + csarId + " info:"
- + CatalogDbUtil.objectToString(packageData));
- handler.update(packageData, csarId);
- LOGGER.info(" update package end id." + csarId);
+ if (CatalogDbUtil.isNotEmpty(provider)) {
+ queryParam.put(Parameters.provider.name(), provider);
}
+ ArrayList<PackageData> data = handler.query(queryParam);
+ LOGGER.info("query package info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
+
+ /**
+ * delete package according package id.
+ * @param packageId package id
+ * @throws CatalogResourceException e
+ */
+ public void deletePackage(String packageId) throws CatalogResourceException {
+ LOGGER.info("start delete package info by id." + packageId);
+ handler.delete(packageId);
+ LOGGER.info(" delete package info end id." + packageId);
+ }
+
+ /**
+ * delete package by service template id.
+ * @param serviceTemplateId service template id
+ * @throws CatalogResourceException e
+ */
+ public void deletePackageByServiceTemplateId(String serviceTemplateId)
+ throws CatalogResourceException {
+ LOGGER.info("start delete package info by serviceTemplateid." + serviceTemplateId);
+ ServiceTemplateData serviceTemplate = new ServiceTemplateData();
+ serviceTemplate.setServiceTemplateId(serviceTemplateId);
+ String filter =
+ HqlFactory.getDeleteHqlByFilter(PackageData.class, serviceTemplate,
+ Parameters.csarId.name());
+ int data = handler.unionDelete(filter);
+
+ LOGGER.info("delete serviceTemplate info end.num:" + data);
+ }
+
+ /**
+ * query package by service template id.
+ * @param serviceTemplateId service template id
+ * @return package data list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<PackageData> queryPackageByServiceTemplateId(String serviceTemplateId)
+ throws CatalogResourceException {
+ LOGGER.info("start query package info by serviceTemplateid." + serviceTemplateId);
+ ServiceTemplateData serviceTemplate = new ServiceTemplateData();
+ serviceTemplate.setServiceTemplateId(serviceTemplateId);
+ String filter =
+ HqlFactory
+ .getQueryHqlByFilter(PackageData.class, serviceTemplate, Parameters.csarId.name());
+ ArrayList<PackageData> data = handler.unionQuery(filter);
+ LOGGER.info("query package info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
+
+ /**
+ * update package data.
+ *
+ * @param packageData package data
+ * @param csarId package id
+ * @throws CatalogResourceException e
+ */
+ public void updatePackage(PackageData packageData, String csarId)
+ throws CatalogResourceException {
+ LOGGER.info("start update package info by id." + csarId + " info:"
+ + CatalogDbUtil.objectToString(packageData));
+ handler.update(packageData, csarId);
+ LOGGER.info(" update package end id." + csarId);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.resource;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+package org.openo.commontosca.catalog.db.resource;
import org.openo.commontosca.catalog.db.common.Parameters;
+import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
+import org.openo.commontosca.catalog.db.entity.PackageData;
+import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
import org.openo.commontosca.catalog.db.entity.ServiceTemplateMappingData;
import org.openo.commontosca.catalog.db.entity.TemplateData;
import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.util.CatalogDbUtil;
import org.openo.commontosca.catalog.db.util.HqlFactory;
+import org.openo.commontosca.catalog.db.wrapper.NodeTemplateHandler;
import org.openo.commontosca.catalog.db.wrapper.ServiceTemplateHandler;
import org.openo.commontosca.catalog.db.wrapper.ServiceTemplateMappingHandler;
import org.openo.commontosca.catalog.db.wrapper.TemplateHandler;
-import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
-import org.openo.commontosca.catalog.db.entity.PackageData;
-import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
-import org.openo.commontosca.catalog.db.wrapper.NodeTemplateHandler;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
public class TemplateManager {
- private static final Logger LOGGER = LoggerFactory.getLogger(TemplateManager.class);
- private static TemplateManager manager;
- ServiceTemplateHandler handler = new ServiceTemplateHandler();
- NodeTemplateHandler nodeTemplateHandler = new NodeTemplateHandler();
- TemplateHandler templateHandler = new TemplateHandler();
- ServiceTemplateMappingHandler mappingHandler = new ServiceTemplateMappingHandler();
-
- public synchronized static TemplateManager getInstance() {
- if (manager == null) {
- manager = new TemplateManager();
- }
- return manager;
+ private static final Logger LOGGER = LoggerFactory.getLogger(TemplateManager.class);
+ private static TemplateManager manager;
+ ServiceTemplateHandler handler = new ServiceTemplateHandler();
+ NodeTemplateHandler nodeTemplateHandler = new NodeTemplateHandler();
+ TemplateHandler templateHandler = new TemplateHandler();
+ ServiceTemplateMappingHandler mappingHandler = new ServiceTemplateMappingHandler();
+
+ /**
+ * get TemplateManager instance.
+ * @return TemplateManager instance
+ */
+ public static synchronized TemplateManager getInstance() {
+ if (manager == null) {
+ manager = new TemplateManager();
}
+ return manager;
+ }
- private TemplateManager() {}
+ private TemplateManager() {}
- public TemplateData addServiceTemplate(TemplateData templateData)
- throws CatalogResourceException {
- LOGGER.info("start add template info to db.info:"
- + CatalogDbUtil.objectToString(templateData));
- TemplateData data = templateHandler.create(templateData);
- LOGGER.info(" template info to db end.info:" + CatalogDbUtil.objectToString(data));
- return data;
- }
+ /**
+ * add service template.
+ *
+ * @param templateData TemplateData
+ * @return TemplateData
+ * @throws CatalogResourceException e
+ */
+ public TemplateData addServiceTemplate(TemplateData templateData)
+ throws CatalogResourceException {
+ LOGGER
+ .info("start add template info to db.info:" + CatalogDbUtil.objectToString(templateData));
+ TemplateData data = templateHandler.create(templateData);
+ LOGGER.info(" template info to db end.info:" + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- public ServiceTemplateMappingData addServiceTemplateMapping(
- ServiceTemplateMappingData templateMappingData) throws CatalogResourceException {
- LOGGER.info("start add servicetemplate Mapping info to db.info:"
- + CatalogDbUtil.objectToString(templateMappingData));
- ServiceTemplateMappingData data = mappingHandler.create(templateMappingData);
- LOGGER.info(" template mapping info to db end.info:" + CatalogDbUtil.objectToString(data));
- return data;
- }
+ /**
+ * add service template mapping.
+ * @param templateMappingData mapping data
+ * @return ServiceTemplateMappingData
+ * @throws CatalogResourceException e
+ */
+ public ServiceTemplateMappingData addServiceTemplateMapping(
+ ServiceTemplateMappingData templateMappingData) throws CatalogResourceException {
+ LOGGER.info("start add servicetemplate Mapping info to db.info:"
+ + CatalogDbUtil.objectToString(templateMappingData));
+ ServiceTemplateMappingData data = mappingHandler.create(templateMappingData);
+ LOGGER.info(" template mapping info to db end.info:" + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- public ArrayList<ServiceTemplateMappingData> queryServiceTemplateMappingById(String id)
- throws CatalogResourceException {
- Map<String, String> queryParam = new HashMap<String, String>();
- queryParam.put(Parameters.mappingId.name(), id);
- LOGGER.info("start query serviceTemplateMapping info by id." + id);
- ArrayList<ServiceTemplateMappingData> data = mappingHandler.query(queryParam);
- LOGGER.info("query serviceTemplateMapping info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
- }
+ /**
+ * query service template mapping by id.
+ * @param id id
+ * @return ServiceTemplateMappingData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<ServiceTemplateMappingData> queryServiceTemplateMappingById(String id)
+ throws CatalogResourceException {
+ Map<String, String> queryParam = new HashMap<String, String>();
+ queryParam.put(Parameters.mappingId.name(), id);
+ LOGGER.info("start query serviceTemplateMapping info by id." + id);
+ ArrayList<ServiceTemplateMappingData> data = mappingHandler.query(queryParam);
+ LOGGER.info("query serviceTemplateMapping info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- public void deleteServiceTemplateMappingById(String id) throws CatalogResourceException {
+ /**
+ * delete service template mapping by id.
+ * @param id id
+ * @throws CatalogResourceException e
+ */
+ public void deleteServiceTemplateMappingById(String id) throws CatalogResourceException {
- LOGGER.info("start delete serviceTemplateMapping info by id." + id);
- mappingHandler.delete(id);
- LOGGER.info("delete serviceTemplateMapping info end");
- }
+ LOGGER.info("start delete serviceTemplateMapping info by id." + id);
+ mappingHandler.delete(id);
+ LOGGER.info("delete serviceTemplateMapping info end");
+ }
- public void deleteServiceTemplateMapping(String nodeType, String serviceTemplateId)
- throws CatalogResourceException {
- Map<String, String> delParam = new HashMap<String, String>();
- if (CatalogDbUtil.isNotEmpty(nodeType))
- delParam.put(Parameters.nodeType.name(), nodeType);
- if (CatalogDbUtil.isNotEmpty(serviceTemplateId))
- delParam.put(Parameters.serviceTemplateId.name(), serviceTemplateId);
- LOGGER.info("start delete serviceTemplateMapping info.nodeType:" + nodeType
- + " serviceTemplateId:" + serviceTemplateId);
- mappingHandler.delete(delParam);
- LOGGER.info("delete serviceTemplateMapping info ");
+ /**
+ * delete service template mapping.
+ * @param nodeType node type
+ * @param serviceTemplateId service template id
+ * @throws CatalogResourceException e
+ */
+ public void deleteServiceTemplateMapping(String nodeType, String serviceTemplateId)
+ throws CatalogResourceException {
+ Map<String, String> delParam = new HashMap<String, String>();
+ if (CatalogDbUtil.isNotEmpty(nodeType)) {
+ delParam.put(Parameters.nodeType.name(), nodeType);
}
-
- public ArrayList<ServiceTemplateMappingData> queryServiceTemplateMapping(String nodeType,
- String serviceTemplateId) throws CatalogResourceException {
- Map<String, String> queryParam = new HashMap<String, String>();
- if (CatalogDbUtil.isNotEmpty(nodeType))
- queryParam.put(Parameters.nodeType.name(), nodeType);
- if (CatalogDbUtil.isNotEmpty(serviceTemplateId))
- queryParam.put(Parameters.serviceTemplateId.name(), serviceTemplateId);
- LOGGER.info("start query serviceTemplateMapping info.nodeType:" + nodeType
- + " serviceTemplateId:" + serviceTemplateId);
- ArrayList<ServiceTemplateMappingData> data = mappingHandler.query(queryParam);
- LOGGER.info("query serviceTemplateMapping info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
+ if (CatalogDbUtil.isNotEmpty(serviceTemplateId)) {
+ delParam.put(Parameters.serviceTemplateId.name(), serviceTemplateId);
}
+ LOGGER.info("start delete serviceTemplateMapping info.nodeType:" + nodeType
+ + " serviceTemplateId:" + serviceTemplateId);
+ mappingHandler.delete(delParam);
+ LOGGER.info("delete serviceTemplateMapping info ");
+ }
- public ArrayList<ServiceTemplateData> queryServiceTemplateById(String id)
- throws CatalogResourceException {
- Map<String, String> queryParam = new HashMap<String, String>();
- queryParam.put(Parameters.serviceTemplateId.name(), id);
- LOGGER.info("start query serviceTemplate info by id." + id);
- ArrayList<ServiceTemplateData> data = handler.query(queryParam);
- LOGGER.info("query serviceTemplate info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
+ /**
+ * query service template mapping.
+ * @param nodeType nodeType
+ * @param serviceTemplateId serviceTemplateId
+ * @return ServiceTemplateMappingData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<ServiceTemplateMappingData> queryServiceTemplateMapping(String nodeType,
+ String serviceTemplateId) throws CatalogResourceException {
+ Map<String, String> queryParam = new HashMap<String, String>();
+ if (CatalogDbUtil.isNotEmpty(nodeType)) {
+ queryParam.put(Parameters.nodeType.name(), nodeType);
}
-
- public ArrayList<ServiceTemplateData> queryServiceTemplate(String type, String version,
- String vendor) throws CatalogResourceException {
- LOGGER.info("start query serviceTemplate info.type:" + type + " vendor:" + vendor
- + " version:" + version);
- Map<String, String> queryParam = new HashMap<String, String>();
- if (CatalogDbUtil.isNotEmpty(type))
- queryParam.put(Parameters.type.name(), type);
- if (CatalogDbUtil.isNotEmpty(vendor))
- queryParam.put(Parameters.vendor.name(), vendor);
- if (CatalogDbUtil.isNotEmpty(version))
- queryParam.put(Parameters.version.name(), version);
- ArrayList<ServiceTemplateData> data = handler.query(queryParam);
- LOGGER.info("query serviceTemplate info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
+ if (CatalogDbUtil.isNotEmpty(serviceTemplateId)) {
+ queryParam.put(Parameters.serviceTemplateId.name(), serviceTemplateId);
}
+ LOGGER.info("start query serviceTemplateMapping info.nodeType:" + nodeType
+ + " serviceTemplateId:" + serviceTemplateId);
+ ArrayList<ServiceTemplateMappingData> data = mappingHandler.query(queryParam);
+ LOGGER.info("query serviceTemplateMapping info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- public ArrayList<NodeTemplateData> queryNodeTemplateBySeriviceTemplateId(
- String serviceTemplateId) throws CatalogResourceException {
- LOGGER.info("start query NodeTemplate info.serviceTemplateId:" + serviceTemplateId);
- Map<String, String> queryParam = new HashMap<String, String>();
- queryParam.put(Parameters.serviceTemplateId.name(), serviceTemplateId);
- ArrayList<NodeTemplateData> data = nodeTemplateHandler.query(queryParam);
- LOGGER.info("query NodeTemplate info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
- }
+ /**
+ * query service template by id.
+ * @param id service template id
+ * @return ServiceTemplateData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<ServiceTemplateData> queryServiceTemplateById(String id)
+ throws CatalogResourceException {
+ Map<String, String> queryParam = new HashMap<String, String>();
+ queryParam.put(Parameters.serviceTemplateId.name(), id);
+ LOGGER.info("start query serviceTemplate info by id." + id);
+ ArrayList<ServiceTemplateData> data = handler.query(queryParam);
+ LOGGER.info("query serviceTemplate info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- public ArrayList<NodeTemplateData> queryNodeTemplateById(String serviceTemplateId,
- String nodeTemplateId) throws CatalogResourceException {
- LOGGER.info("start query NodeTemplate info.serviceTemplateId:" + serviceTemplateId
- + "nodeTemplateId:" + nodeTemplateId);
- Map<String, String> queryParam = new HashMap<String, String>();
- if (CatalogDbUtil.isNotEmpty(serviceTemplateId))
- queryParam.put(Parameters.serviceTemplateId.name(), serviceTemplateId);
- if (CatalogDbUtil.isNotEmpty(nodeTemplateId))
- queryParam.put(Parameters.nodeTemplateId.name(), nodeTemplateId);
- ArrayList<NodeTemplateData> data = nodeTemplateHandler.query(queryParam);
- LOGGER.info("query NodeTemplate info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
+ /**
+ * query service template according to condition.
+ * @param type template type
+ * @param version template version
+ * @param vendor template vendor
+ * @return ServiceTemplateData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<ServiceTemplateData> queryServiceTemplate(String type, String version,
+ String vendor) throws CatalogResourceException {
+ LOGGER.info("start query serviceTemplate info.type:" + type + " vendor:" + vendor + " version:"
+ + version);
+ Map<String, String> queryParam = new HashMap<String, String>();
+ if (CatalogDbUtil.isNotEmpty(type)) {
+ queryParam.put(Parameters.type.name(), type);
}
-
- public ArrayList<ServiceTemplateData> queryServiceTemplateByCsarPackageInfo(
- PackageData packageInfo) throws CatalogResourceException {
- LOGGER.info("start query serviceTemplate info by package.package:"
- + CatalogDbUtil.objectToString(packageInfo));
- String filter =
- HqlFactory.getQueryHqlByFilter(ServiceTemplateData.class, packageInfo,
- Parameters.csarId.name());
- ArrayList<ServiceTemplateData> data = handler.unionQuery(filter);
- LOGGER.info("query serviceTemplate info end.size:" + data.size() + "detail:"
- + CatalogDbUtil.objectToString(data));
- return data;
+ if (CatalogDbUtil.isNotEmpty(vendor)) {
+ queryParam.put(Parameters.vendor.name(), vendor);
+ }
+ if (CatalogDbUtil.isNotEmpty(version)) {
+ queryParam.put(Parameters.version.name(), version);
}
+ ArrayList<ServiceTemplateData> data = handler.query(queryParam);
+ LOGGER.info("query serviceTemplate info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- public void deleteServiceTemplateById(String serviceTemplateId) throws CatalogResourceException {
- LOGGER.info("start delete serviceTemplate info.id:" + serviceTemplateId);
- ArrayList<NodeTemplateData> nodeTemplateList =
- queryNodeTemplateBySeriviceTemplateId(serviceTemplateId);
- templateHandler.delete(serviceTemplateId, nodeTemplateList);
- LOGGER.info(" delete serviceTemplate info end id." + serviceTemplateId);
+ /**
+ * query node template service template id.
+ * @param serviceTemplateId service template id
+ * @return NodeTemplateData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<NodeTemplateData> queryNodeTemplateBySeriviceTemplateId(String serviceTemplateId)
+ throws CatalogResourceException {
+ LOGGER.info("start query NodeTemplate info.serviceTemplateId:" + serviceTemplateId);
+ Map<String, String> queryParam = new HashMap<String, String>();
+ queryParam.put(Parameters.serviceTemplateId.name(), serviceTemplateId);
+ ArrayList<NodeTemplateData> data = nodeTemplateHandler.query(queryParam);
+ LOGGER.info("query NodeTemplate info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
+
+ /**
+ * query node template by id.
+ * @param serviceTemplateId service template id
+ * @param nodeTemplateId nodetemplate id
+ * @return NodeTemplateData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<NodeTemplateData> queryNodeTemplateById(String serviceTemplateId,
+ String nodeTemplateId) throws CatalogResourceException {
+ LOGGER.info("start query NodeTemplate info.serviceTemplateId:" + serviceTemplateId
+ + "nodeTemplateId:" + nodeTemplateId);
+ Map<String, String> queryParam = new HashMap<String, String>();
+ if (CatalogDbUtil.isNotEmpty(serviceTemplateId)) {
+ queryParam.put(Parameters.serviceTemplateId.name(), serviceTemplateId);
+ }
+ if (CatalogDbUtil.isNotEmpty(nodeTemplateId)) {
+ queryParam.put(Parameters.nodeTemplateId.name(), nodeTemplateId);
}
+ ArrayList<NodeTemplateData> data = nodeTemplateHandler.query(queryParam);
+ LOGGER.info("query NodeTemplate info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- public void deleteServiceTemplateByCsarPackageInfo(PackageData packageInfo)
- throws CatalogResourceException {
- LOGGER.info("start delete serviceTemplate info by package.package:"
- + CatalogDbUtil.objectToString(packageInfo));
+ /**
+ * query service template by package infomation.
+ * @param packageInfo package information
+ * @return ServiceTemplateData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<ServiceTemplateData> queryServiceTemplateByCsarPackageInfo(
+ PackageData packageInfo) throws CatalogResourceException {
+ LOGGER.info("start query serviceTemplate info by package.package:"
+ + CatalogDbUtil.objectToString(packageInfo));
+ String filter =
+ HqlFactory.getQueryHqlByFilter(ServiceTemplateData.class, packageInfo,
+ Parameters.csarId.name());
+ ArrayList<ServiceTemplateData> data = handler.unionQuery(filter);
+ LOGGER.info("query serviceTemplate info end.size:" + data.size() + "detail:"
+ + CatalogDbUtil.objectToString(data));
+ return data;
+ }
- ArrayList<ServiceTemplateData> serviceTemplate =
- queryServiceTemplateByCsarPackageInfo(packageInfo);
- for (int i = 0; i < serviceTemplate.size(); i++) {
- deleteServiceTemplateById(serviceTemplate.get(i).getServiceTemplateId());
- }
- LOGGER.info("delete serviceTemplate info end.");
+ /**
+ * delete service template by id.
+ * @param serviceTemplateId service template id
+ * @throws CatalogResourceException e
+ */
+ public void deleteServiceTemplateById(String serviceTemplateId) throws CatalogResourceException {
+ LOGGER.info("start delete serviceTemplate info.id:" + serviceTemplateId);
+ ArrayList<NodeTemplateData> nodeTemplateList =
+ queryNodeTemplateBySeriviceTemplateId(serviceTemplateId);
+ templateHandler.delete(serviceTemplateId, nodeTemplateList);
+ LOGGER.info(" delete serviceTemplate info end id." + serviceTemplateId);
+ }
+ /**
+ * delete service template by package info.
+ * @param packageInfo package information
+ * @throws CatalogResourceException e
+ */
+ public void deleteServiceTemplateByCsarPackageInfo(PackageData packageInfo)
+ throws CatalogResourceException {
+ LOGGER.info("start delete serviceTemplate info by package.package:"
+ + CatalogDbUtil.objectToString(packageInfo));
+
+ ArrayList<ServiceTemplateData> serviceTemplate =
+ queryServiceTemplateByCsarPackageInfo(packageInfo);
+ for (int i = 0; i < serviceTemplate.size(); i++) {
+ deleteServiceTemplateById(serviceTemplate.get(i).getServiceTemplateId());
}
+ LOGGER.info("delete serviceTemplate info end.");
+
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.util;
-import java.util.UUID;
+package org.openo.commontosca.catalog.db.util;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import com.google.gson.Gson;
-public class CatalogDbUtil {
- private final static Logger logger = LoggerFactory.getLogger(CatalogDbUtil.class);
+import java.util.UUID;
- public static String generateId() {
- return UUID.randomUUID().toString();
- }
- public static boolean isNotEmpty(String s) {
- return s != null && !"".equals(s) && s.length() > 0;
- }
+public class CatalogDbUtil {
- public static String objectToString(Object obj) {
- Gson gson = new Gson();
- if (obj != null)
- return gson.toJson(obj);
- else
- return null;
+ public static String generateId() {
+ return UUID.randomUUID().toString();
+ }
+
+ public static boolean isNotEmpty(String str) {
+ return str != null && !"".equals(str) && str.length() > 0;
+ }
+
+ /**
+ * exchange object to string.
+ * @param obj Object
+ * @return string
+ */
+ public static String objectToString(Object obj) {
+ Gson gson = new Gson();
+ if (obj != null) {
+ return gson.toJson(obj);
+ } else {
+ return null;
}
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.util;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.lang.reflect.Field;
import java.lang.reflect.Method;
import java.util.Arrays;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
/**
- * a tool class for creating Hibernate's HQL
- *
- * *@author 10159474
+ * a tool class for creating Hibernate's HQL.
*
*/
public class HqlFactory {
- private final static Logger logger = LoggerFactory.getLogger(HqlFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(HqlFactory.class);
- /**
- * @param obj the object that used to be generate the hql
- * @param excludeProperties the properties that need not to be used
- * @param filter the condition after "where"
- * @return hibernate hql
- */
- public static String getUpdateHql(Object obj, String[] excludeProperties, String filter) {
- StringBuffer hql = new StringBuffer();
- String objName = obj.getClass().getSimpleName();
- hql.append("update ");
- hql.append(objName);
- hql.append(" set ");
- Field[] fields = obj.getClass().getDeclaredFields();
- if (obj.getClass().getGenericSuperclass() != null) {
- Field[] parentFields = obj.getClass().getSuperclass().getDeclaredFields();
- fields = concat(fields, parentFields);
- }
- for (Field field : fields) {
- String name = field.getName();
- Method method = null;
- Object value = null;
- if (!contain(excludeProperties, name)) {
- String upperName = name.substring(0, 1).toUpperCase() + name.substring(1);
- try {
- method = obj.getClass().getMethod("get" + upperName);
- value = method.invoke(obj);
- if (value != null) {
- if (value instanceof String) {
- hql.append(name);
- hql.append("=");
- hql.append("'");
- hql.append(value);
- hql.append("'");
- hql.append(",");
- } else {
- hql.append(name);
- hql.append("=");
- hql.append(value);
- hql.append(",");
- }
- }
- } catch (Exception e) {
- logger.error("error while creating update hql", e);
- }
+ /**
+ * get update hql.
+ * @param obj the object that used to be generate the hql
+ * @param excludeProperties the properties that need not to be used
+ * @param filter the condition after "where"
+ * @return hibernate hql
+ */
+ public static String getUpdateHql(Object obj, String[] excludeProperties, String filter) {
+ StringBuffer hql = new StringBuffer();
+ String objName = obj.getClass().getSimpleName();
+ hql.append("update ");
+ hql.append(objName);
+ hql.append(" set ");
+ Field[] fields = obj.getClass().getDeclaredFields();
+ if (obj.getClass().getGenericSuperclass() != null) {
+ Field[] parentFields = obj.getClass().getSuperclass().getDeclaredFields();
+ fields = concat(fields, parentFields);
+ }
+ for (Field field : fields) {
+ String name = field.getName();
+ Method method = null;
+ Object value = null;
+ if (!contain(excludeProperties, name)) {
+ String upperName = name.substring(0, 1).toUpperCase() + name.substring(1);
+ try {
+ method = obj.getClass().getMethod("get" + upperName);
+ value = method.invoke(obj);
+ if (value != null) {
+ if (value instanceof String) {
+ hql.append(name);
+ hql.append("=");
+ hql.append("'");
+ hql.append(value);
+ hql.append("'");
+ hql.append(",");
+ } else {
+ hql.append(name);
+ hql.append("=");
+ hql.append(value);
+ hql.append(",");
}
+ }
+ } catch (Exception e1) {
+ logger.error("error while creating update hql", e1);
}
+ }
+ }
- String sql = hql.toString();
- sql = sql.substring(0, sql.lastIndexOf(","));
- if (filter != null)
- sql = sql + " where " + filter;
- logger.info("update hql is : " + sql);
- return sql;
+ String sql = hql.toString();
+ sql = sql.substring(0, sql.lastIndexOf(","));
+ if (filter != null) {
+ sql = sql + " where " + filter;
}
+ logger.info("update hql is : " + sql);
+ return sql;
+ }
- public static boolean contain(String[] src, String target) {
- if (src == null || src.length == 0 || target == null)
- return false;
- else {
- for (String str : src) {
- if (str.equals(target))
- return true;
- }
+ /**
+ * judge wether target contains src.
+ * @param src String[]
+ * @param target String
+ * @return boolean
+ */
+ public static boolean contain(String[] src, String target) {
+ if (src == null || src.length == 0 || target == null) {
+ return false;
+ } else {
+ for (String str : src) {
+ if(str.equals(target)){
+ return true;
}
- return false;
+ }
}
+ return false;
+ }
- public static <T> T[] concat(T[] first, T[] second) {
- T[] result = Arrays.copyOf(first, first.length + second.length);
- System.arraycopy(second, 0, result, first.length, second.length);
- return result;
- }
+ /**
+ * concat two array.
+ * @param first first array
+ * @param second second array
+ * @return T
+ */
+ public static <T> T[] concat(T[] first, T[] second) {
+ T[] result = Arrays.copyOf(first, first.length + second.length);
+ System.arraycopy(second, 0, result, first.length, second.length);
+ return result;
+ }
- public static String getOidFilter(String key, String value) {
- return key + "= '" + value + "'";
- }
+ public static String getOidFilter(String key, String value) {
+ return key + "= '" + value + "'";
+ }
- public static String getQueryHql(Object data, String column) {
- StringBuffer hql = new StringBuffer();
- String objName = data.getClass().getSimpleName();
- hql.append("select q.");
- hql.append(column);
- hql.append(" from ");
- hql.append(objName);
- hql.append(" as q where ");
- Field[] fields = data.getClass().getDeclaredFields();
- if (data.getClass().getGenericSuperclass() != null) {
- Field[] parentFields = data.getClass().getSuperclass().getDeclaredFields();
- fields = concat(fields, parentFields);
- }
- for (Field field : fields) {
- String name = field.getName();
- Method method = null;
- Object value = null;
- String upperName = name.substring(0, 1).toUpperCase() + name.substring(1);
- try {
- method = data.getClass().getMethod("get" + upperName);
- value = method.invoke(data);
- if (value != null) {
- if (value instanceof String) {
- hql.append("q." + name);
- hql.append("=");
- hql.append("'");
- hql.append(value);
- hql.append("'");
- hql.append(" and ");
- } else {
- hql.append("q." + name);
- hql.append("=");
- hql.append(value);
- hql.append("and ");
- }
- }
- } catch (Exception e) {
- logger.error("error while creating update hql", e);
- }
+ /**
+ * get query hql.
+ * @param data Object
+ * @param column String
+ * @return String
+ */
+ public static String getQueryHql(Object data, String column) {
+ StringBuffer hql = new StringBuffer();
+ String objName = data.getClass().getSimpleName();
+ hql.append("select q.");
+ hql.append(column);
+ hql.append(" from ");
+ hql.append(objName);
+ hql.append(" as q where ");
+ Field[] fields = data.getClass().getDeclaredFields();
+ if (data.getClass().getGenericSuperclass() != null) {
+ Field[] parentFields = data.getClass().getSuperclass().getDeclaredFields();
+ fields = concat(fields, parentFields);
+ }
+ for (Field field : fields) {
+ String name = field.getName();
+ Method method = null;
+ Object value = null;
+ String upperName = name.substring(0, 1).toUpperCase() + name.substring(1);
+ try {
+ method = data.getClass().getMethod("get" + upperName);
+ value = method.invoke(data);
+ if (value != null) {
+ if (value instanceof String) {
+ hql.append("q." + name);
+ hql.append("=");
+ hql.append("'");
+ hql.append(value);
+ hql.append("'");
+ hql.append(" and ");
+ } else {
+ hql.append("q." + name);
+ hql.append("=");
+ hql.append(value);
+ hql.append("and ");
+ }
}
- String sql = hql.toString();
- sql = sql.substring(0, sql.lastIndexOf("and"));
-
- logger.info("query hql is : " + sql);
- return sql.trim();
+ } catch (Exception e1) {
+ logger.error("error while creating update hql", e1);
+ }
}
+ String sql = hql.toString();
+ sql = sql.substring(0, sql.lastIndexOf("and"));
- public static String getQueryHqlByFilter(Class mainObject, Object filterData, String foreignKey) {
- StringBuffer hql = new StringBuffer();
- String objName = mainObject.getSimpleName();
- // hql.append("select queryTable.");
- hql.append(" from ");
- hql.append(objName);
- hql.append(" as a where ");
- String filterHql = getQueryHql(filterData, foreignKey);
- hql.append("a." + foreignKey);
- hql.append(" in(");
- hql.append(filterHql);
- hql.append(")");
- logger.info("QueryHqlByFilter is : " + hql);
- return hql.toString();
- }
+ logger.info("query hql is : " + sql);
+ return sql.trim();
+ }
- public static String getDeleteHqlByFilter(Class mainObject, Object filterData, String foreignKey) {
- StringBuffer hql = new StringBuffer();
- String objName = mainObject.getSimpleName();
- hql.append("delete from ");
- hql.append(objName);
- hql.append(" as b where ");
- String filterHql = getQueryHql(filterData, foreignKey);
- hql.append("b." + foreignKey);
- hql.append(" in(");
- hql.append(filterHql);
- hql.append(")");
- logger.info("DeleteHqlByFilter is : " + hql);
- return hql.toString();
- }
+ public static String getQueryHqlByFilter(Class mainObject, Object filterData, String foreignKey) {
+ StringBuffer hql = new StringBuffer();
+ String objName = mainObject.getSimpleName();
+ // hql.append("select queryTable.");
+ hql.append(" from ");
+ hql.append(objName);
+ hql.append(" as a where ");
+ String filterHql = getQueryHql(filterData, foreignKey);
+ hql.append("a." + foreignKey);
+ hql.append(" in(");
+ hql.append(filterHql);
+ hql.append(")");
+ logger.info("QueryHqlByFilter is : " + hql);
+ return hql.toString();
+ }
+
+ public static String getDeleteHqlByFilter(Class mainObject, Object filterData, String foreignKey) {
+ StringBuffer hql = new StringBuffer();
+ String objName = mainObject.getSimpleName();
+ hql.append("delete from ");
+ hql.append(objName);
+ hql.append(" as b where ");
+ String filterHql = getQueryHql(filterData, foreignKey);
+ hql.append("b." + foreignKey);
+ hql.append(" in(");
+ hql.append(filterHql);
+ hql.append(")");
+ logger.info("DeleteHqlByFilter is : " + hql);
+ return hql.toString();
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.wrapper;
-import java.util.List;
-import java.util.Map;
+import com.google.gson.Gson;
+import org.openo.commontosca.catalog.db.dao.BaseDao;
+import org.openo.commontosca.catalog.db.dao.DaoManager;
import org.openo.commontosca.catalog.db.entity.BaseData;
import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.util.CatalogDbUtil;
-import org.openo.commontosca.catalog.db.dao.BaseDao;
-import org.openo.commontosca.catalog.db.dao.DaoManager;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.google.gson.Gson;
+import java.util.List;
+import java.util.Map;
+
+
/**
- * an abstract class for NFV wrapper class
- *
- * provide the common methods to process the CRUD rest request
+ * an abstract class for NFV wrapper class.
+ * provide the common methods to process the CRUD rest request.
*
- * *@author 10159474
- *
- * @param <T>
*/
public abstract class BaseHandler<T extends BaseData> {
- private final static Logger logger = LoggerFactory.getLogger(BaseHandler.class);
-
- public Gson gson = new Gson();
-
- @SuppressWarnings({"unchecked", "rawtypes"})
- public T create(T data, String resouceType) throws CatalogResourceException {
- T rtnData = null;
- logger.info("BaseHandler:start create data.info:" + CatalogDbUtil.objectToString(data));
- try {
- check(data);
- BaseDao dao = DaoManager.getInstance().getDao(resouceType);
- rtnData = (T) dao.create(data);
- } catch (CatalogResourceException e) {
- logger.error("BaseHandler:error while creating " + resouceType, e);
- throw e;
- }
- logger.info("BaseHandler:create data end.info:" + CatalogDbUtil.objectToString(data));
- return rtnData;
+ private static final Logger logger = LoggerFactory.getLogger(BaseHandler.class);
+
+ public Gson gson = new Gson();
+
+ /**
+ * create date.
+ * @param data data to create
+ * @param resouceType resouce type
+ * @return T
+ * @throws CatalogResourceException e1
+ */
+ @SuppressWarnings({"unchecked", "rawtypes"})
+ public T create(T data, String resouceType) throws CatalogResourceException {
+ T rtnData = null;
+ logger.info("BaseHandler:start create data.info:" + CatalogDbUtil.objectToString(data));
+ try {
+ check(data);
+ BaseDao dao = DaoManager.getInstance().getDao(resouceType);
+ rtnData = (T) dao.create(data);
+ } catch (CatalogResourceException e1) {
+ logger.error("BaseHandler:error while creating " + resouceType, e1);
+ throw e1;
}
-
- @SuppressWarnings({"rawtypes", "unchecked"})
- public void delete(T data, String resouceType) throws CatalogResourceException {
- logger.info("BaseHandler:start delete data.info:" + CatalogDbUtil.objectToString(data));
- try {
- BaseDao dao = DaoManager.getInstance().getDao(resouceType);
- dao.delete(data);
- } catch (CatalogResourceException e) {
- logger.error("BaseHandler:error while deleting " + resouceType, e);
- throw e;
- }
- logger.info("BaseHandler:delete data end");
+ logger.info("BaseHandler:create data end.info:" + CatalogDbUtil.objectToString(data));
+ return rtnData;
+ }
+
+ /**
+ * delete data.
+ * @param data data to delete
+ * @param resouceType resource type
+ * @throws CatalogResourceException e1
+ */
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ public void delete(T data, String resouceType) throws CatalogResourceException {
+ logger.info("BaseHandler:start delete data.info:" + CatalogDbUtil.objectToString(data));
+ try {
+ BaseDao dao = DaoManager.getInstance().getDao(resouceType);
+ dao.delete(data);
+ } catch (CatalogResourceException e1) {
+ logger.error("BaseHandler:error while deleting " + resouceType, e1);
+ throw e1;
}
-
- @SuppressWarnings({"rawtypes", "unchecked"})
- public void delete(Map<String, String> queryParam, String resouceType)
- throws CatalogResourceException {
- logger.info("BaseHandler:start delete data by condition.info:"
- + CatalogDbUtil.objectToString(queryParam));
- List<T> datas;
- try {
- BaseDao dao = DaoManager.getInstance().getDao(resouceType);
- datas = dao.query(queryParam);
- for (T data : datas) {
- delete(data, resouceType);
- }
- } catch (CatalogResourceException e) {
- logger.error("BaseHandler:error while deleting " + resouceType, e);
- throw e;
- }
-
+ logger.info("BaseHandler:delete data end");
+ }
+
+ /**
+ * delete data.
+ * @param queryParam query param
+ * @param resouceType String
+ * @throws CatalogResourceException e1
+ */
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ public void delete(Map<String, String> queryParam, String resouceType)
+ throws CatalogResourceException {
+ logger.info("BaseHandler:start delete data by condition.info:"
+ + CatalogDbUtil.objectToString(queryParam));
+ List<T> datas;
+ try {
+ BaseDao dao = DaoManager.getInstance().getDao(resouceType);
+ datas = dao.query(queryParam);
+ for (T data : datas) {
+ delete(data, resouceType);
+ }
+ } catch (CatalogResourceException e1) {
+ logger.error("BaseHandler:error while deleting " + resouceType, e1);
+ throw e1;
}
- @SuppressWarnings({"rawtypes", "unchecked"})
- public void update(T data, String filter, String resouceType) throws CatalogResourceException {
- logger.info("BaseHandler:start update data .info:" + CatalogDbUtil.objectToString(data)
- + " filter:" + filter);
- try {
- check(data);
- BaseDao dao = DaoManager.getInstance().getDao(resouceType);
- dao.update(data, filter);
-
- } catch (CatalogResourceException e) {
- logger.error("BaseHandler:error while updating " + resouceType, e);
- throw e;
- }
- logger.info("BaseHandler:update data end ");
+ }
+
+ /**
+ * update data.
+ * @param data data to update
+ * @param filter filter
+ * @param resouceType resource type
+ * @throws CatalogResourceException e1
+ */
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ public void update(T data, String filter, String resouceType) throws CatalogResourceException {
+ logger.info("BaseHandler:start update data .info:" + CatalogDbUtil.objectToString(data)
+ + " filter:" + filter);
+ try {
+ check(data);
+ BaseDao dao = DaoManager.getInstance().getDao(resouceType);
+ dao.update(data, filter);
+
+ } catch (CatalogResourceException e1) {
+ logger.error("BaseHandler:error while updating " + resouceType, e1);
+ throw e1;
}
-
- @SuppressWarnings({"rawtypes", "unchecked"})
- public List<T> query(Map<String, String> queryParam, String resouceType)
- throws CatalogResourceException {
- logger.info("BaseHandler:start query data .info:"
- + CatalogDbUtil.objectToString(queryParam));
- List<T> datas = null;
- try {
- BaseDao dao = DaoManager.getInstance().getDao(resouceType);
- datas = dao.query(queryParam);
-
- } catch (CatalogResourceException e) {
- logger.error("BaseHandler:error while querying " + resouceType, e);
- throw e;
- }
- logger.info("BaseHandler: query data end .info:" + CatalogDbUtil.objectToString(datas));
- return datas;
+ logger.info("BaseHandler:update data end ");
+ }
+
+ /**
+ * query data.
+ * @param queryParam query parameter
+ * @param resouceType resource type
+ * @return T list
+ * @throws CatalogResourceException e1
+ */
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ public List<T> query(Map<String, String> queryParam, String resouceType)
+ throws CatalogResourceException {
+ logger.info("BaseHandler:start query data .info:" + CatalogDbUtil.objectToString(queryParam));
+ List<T> datas = null;
+ try {
+ BaseDao dao = DaoManager.getInstance().getDao(resouceType);
+ datas = dao.query(queryParam);
+
+ } catch (CatalogResourceException e1) {
+ logger.error("BaseHandler:error while querying " + resouceType, e1);
+ throw e1;
}
-
- @SuppressWarnings({"rawtypes", "unchecked"})
- public List<T> unionQuery(String filter, String resouceType) throws CatalogResourceException {
- logger.info("BaseHandler:start union query data.fliter:" + filter);
- List<T> datas = null;
- try {
- BaseDao dao = DaoManager.getInstance().getDao(resouceType);
- datas = dao.unionQuery(filter);
-
- } catch (CatalogResourceException e) {
- logger.error("BaseHandler:error while union querying " + resouceType, e);
- throw e;
- }
- logger.info("BaseHandler:union query data end .info:" + CatalogDbUtil.objectToString(datas));
- return datas;
+ logger.info("BaseHandler: query data end .info:" + CatalogDbUtil.objectToString(datas));
+ return datas;
+ }
+
+ /**
+ * union query.
+ * @param filter filter
+ * @param resouceType resource type
+ * @return T list
+ * @throws CatalogResourceException e1
+ */
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ public List<T> unionQuery(String filter, String resouceType) throws CatalogResourceException {
+ logger.info("BaseHandler:start union query data.fliter:" + filter);
+ List<T> datas = null;
+ try {
+ BaseDao dao = DaoManager.getInstance().getDao(resouceType);
+ datas = dao.unionQuery(filter);
+
+ } catch (CatalogResourceException e1) {
+ logger.error("BaseHandler:error while union querying " + resouceType, e1);
+ throw e1;
}
-
- @SuppressWarnings({"rawtypes", "unchecked"})
- public int unionDelete(String filter, String resouceType) throws CatalogResourceException {
- logger.info("BaseHandler:start delete query data.fliter:" + filter);
- int num;
- try {
- BaseDao dao = DaoManager.getInstance().getDao(resouceType);
- num = dao.unionDelete(filter);
-
- } catch (CatalogResourceException e) {
- logger.error("BaseHandler:error while union delete " + resouceType, e);
- throw e;
- }
- logger.info("BaseHandler:union delete data end .num:" + num);
- return num;
+ logger.info("BaseHandler:union query data end .info:" + CatalogDbUtil.objectToString(datas));
+ return datas;
+ }
+
+ /**
+ * union delete.
+ * @param filter filter
+ * @param resouceType resource type
+ * @return int
+ * @throws CatalogResourceException e1
+ */
+ @SuppressWarnings({"rawtypes", "unchecked"})
+ public int unionDelete(String filter, String resouceType) throws CatalogResourceException {
+ logger.info("BaseHandler:start delete query data.fliter:" + filter);
+ int num;
+ try {
+ BaseDao dao = DaoManager.getInstance().getDao(resouceType);
+ num = dao.unionDelete(filter);
+
+ } catch (CatalogResourceException e1) {
+ logger.error("BaseHandler:error while union delete " + resouceType, e1);
+ throw e1;
}
-
- /**
- * check if the related object id exists in the system
- *
- * @param data
- * @throws CatalogResourceException
- */
- public abstract void check(T data) throws CatalogResourceException;
+ logger.info("BaseHandler:union delete data end .num:" + num);
+ return num;
+ }
+
+ /**
+ * check if the related object id exists in the system.
+ *
+ * @param data data to check
+ * @throws CatalogResourceException e
+ */
+ public abstract void check(T data) throws CatalogResourceException;
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.wrapper;
-import java.util.ArrayList;
-import java.util.Map;
+package org.openo.commontosca.catalog.db.wrapper;
import org.openo.commontosca.catalog.db.common.CatalogResuorceType;
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- ** @author 10159474
- */
-public class NodeTemplateHandler extends BaseHandler<NodeTemplateData> {
- private static final Logger logger = LoggerFactory.getLogger(NodeTemplateHandler.class);
-
- public ArrayList<NodeTemplateData> query(Map<String, String> queryParam)
- throws CatalogResourceException {
- logger.info("NodeTemplateHandler query nodeTemplate info.");
- ArrayList<NodeTemplateData> data = new ArrayList<NodeTemplateData>();
- Object result = query(queryParam, CatalogResuorceType.NODETEMPLATE.name());
- if (result != null)
- data = (ArrayList<NodeTemplateData>) result;
- else
- logger.warn("NodeTemplateHandler: query nodeTemplate info is null.");
- logger.info("NodeTemplateHandler: query nodeTemplate info end.");
- return data;
+import java.util.ArrayList;
+import java.util.Map;
+public class NodeTemplateHandler extends BaseHandler<NodeTemplateData> {
+ private static final Logger logger = LoggerFactory.getLogger(NodeTemplateHandler.class);
+
+ /**
+ * query node template.
+ * @param queryParam query parameter
+ * @return NodeTemplateData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<NodeTemplateData> query(Map<String, String> queryParam)
+ throws CatalogResourceException {
+ logger.info("NodeTemplateHandler query nodeTemplate info.");
+ ArrayList<NodeTemplateData> data = new ArrayList<NodeTemplateData>();
+ Object result = query(queryParam, CatalogResuorceType.NODETEMPLATE.name());
+ if (result != null) {
+ data = (ArrayList<NodeTemplateData>) result;
+ } else {
+ logger.warn("NodeTemplateHandler: query nodeTemplate info is null.");
}
+ logger.info("NodeTemplateHandler: query nodeTemplate info end.");
+ return data;
- @Override
- public void check(NodeTemplateData nodeTemplateData) throws CatalogResourceException {
+ }
- }
+ @Override
+ public void check(NodeTemplateData nodeTemplateData) throws CatalogResourceException {
+
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.wrapper;
-import java.util.ArrayList;
-import java.util.Map;
+package org.openo.commontosca.catalog.db.wrapper;
import org.openo.commontosca.catalog.db.common.CatalogResuorceType;
import org.openo.commontosca.catalog.db.common.Parameters;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- ** @author 10159474
- */
+import java.util.ArrayList;
+import java.util.Map;
+
public class PackageHandler extends BaseHandler<PackageData> {
- private static final Logger logger = LoggerFactory.getLogger(PackageHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(PackageHandler.class);
- public PackageData create(PackageData packageData) throws CatalogResourceException {
- logger.info("packageHandler:start create package info.");
- PackageData data = null;
- if (!CatalogDbUtil.isNotEmpty(packageData.getCsarId())) {
+ /**
+ * create package data.
+ * @param packageData package data to create
+ * @return PackageData
+ * @throws CatalogResourceException e1
+ */
+ public PackageData create(PackageData packageData) throws CatalogResourceException {
+ logger.info("packageHandler:start create package info.");
+ PackageData data = null;
+ if (!CatalogDbUtil.isNotEmpty(packageData.getCsarId())) {
- logger.info("packageHandler:package info does not have csarid,generate UUID.");
- String id = CatalogDbUtil.generateId();
- packageData.setCsarId(id);
- }
- Object result = create(packageData, CatalogResuorceType.PACKAGE.name());
- if (result != null)
- data = (PackageData) result;
- else
- logger.info("packageHandler: query package info is null.");
- logger.info("packageHandler: create package info end.");
- return data;
+ logger.info("packageHandler:package info does not have csarid,generate UUID.");
+ String id = CatalogDbUtil.generateId();
+ packageData.setCsarId(id);
}
-
- public void delete(String id) throws CatalogResourceException {
- logger.info("packageHandler:start delete package info.");
- PackageData packageData = new PackageData();
- packageData.setCsarId(id);
- delete(packageData, CatalogResuorceType.PACKAGE.name());
- logger.info("packageHandler: delete package info end.");
+ Object result = create(packageData, CatalogResuorceType.PACKAGE.name());
+ if (result != null) {
+ data = (PackageData) result;
+ } else {
+ logger.info("packageHandler: query package info is null.");
}
+ logger.info("packageHandler: create package info end.");
+ return data;
+ }
- public void delete(Map<String, String> queryParam) throws CatalogResourceException {
- logger.info("packageHandler:start delete package info.");
- delete(queryParam, CatalogResuorceType.PACKAGE.name());
- logger.info("packageHandler:delete package info end.");
- }
+ /**
+ * delete data.
+ * @param id package id
+ * @throws CatalogResourceException e
+ */
+ public void delete(String id) throws CatalogResourceException {
+ logger.info("packageHandler:start delete package info.");
+ PackageData packageData = new PackageData();
+ packageData.setCsarId(id);
+ delete(packageData, CatalogResuorceType.PACKAGE.name());
+ logger.info("packageHandler: delete package info end.");
+ }
- public void update(PackageData packageData, String id) throws CatalogResourceException {
- // HostData host = gson.fromJson(hostJson, HostData.class);
- logger.info("packageHandler:start update package info.");
- update(packageData, HqlFactory.getOidFilter(Parameters.csarId.name(), id),
- CatalogResuorceType.PACKAGE.name());
- logger.info("packageHandler:update package info end.");
- }
+ /**
+ * delete data.
+ * @param queryParam query parameter
+ * @throws CatalogResourceException e
+ */
+ public void delete(Map<String, String> queryParam) throws CatalogResourceException {
+ logger.info("packageHandler:start delete package info.");
+ delete(queryParam, CatalogResuorceType.PACKAGE.name());
+ logger.info("packageHandler:delete package info end.");
+ }
- public int unionDelete(String filter) throws CatalogResourceException {
- logger.info("packageHandler delete package info by union.filter:" + filter);
- int num = 0;
- Object result = unionDelete(filter, CatalogResuorceType.PACKAGE.name());
- if (result != null)
- num = (int) result;
- else
- logger.warn("packageHandler: delete package info is null.");
- logger.info("packageHandler: delete package info end.num:" + num);
- return num;
- }
+ /**
+ * update data.
+ * @param packageData packate data to update
+ * @param id package id
+ * @throws CatalogResourceException e
+ */
+ public void update(PackageData packageData, String id) throws CatalogResourceException {
+ // HostData host = gson.fromJson(hostJson, HostData.class);
+ logger.info("packageHandler:start update package info.");
+ update(packageData, HqlFactory.getOidFilter(Parameters.csarId.name(), id),
+ CatalogResuorceType.PACKAGE.name());
+ logger.info("packageHandler:update package info end.");
+ }
- public ArrayList<PackageData> unionQuery(String filter) throws CatalogResourceException {
- logger.info("packageHandler query package info by union.filter:" + filter);
- ArrayList<PackageData> data = new ArrayList<PackageData>();
- Object result = unionQuery(filter, CatalogResuorceType.PACKAGE.name());
- if (result != null)
- data = data = (ArrayList<PackageData>) result;
- else
- logger.info("packageHandler: query package info is null.");
- logger.info("packageHandler: query package info end");
- return data;
+ /**
+ * union delete.
+ * @param filter delete filter
+ * @return int
+ * @throws CatalogResourceException e
+ */
+ public int unionDelete(String filter) throws CatalogResourceException {
+ logger.info("packageHandler delete package info by union.filter:" + filter);
+ int num = 0;
+ Object result = unionDelete(filter, CatalogResuorceType.PACKAGE.name());
+ if (result != null) {
+ num = (int) result;
+ } else {
+ logger.warn("packageHandler: delete package info is null.");
}
+ logger.info("packageHandler: delete package info end.num:" + num);
+ return num;
+ }
- public ArrayList<PackageData> query(Map<String, String> queryParam)
- throws CatalogResourceException {
- logger.info("packageHandler:start query package info.");
- ArrayList<PackageData> data = new ArrayList<PackageData>();
- Object result = query(queryParam, CatalogResuorceType.PACKAGE.name());
- if (result != null)
- data = (ArrayList<PackageData>) result;
- else
- logger.info("packageHandler: query package info is null.");
- logger.info("packageHandler: query package info end.");
- return data;
+ /**
+ * union query.
+ * @param filter query filter
+ * @return PackageData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<PackageData> unionQuery(String filter) throws CatalogResourceException {
+ logger.info("packageHandler query package info by union.filter:" + filter);
+ ArrayList<PackageData> data = new ArrayList<PackageData>();
+ Object result = unionQuery(filter, CatalogResuorceType.PACKAGE.name());
+ if (result != null) {
+ data = data = (ArrayList<PackageData>) result;
+ } else {
+ logger.info("packageHandler: query package info is null.");
+ }
+ logger.info("packageHandler: query package info end");
+ return data;
+ }
+ /**
+ * query package data by map.
+ * @param queryParam map data
+ * @return PackageData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<PackageData> query(Map<String, String> queryParam)
+ throws CatalogResourceException {
+ logger.info("packageHandler:start query package info.");
+ ArrayList<PackageData> data = new ArrayList<PackageData>();
+ Object result = query(queryParam, CatalogResuorceType.PACKAGE.name());
+ if (result != null) {
+ data = (ArrayList<PackageData>) result;
+ } else {
+ logger.info("packageHandler: query package info is null.");
}
+ logger.info("packageHandler: query package info end.");
+ return data;
+ }
- @Override
- public void check(PackageData packageData) throws CatalogResourceException {
+ @Override
+ public void check(PackageData packageData) throws CatalogResourceException {
- }
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.wrapper;
-import java.util.ArrayList;
-import java.util.Map;
+package org.openo.commontosca.catalog.db.wrapper;
import org.openo.commontosca.catalog.db.common.CatalogResuorceType;
import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- ** @author 10159474
- */
+import java.util.ArrayList;
+import java.util.Map;
+
public class ServiceTemplateHandler extends BaseHandler<TemplateData> {
- private static final Logger logger = LoggerFactory.getLogger(ServiceTemplateHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(ServiceTemplateHandler.class);
- @Override
- public void check(TemplateData data) throws CatalogResourceException {
- // TODO Auto-generated method stub
+ @Override
+ public void check(TemplateData data) throws CatalogResourceException {
+ // TODO Auto-generated method stub
- }
+ }
- public ArrayList<ServiceTemplateData> query(Map<String, String> queryParam)
- throws CatalogResourceException {
- logger.info("ServiceTemplateHandler query serviceTemplate info.");
- ArrayList<ServiceTemplateData> data = new ArrayList<ServiceTemplateData>();
- Object result = query(queryParam, CatalogResuorceType.SERVICETEMPLATE.name());
- if (result != null)
- data = (ArrayList<ServiceTemplateData>) result;
- else
- logger.info("ServiceTemplateHandler: query serviceTemplate info is null.");
- logger.info("ServiceTemplateHandler: query serviceTemplate info end.");
- return data;
+ /**
+ * query service template data by map.
+ * @param queryParam map data
+ * @return ServiceTemplateData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<ServiceTemplateData> query(Map<String, String> queryParam)
+ throws CatalogResourceException {
+ logger.info("ServiceTemplateHandler query serviceTemplate info.");
+ ArrayList<ServiceTemplateData> data = new ArrayList<ServiceTemplateData>();
+ Object result = query(queryParam, CatalogResuorceType.SERVICETEMPLATE.name());
+ if (result != null) {
+ data = (ArrayList<ServiceTemplateData>) result;
+ } else {
+ logger.info("ServiceTemplateHandler: query serviceTemplate info is null.");
}
+ logger.info("ServiceTemplateHandler: query serviceTemplate info end.");
+ return data;
+ }
- public ArrayList<ServiceTemplateData> unionQuery(String filter) throws CatalogResourceException {
- logger.info("ServiceTemplateHandler query serviceTemplate info by union.filter:" + filter);
- ArrayList<ServiceTemplateData> data = new ArrayList<ServiceTemplateData>();
- Object result = unionQuery(filter, CatalogResuorceType.SERVICETEMPLATE.name());
- if (result != null)
- data = (ArrayList<ServiceTemplateData>) result;
- else
- logger.info("ServiceTemplateHandler: query serviceTemplate info is null.");
- logger.info("ServiceTemplateHandler: query serviceTemplate info end.");
- return data;
+ /**
+ * query service template by union query.
+ * @param filter query filter
+ * @return ServiceTemplateData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<ServiceTemplateData> unionQuery(String filter) throws CatalogResourceException {
+ logger.info("ServiceTemplateHandler query serviceTemplate info by union.filter:" + filter);
+ ArrayList<ServiceTemplateData> data = new ArrayList<ServiceTemplateData>();
+ Object result = unionQuery(filter, CatalogResuorceType.SERVICETEMPLATE.name());
+ if (result != null) {
+ data = (ArrayList<ServiceTemplateData>) result;
+ } else {
+ logger.info("ServiceTemplateHandler: query serviceTemplate info is null.");
}
+ logger.info("ServiceTemplateHandler: query serviceTemplate info end.");
+ return data;
+ }
- public int unionDelete(String filter) throws CatalogResourceException {
- logger.info("ServiceTemplateHandler delete serviceTemplate info by union.filter:" + filter);
- int num = 0;
- Object result = unionDelete(filter, CatalogResuorceType.SERVICETEMPLATE.name());
- if (result != null)
- num = (int) result;
- else
- logger.info("ServiceTemplateHandler: delete serviceTemplate info is null.");
- logger.info("ServiceTemplateHandler: delete serviceTemplate info end.num:" + num);
- return num;
+ /**
+ * union delete.
+ * @param filter delete filter
+ * @return int
+ * @throws CatalogResourceException e
+ */
+ public int unionDelete(String filter) throws CatalogResourceException {
+ logger.info("ServiceTemplateHandler delete serviceTemplate info by union.filter:" + filter);
+ int num = 0;
+ Object result = unionDelete(filter, CatalogResuorceType.SERVICETEMPLATE.name());
+ if (result != null) {
+ num = (int) result;
+ } else {
+ logger.info("ServiceTemplateHandler: delete serviceTemplate info is null.");
}
+ logger.info("ServiceTemplateHandler: delete serviceTemplate info end.num:" + num);
+ return num;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.wrapper;
-import java.util.ArrayList;
-import java.util.Map;
+package org.openo.commontosca.catalog.db.wrapper;
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
-import org.openo.commontosca.catalog.db.util.CatalogDbUtil;
import org.openo.commontosca.catalog.db.common.CatalogResuorceType;
import org.openo.commontosca.catalog.db.entity.ServiceTemplateMappingData;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.db.util.CatalogDbUtil;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- ** @author 10159474
- */
+import java.util.ArrayList;
+import java.util.Map;
+
+
public class ServiceTemplateMappingHandler extends BaseHandler<ServiceTemplateMappingData> {
- private static final Logger logger = LoggerFactory
- .getLogger(ServiceTemplateMappingHandler.class);
-
- public ServiceTemplateMappingData create(ServiceTemplateMappingData serviceTemplateMappingData)
- throws CatalogResourceException {
- logger.info("ServiceTemplateMappingHandler:start create serviceTemplateMapping info.");
- ServiceTemplateMappingData data = null;
- if (!CatalogDbUtil.isNotEmpty(serviceTemplateMappingData.getMappingId())) {
-
- logger.info("ServiceTemplateMappingHandler:mapping info does not have mappingId,generate UUID.");
- String id = CatalogDbUtil.generateId();
- serviceTemplateMappingData.setMappingId(id);
- }
- Object result =
- create(serviceTemplateMappingData,
- CatalogResuorceType.SERVICETEMPLATEMAPPING.name());
- if (result != null)
- data = (ServiceTemplateMappingData) result;
- else
- logger.info("ServiceTemplateMappingHandler: query mapping info is null.");
- logger.info("ServiceTemplateMappingHandler: create mapping info end.");
- return data;
- }
+ private static final Logger logger = LoggerFactory.getLogger(ServiceTemplateMappingHandler.class);
- public void delete(String id) throws CatalogResourceException {
- logger.info("ServiceTemplateMappingHandler:start delete mapping info.");
- ServiceTemplateMappingData ServiceTemplateMappingData = new ServiceTemplateMappingData();
- ServiceTemplateMappingData.setMappingId(id);
- delete(ServiceTemplateMappingData, CatalogResuorceType.SERVICETEMPLATEMAPPING.name());
- logger.info("ServiceTemplateMappingHandler: delete mapping info end.");
+ /**
+ * create service template data.
+ * @param serviceTemplateMappingData service template maping data
+ * @return ServiceTemplateMappingData
+ * @throws CatalogResourceException e
+ */
+ public ServiceTemplateMappingData create(ServiceTemplateMappingData serviceTemplateMappingData)
+ throws CatalogResourceException {
+ logger.info("ServiceTemplateMappingHandler:start create serviceTemplateMapping info.");
+ ServiceTemplateMappingData data = null;
+ if (!CatalogDbUtil.isNotEmpty(serviceTemplateMappingData.getMappingId())) {
+ logger.info(
+ "ServiceTemplateMappingHandler:mapping info " + "does not have mappingId,generate UUID.");
+ String id = CatalogDbUtil.generateId();
+ serviceTemplateMappingData.setMappingId(id);
}
-
- public void delete(Map<String, String> delParam) throws CatalogResourceException {
- logger.info("ServiceTemplateMappingHandler:start delete mapping info.");
- delete(delParam, CatalogResuorceType.SERVICETEMPLATEMAPPING.name());
- logger.info("ServiceTemplateMappingHandler:delete mapping info end.");
+ Object result =
+ create(serviceTemplateMappingData, CatalogResuorceType.SERVICETEMPLATEMAPPING.name());
+ if (result != null) {
+ data = (ServiceTemplateMappingData) result;
+ } else {
+ logger.info("ServiceTemplateMappingHandler: query mapping info is null.");
}
+ logger.info("ServiceTemplateMappingHandler: create mapping info end.");
+ return data;
+ }
+
+ /**
+ * delete data by id.
+ * @param id service template id
+ * @throws CatalogResourceException e
+ */
+ public void delete(String id) throws CatalogResourceException {
+ logger.info("ServiceTemplateMappingHandler:start delete mapping info.");
+ ServiceTemplateMappingData serviceTemplateMappingData = new ServiceTemplateMappingData();
+ serviceTemplateMappingData.setMappingId(id);
+ delete(serviceTemplateMappingData, CatalogResuorceType.SERVICETEMPLATEMAPPING.name());
+ logger.info("ServiceTemplateMappingHandler: delete mapping info end.");
+ }
- public ArrayList<ServiceTemplateMappingData> query(Map<String, String> queryParam)
- throws CatalogResourceException {
- logger.info("ServiceTemplateMappingHandler:start query mapping info.");
- ArrayList<ServiceTemplateMappingData> data = new ArrayList<ServiceTemplateMappingData>();
- Object result = query(queryParam, CatalogResuorceType.SERVICETEMPLATEMAPPING.name());
- if (result != null)
- data = (ArrayList<ServiceTemplateMappingData>) result;
- else
- logger.info("ServiceTemplateMappingHandler: query mapping info is null.");
- logger.info("ServiceTemplateMappingHandler: query mapping info end.");
- return data;
+ /**
+ * delete data.
+ * @param delParam delete data according to delParam
+ * @throws CatalogResourceException e
+ */
+ public void delete(Map<String, String> delParam) throws CatalogResourceException {
+ logger.info("ServiceTemplateMappingHandler:start delete mapping info.");
+ delete(delParam, CatalogResuorceType.SERVICETEMPLATEMAPPING.name());
+ logger.info("ServiceTemplateMappingHandler:delete mapping info end.");
+ }
+ /**
+ * query service template mapping data.
+ * @param queryParam query map
+ * @return ServiceTemplateMappingData list
+ * @throws CatalogResourceException e
+ */
+ public ArrayList<ServiceTemplateMappingData> query(Map<String, String> queryParam)
+ throws CatalogResourceException {
+ logger.info("ServiceTemplateMappingHandler:start query mapping info.");
+ ArrayList<ServiceTemplateMappingData> data = new ArrayList<ServiceTemplateMappingData>();
+ Object result = query(queryParam, CatalogResuorceType.SERVICETEMPLATEMAPPING.name());
+ if (result != null) {
+ data = (ArrayList<ServiceTemplateMappingData>) result;
+ } else {
+ logger.info("ServiceTemplateMappingHandler: query mapping info is null.");
}
+ logger.info("ServiceTemplateMappingHandler: query mapping info end.");
+ return data;
- @Override
- public void check(ServiceTemplateMappingData data) throws CatalogResourceException {
- // TODO Auto-generated method stub
+ }
- }
+ @Override
+ public void check(ServiceTemplateMappingData data) throws CatalogResourceException {
+ // TODO Auto-generated method stub
+
+ }
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.wrapper;
-import java.util.ArrayList;
+package org.openo.commontosca.catalog.db.wrapper;
-import org.openo.commontosca.catalog.db.entity.TemplateData;
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
-import org.openo.commontosca.catalog.db.util.CatalogDbUtil;
import org.openo.commontosca.catalog.db.common.CatalogResuorceType;
import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
+import org.openo.commontosca.catalog.db.entity.TemplateData;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.db.util.CatalogDbUtil;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/**
- *
- ** @author 10159474
- */
+import java.util.ArrayList;
+
public class TemplateHandler extends BaseHandler<TemplateData> {
- private static final Logger logger = LoggerFactory.getLogger(TemplateHandler.class);
+ private static final Logger logger = LoggerFactory.getLogger(TemplateHandler.class);
- public TemplateData create(TemplateData templateData) throws CatalogResourceException {
- logger.info("TemplateHandler create template info.");
- TemplateData data = null;
- String serviceTemplateOid = templateData.getServiceTemplate().getServiceTemplateId();
- if (!CatalogDbUtil.isNotEmpty(serviceTemplateOid)) {
- logger.info("TemplateHandler:template info does not have oid,generate UUID.");
- serviceTemplateOid = CatalogDbUtil.generateId();
- templateData.getServiceTemplate().setServiceTemplateId(serviceTemplateOid);
- }
- for (NodeTemplateData nodeData : templateData.getNodeTemplates()) {
- nodeData.setNodeTemplateId(CatalogDbUtil.generateId());
- nodeData.setServiceTemplateId(serviceTemplateOid);
- }
- Object result = create(templateData, CatalogResuorceType.TEMPLATE.name());
- if (result != null)
- data = (TemplateData) result;
- else
- logger.info("TemplateHandler: query template info is null.");
- logger.info("TemplateHandler: create template info end.");
- return data;
+ /**
+ * create template data.
+ * @param templateData template data to create
+ * @return TemplateData
+ * @throws CatalogResourceException e
+ */
+ public TemplateData create(TemplateData templateData) throws CatalogResourceException {
+ logger.info("TemplateHandler create template info.");
+ TemplateData data = null;
+ String serviceTemplateOid = templateData.getServiceTemplate().getServiceTemplateId();
+ if (!CatalogDbUtil.isNotEmpty(serviceTemplateOid)) {
+ logger.info("TemplateHandler:template info does not have oid,generate UUID.");
+ serviceTemplateOid = CatalogDbUtil.generateId();
+ templateData.getServiceTemplate().setServiceTemplateId(serviceTemplateOid);
}
+ for (NodeTemplateData nodeData : templateData.getNodeTemplates()) {
+ nodeData.setNodeTemplateId(CatalogDbUtil.generateId());
+ nodeData.setServiceTemplateId(serviceTemplateOid);
+ }
+ Object result = create(templateData, CatalogResuorceType.TEMPLATE.name());
+ if (result != null) {
+ data = (TemplateData) result;
+ } else {
+ logger.info("TemplateHandler: query template info is null.");
+ }
+ logger.info("TemplateHandler: create template info end.");
+ return data;
+ }
- @Override
- public void check(TemplateData data) throws CatalogResourceException {
- // TODO Auto-generated method stub
+ @Override
+ public void check(TemplateData data) throws CatalogResourceException {
+ // TODO Auto-generated method stub
- }
+ }
- public void delete(String serviceTemplateId, ArrayList<NodeTemplateData> nodeTemplateList)
- throws CatalogResourceException {
- logger.info("TemplateHandler delete Template info.");
- TemplateData templateData = new TemplateData();
- ServiceTemplateData serviceTemplateData = new ServiceTemplateData();
- serviceTemplateData.setServiceTemplateId(serviceTemplateId);
- templateData.setServiceTemplate(serviceTemplateData);
- templateData.setNodeTemplates(nodeTemplateList);
- delete(templateData, CatalogResuorceType.TEMPLATE.name());
- logger.info("TemplateHandler: delete Template info end.");
- }
+ /**
+ * delete node template.
+ * @param serviceTemplateId service template id
+ * @param nodeTemplateList node template list
+ * @throws CatalogResourceException e
+ */
+ public void delete(String serviceTemplateId, ArrayList<NodeTemplateData> nodeTemplateList)
+ throws CatalogResourceException {
+ logger.info("TemplateHandler delete Template info.");
+ TemplateData templateData = new TemplateData();
+ ServiceTemplateData serviceTemplateData = new ServiceTemplateData();
+ serviceTemplateData.setServiceTemplateId(serviceTemplateId);
+ templateData.setServiceTemplate(serviceTemplateData);
+ templateData.setNodeTemplates(nodeTemplateList);
+ delete(templateData, CatalogResuorceType.TEMPLATE.name());
+ logger.info("TemplateHandler: delete Template info end.");
+ }
}
+++ /dev/null
-/**
- * Copyright 2016 [ZTE] and others.
- *
- * 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.
- */
-package org.openo.commontosca.catalog.entity;
-
-public class CSARPackage {
- private String id;
- private String name;
- private String createTime;
- private String size;
- private String status;
- private String deletionPending;
- private String format;
- private String url;
- private String type;
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getFormat() {
- return format;
- }
-
- public void setFormat(String format) {
- this.format = format;
- }
-
- public String getUrl() {
- return url;
- }
-
- public void setUrl(String url) {
- this.url = url;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public String getDeletionPending() {
- return deletionPending;
- }
-
- public void setDeletionPending(String deletionPending) {
- this.deletionPending = deletionPending;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getCreateTime() {
- return createTime;
- }
-
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
- }
-
- public String getSize() {
- return size;
- }
-
- public void setSize(String size) {
- this.size = size;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
-}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.entity;
+
+public class CsarPackage {
+ private String id;
+ private String name;
+ private String createTime;
+ private String size;
+ private String status;
+ private String deletionPending;
+ private String format;
+ private String url;
+ private String type;
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getFormat() {
+ return format;
+ }
+
+ public void setFormat(String format) {
+ this.format = format;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public String getDeletionPending() {
+ return deletionPending;
+ }
+
+ public void setDeletionPending(String deletionPending) {
+ this.deletionPending = deletionPending;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getSize() {
+ return size;
+ }
+
+ public void setSize(String size) {
+ this.size = size;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity;\r
\r
import lombok.AllArgsConstructor;\r
@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
-public class CSARQueryCondition {\r
+public class CsarQueryCondition {\r
\r
- private String csarId;\r
+ private String csarId;\r
\r
- private String name;\r
+ private String name;\r
\r
- private String provider;\r
+ private String provider;\r
\r
- private String version;\r
+ private String version;\r
\r
- private Boolean deletionPending;\r
+ private Boolean deletionPending;\r
\r
- private EnumType type;\r
+ private EnumType type;\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity;\r
\r
-/**\r
- * @author 00164331\r
- *\r
- */\r
public enum EnumOnboardState {\r
- onBoarded("onBoarded"), nonOnBoarded("non-onBoarded");\r
- \r
- String value;\r
+ onBoarded("onBoarded"), nonOnBoarded("non-onBoarded");\r
+\r
+ String value;\r
+\r
+ EnumOnboardState(String value) {\r
+ this.value = value;\r
+ }\r
\r
- EnumOnboardState(String value) {\r
- this.value = value;\r
- }\r
- \r
- public String getValue() {\r
- return value;\r
- }\r
+ public String getValue() {\r
+ return value;\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity;\r
\r
public enum EnumOperationalState {\r
- Enabled, Disabled\r
+ Enabled, Disabled\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity;\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
public enum EnumProcessState {\r
- normal, onBoarding, onBoardFailed, deleting, deleteFailed\r
+ normal, onBoarding, onBoardFailed, deleting, deleteFailed\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity;\r
\r
public enum EnumType {\r
- GSAR, SSAR, NSAR, NFAR\r
+ GSAR, SSAR, NSAR, NFAR\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity;\r
\r
public enum EnumUsageState {\r
- InUse, NotInUse\r
+ InUse, NotInUse\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity;\r
\r
public class VnfPackage {\r
- private String vnfPackageId;\r
- private String name;\r
- private String version;\r
- private String provider;\r
- private String vnfd;\r
- private EnumOperationalState operationalState = EnumOperationalState.Disabled;\r
- private EnumUsageState usageState = EnumUsageState.InUse;\r
- private String deletionPending;\r
- private String vnfPackageUrl;\r
-\r
- public String getVnfPackageId() {\r
- return vnfPackageId;\r
- }\r
-\r
- public void setVnfPackageId(String vnfPackageId) {\r
- this.vnfPackageId = vnfPackageId;\r
- }\r
-\r
- public String getVersion() {\r
- return version;\r
- }\r
-\r
- public void setVersion(String version) {\r
- this.version = version;\r
- }\r
-\r
- public String getProvider() {\r
- return provider;\r
- }\r
-\r
- public void setProvider(String provider) {\r
- this.provider = provider;\r
- }\r
-\r
- public String getVnfd() {\r
- return vnfd;\r
- }\r
-\r
- public void setVnfd(String vnfd) {\r
- this.vnfd = vnfd;\r
- }\r
-\r
- public EnumOperationalState getOperationalState() {\r
- return operationalState;\r
- }\r
-\r
- public void setOperationalState(EnumOperationalState operationalState) {\r
- this.operationalState = operationalState;\r
- }\r
-\r
- public EnumUsageState getUsageState() {\r
- return usageState;\r
- }\r
-\r
- public void setUsageState(EnumUsageState usageState) {\r
- this.usageState = usageState;\r
- }\r
-\r
- public String getVnfPackageUrl() {\r
- return vnfPackageUrl;\r
- }\r
-\r
- public void setVnfPackageUrl(String vnfPackageUrl) {\r
- this.vnfPackageUrl = vnfPackageUrl;\r
- }\r
-\r
- public String getDeletionPending() {\r
- return deletionPending;\r
- }\r
-\r
- public void setDeletionPending(String deletionPending) {\r
- this.deletionPending = deletionPending;\r
- }\r
-\r
- public String getName() {\r
- return name;\r
- }\r
-\r
- public void setName(String name) {\r
- this.name = name;\r
- }\r
+ private String vnfPackageId;\r
+ private String name;\r
+ private String version;\r
+ private String provider;\r
+ private String vnfd;\r
+ private EnumOperationalState operationalState = EnumOperationalState.Disabled;\r
+ private EnumUsageState usageState = EnumUsageState.InUse;\r
+ private String deletionPending;\r
+ private String vnfPackageUrl;\r
+\r
+ public String getVnfPackageId() {\r
+ return vnfPackageId;\r
+ }\r
+\r
+ public void setVnfPackageId(String vnfPackageId) {\r
+ this.vnfPackageId = vnfPackageId;\r
+ }\r
+\r
+ public String getVersion() {\r
+ return version;\r
+ }\r
+\r
+ public void setVersion(String version) {\r
+ this.version = version;\r
+ }\r
+\r
+ public String getProvider() {\r
+ return provider;\r
+ }\r
+\r
+ public void setProvider(String provider) {\r
+ this.provider = provider;\r
+ }\r
+\r
+ public String getVnfd() {\r
+ return vnfd;\r
+ }\r
+\r
+ public void setVnfd(String vnfd) {\r
+ this.vnfd = vnfd;\r
+ }\r
+\r
+ public EnumOperationalState getOperationalState() {\r
+ return operationalState;\r
+ }\r
+\r
+ public void setOperationalState(EnumOperationalState operationalState) {\r
+ this.operationalState = operationalState;\r
+ }\r
+\r
+ public EnumUsageState getUsageState() {\r
+ return usageState;\r
+ }\r
+\r
+ public void setUsageState(EnumUsageState usageState) {\r
+ this.usageState = usageState;\r
+ }\r
+\r
+ public String getVnfPackageUrl() {\r
+ return vnfPackageUrl;\r
+ }\r
+\r
+ public void setVnfPackageUrl(String vnfPackageUrl) {\r
+ this.vnfPackageUrl = vnfPackageUrl;\r
+ }\r
+\r
+ public String getDeletionPending() {\r
+ return deletionPending;\r
+ }\r
+\r
+ public void setDeletionPending(String deletionPending) {\r
+ this.deletionPending = deletionPending;\r
+ }\r
+\r
+ public String getName() {\r
+ return name;\r
+ }\r
+\r
+ public void setName(String name) {\r
+ this.name = name;\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.entity.request;\r
\r
-import org.openo.commontosca.catalog.entity.EnumType;\r
+package org.openo.commontosca.catalog.entity.request;\r
\r
import lombok.AllArgsConstructor;\r
import lombok.Data;\r
import lombok.NoArgsConstructor;\r
\r
+import org.openo.commontosca.catalog.entity.EnumType;\r
+\r
\r
@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
public class PackageBasicInfo {\r
\r
- private String provider;\r
+ private String provider;\r
\r
- private EnumType type;\r
+ private EnumType type;\r
\r
- private String version;\r
+ private String version;\r
\r
- private String format;\r
+ private String format;\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity.request;\r
\r
import lombok.AllArgsConstructor;\r
\r
import org.openo.commontosca.catalog.entity.EnumType;\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
public class UploadPackageFromFtpRequest {\r
\r
- private String provider;\r
+ private String provider;\r
\r
- private EnumType type;\r
+ private EnumType type;\r
\r
- private String version;\r
+ private String version;\r
\r
- private String ftpUrl;\r
+ private String ftpUrl;\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity.response;\r
\r
import lombok.AllArgsConstructor;\r
import lombok.NoArgsConstructor;\r
\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
public class CsarFileUriResponse {\r
\r
- private String downloadUri;\r
+ private String downloadUri;\r
\r
- private String localPath;\r
+ private String localPath;\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.entity.response;\r
\r
-import org.openo.commontosca.catalog.entity.EnumProcessState;\r
-import org.openo.commontosca.catalog.entity.EnumOperationalState;\r
-import org.openo.commontosca.catalog.entity.EnumUsageState;\r
+package org.openo.commontosca.catalog.entity.response;\r
\r
import lombok.AllArgsConstructor;\r
import lombok.Data;\r
import lombok.NoArgsConstructor;\r
\r
+import org.openo.commontosca.catalog.entity.EnumOperationalState;\r
+import org.openo.commontosca.catalog.entity.EnumProcessState;\r
+import org.openo.commontosca.catalog.entity.EnumUsageState;\r
+\r
@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
public class PackageMeta {\r
\r
- private String csarId;\r
+ private String csarId;\r
\r
- private String name;\r
+ private String name;\r
\r
- private String downloadUri;\r
+ private String downloadUri;\r
\r
- private String size;\r
+ private String size;\r
\r
- private String version;\r
+ private String version;\r
\r
- private String provider;\r
+ private String provider;\r
\r
- private String type;\r
+ private String type;\r
\r
- private String format;\r
+ private String format;\r
\r
- private boolean deletionPending;\r
+ private boolean deletionPending;\r
\r
- private String createTime;\r
+ private String createTime;\r
\r
- private String modifyTime;\r
+ private String modifyTime;\r
\r
- private EnumOperationalState operationalState;\r
+ private EnumOperationalState operationalState;\r
\r
- private EnumUsageState usageState;\r
+ private EnumUsageState usageState;\r
\r
- private String onBoardState;\r
+ private String onBoardState;\r
\r
- private EnumProcessState processState;\r
+ private EnumProcessState processState;\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity.response;\r
\r
import lombok.AllArgsConstructor;\r
@AllArgsConstructor\r
public class UpdatePackageResponse {\r
\r
- private String usageState;\r
+ private String usageState;\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.entity.response;\r
\r
import lombok.AllArgsConstructor;\r
@AllArgsConstructor\r
public class UploadPackageResponse {\r
\r
- private String csarId;\r
+ private String csarId;\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.externalservice.msb;\r
\r
+package org.openo.commontosca.catalog.externalservice.msb;\r
\r
+import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
import org.glassfish.jersey.client.ClientConfig;\r
import org.openo.commontosca.catalog.common.Config;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
\r
-/**\r
- * @author 10159474\r
- *\r
- */\r
public class MicroserviceBusConsumer {\r
- private static final Logger LOG = LoggerFactory.getLogger(MicroserviceBusConsumer.class);\r
+ private static final Logger LOG = LoggerFactory.getLogger(MicroserviceBusConsumer.class);\r
\r
- public static boolean registerService(ServiceRegisterEntity entity) {\r
- ClientConfig config = new ClientConfig();\r
- try {\r
- MicroserviceBusRest resourceserviceproxy = ConsumerFactory.createConsumer(\r
- Config.getConfigration().getMsbServerAddr(),config, MicroserviceBusRest.class);\r
- resourceserviceproxy.registerServce("false", entity);\r
- } catch (Exception e) {\r
- LOG.error("microservice register failed!" + e.getMessage());\r
- return false;\r
- }\r
- return true;\r
+ /**\r
+ * register service to MSB.\r
+ * @param entity ServiceRegisterEntity\r
+ * @return boolean\r
+ */\r
+ public static boolean registerService(ServiceRegisterEntity entity) {\r
+ ClientConfig config = new ClientConfig();\r
+ try {\r
+ MicroserviceBusRest resourceserviceproxy =\r
+ ConsumerFactory.createConsumer(Config.getConfigration().getMsbServerAddr(), config,\r
+ MicroserviceBusRest.class);\r
+ resourceserviceproxy.registerServce("false", entity);\r
+ } catch (Exception e1) {\r
+ LOG.error("microservice register failed!" + e1.getMessage());\r
+ return false;\r
}\r
+ return true;\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.externalservice.msb;\r
\r
import javax.ws.rs.Consumes;\r
import javax.ws.rs.QueryParam;\r
import javax.ws.rs.core.MediaType;\r
\r
-\r
-/**\r
- * @author 10159474\r
- *\r
- */\r
@Path("/openoapi/microservices/v1/services")\r
-//@Path("/api/microservices/v1/services")\r
+// @Path("/api/microservices/v1/services")\r
public interface MicroserviceBusRest {\r
- @Path("")\r
- @POST\r
- @Consumes(MediaType.APPLICATION_JSON)\r
- @Produces(MediaType.APPLICATION_JSON)\r
- public ServiceRegisterEntity registerServce(@QueryParam("createOrUpdate") String createOrUpdate,ServiceRegisterEntity entity)throws Exception;\r
+ @Path("")\r
+ @POST\r
+ @Consumes(MediaType.APPLICATION_JSON)\r
+ @Produces(MediaType.APPLICATION_JSON)\r
+ public ServiceRegisterEntity registerServce(@QueryParam("createOrUpdate") String createOrUpdate,\r
+ ServiceRegisterEntity entity) throws Exception;\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.externalservice.msb;\r
\r
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;\r
import lombok.Data;\r
import lombok.NoArgsConstructor;\r
\r
-/**\r
- * @author 10159474\r
- *\r
- */\r
\r
@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
@JsonIgnoreProperties(ignoreUnknown = true)\r
public class ServiceNode {\r
- private String ip;\r
- private String port;\r
- private int ttl;\r
+ private String ip;\r
+ private String port;\r
+ private int ttl;\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.externalservice.msb;\r
\r
-import java.util.ArrayList;\r
+package org.openo.commontosca.catalog.externalservice.msb;\r
\r
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;\r
\r
import lombok.Data;\r
import lombok.NoArgsConstructor;\r
\r
-/**\r
- * @author 10159474\r
- *\r
- */\r
+import java.util.ArrayList;\r
+\r
+\r
@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
@JsonIgnoreProperties(ignoreUnknown = true)\r
public class ServiceRegisterEntity {\r
- private String serviceName;\r
- private String version;\r
- private String url;\r
- private String protocol;\r
- private String visualRange;\r
- private ArrayList<ServiceNode> nodes = new ArrayList<ServiceNode>();\r
-\r
- public void setSingleNode(String ip, String port, int ttl) {\r
- ServiceNode node = new ServiceNode();\r
- node.setIp(ip);\r
- node.setPort(port);\r
- node.setTtl(ttl);\r
- nodes.add(node);\r
- }\r
+ private String serviceName;\r
+ private String version;\r
+ private String url;\r
+ private String protocol;\r
+ private String visualRange;\r
+ private ArrayList<ServiceNode> nodes = new ArrayList<ServiceNode>();\r
\r
-}\r
+ /**\r
+ * set single node.\r
+ * @param ip ip\r
+ * @param port port\r
+ * @param ttl ttl\r
+ */\r
+ public void setSingleNode(String ip, String port, int ttl) {\r
+ ServiceNode node = new ServiceNode();\r
+ node.setIp(ip);\r
+ node.setPort(port);\r
+ node.setTtl(ttl);\r
+ nodes.add(node);\r
+ }\r
\r
+}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.filemanage;
+import org.openo.commontosca.catalog.filemanage.entity.FileLink;
+
import java.util.ArrayList;
-import org.openo.commontosca.catalog.filemanage.entity.FileLink;
public interface FileManager {
- /**
- * @param srcPath
- * @param dstPath/packageType/provider/packageName/version
- * @return
- */
- boolean upload(String srcPath, String dstPath);
+
+ /**
+ * package upload api.
+ * @param srcPath source path
+ * @param dstPath/packageType/provider/packageName/version
+ * @return boolean
+ */
+ boolean upload(String srcPath, String dstPath);
- boolean download(String srcPath, String dstPath);
+ boolean download(String srcPath, String dstPath);
- boolean delete(String srcPath);
+ boolean delete(String srcPath);
- ArrayList<FileLink> queryWorkFlow(String path);
+ ArrayList<FileLink> queryWorkFlow(String path);
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.filemanage;
import org.openo.commontosca.catalog.filemanage.http.HttpFileManagerImpl;
import org.slf4j.LoggerFactory;
public class FileManagerFactory {
- private static final Logger logger = LoggerFactory.getLogger(FileManagerFactory.class);
+ private static final Logger logger = LoggerFactory.getLogger(FileManagerFactory.class);
- private static FileManager getHttpFileManager() {
- return new HttpFileManagerImpl();
- }
+ private static FileManager getHttpFileManager() {
+ return new HttpFileManagerImpl();
+ }
- public static FileManager createFileManager() {
- switch (getType()) {
- case http:
- return getHttpFileManager();
- case ftp:
- return null;
- default:
- return getHttpFileManager();
- }
+ /**
+ * create file manager.
+ * @return FileManager
+ */
+ public static FileManager createFileManager() {
+ switch (getType()) {
+ case http:
+ return getHttpFileManager();
+ case ftp:
+ return null;
+ default:
+ return getHttpFileManager();
}
+ }
- private static FileManagerType getType() {
- String type = System.getenv("useFtp");
- logger.info("read environment varibale uesFtp:" + type);
- if (type != null && "true".equals(type))
- return FileManagerType.ftp;
- else
- return FileManagerType.http;
+ private static FileManagerType getType() {
+ String type = System.getenv("useFtp");
+ logger.info("read environment varibale uesFtp:" + type);
+ if (type != null && "true".equals(type)) {
+ return FileManagerType.ftp;
+ } else {
+ return FileManagerType.http;
}
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.filemanage;
public enum FileManagerType {
- ftp, http;
- public static FileManagerType getType(String type) {
- return valueOf(type);
- }
+ ftp, http;
+ public static FileManagerType getType(String type) {
+ return valueOf(type);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.filemanage.entity;
import lombok.AllArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
public class FileLink {
- private String fileName;
- private String downloadUri;
+ private String fileName;
+ private String downloadUri;
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.filemanage.http;
-import java.io.File;
-import java.io.IOException;
-import java.util.ArrayList;
+package org.openo.commontosca.catalog.filemanage.http;
import org.openo.commontosca.catalog.filemanage.FileManager;
import org.openo.commontosca.catalog.filemanage.entity.FileLink;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.io.File;
+import java.io.IOException;
+import java.util.ArrayList;
+
+
public class HttpFileManagerImpl implements FileManager {
- private static final Logger LOGGER = LoggerFactory.getLogger(HttpFileManagerImpl.class);
+ private static final Logger LOGGER = LoggerFactory.getLogger(HttpFileManagerImpl.class);
- @Override
- public boolean upload(String srcPath, String dstPath) {
- boolean flag = true;
- LOGGER.info("start upload file.srcPath:" + srcPath + " dstPath" + dstPath);
- File srcFile = new File(srcPath);
- if (!srcFile.exists()) {
- LOGGER.error("src file not exist!");
- return false;
- }
- // File dstFile = new File(ToolUtil.getHttpServerPath() + dstPath);
- // LOGGER.info("dstFile AbsolutePath:" + dstFile.getAbsolutePath());
- String targetDir = Class.class.getClass().getResource("/").getPath() + ToolUtil.getHttpServerPath() + dstPath;
- try {
- ToolUtil.copyDirectory(srcPath, targetDir, true);
- } catch (IOException e) {
- flag = false;
- LOGGER.error("copy file failed.errorMsg:" + e.getMessage());
- }
- LOGGER.info("upload file success!");
- return flag;
+ @Override
+ public boolean upload(String srcPath, String dstPath) {
+ boolean flag = true;
+ LOGGER.info("start upload file.srcPath:" + srcPath + " dstPath" + dstPath);
+ File srcFile = new File(srcPath);
+ if (!srcFile.exists()) {
+ LOGGER.error("src file not exist!");
+ return false;
}
-
- @Override
- public boolean download(String srcPath, String dstPath) {
- // TODO Auto-generated method stub
- return false;
+ // File dstFile = new File(ToolUtil.getHttpServerPath() + dstPath);
+ // LOGGER.info("dstFile AbsolutePath:" + dstFile.getAbsolutePath());
+ String targetDir =
+ Class.class.getClass().getResource("/").getPath() + ToolUtil.getHttpServerPath() + dstPath;
+ try {
+ ToolUtil.copyDirectory(srcPath, targetDir, true);
+ } catch (IOException e1) {
+ flag = false;
+ LOGGER.error("copy file failed.errorMsg:" + e1.getMessage());
}
+ LOGGER.info("upload file success!");
+ return flag;
+ }
- @Override
- public boolean delete(String srcPath) {
- boolean flag = true;
- LOGGER.info("start delete file from http server.srcPath:" + srcPath);
- flag = ToolUtil.deleteDir(new File(ToolUtil.getHttpServerPath() + srcPath));
- LOGGER.info("delete file from http server end.flag:" + flag);
- return flag;
- }
+ @Override
+ public boolean download(String srcPath, String dstPath) {
+ // TODO Auto-generated method stub
+ return false;
+ }
+
+ @Override
+ public boolean delete(String srcPath) {
+ boolean flag = true;
+ LOGGER.info("start delete file from http server.srcPath:" + srcPath);
+ flag = ToolUtil.deleteDir(new File(ToolUtil.getHttpServerPath() + srcPath));
+ LOGGER.info("delete file from http server end.flag:" + flag);
+ return flag;
+ }
- @Override
- public ArrayList<FileLink> queryWorkFlow(String path) {
- LOGGER.info("start query workFlow from http server.path:" + path);
- File workFlowRoot = new File(ToolUtil.getHttpServerPath() + path);
- ArrayList<FileLink> fileLinks = new ArrayList<FileLink>();
- File[] files = workFlowRoot.listFiles();
- if (files != null && files.length != 0) {
- for (File file : files) {
- if (file.isFile() && file.getName().endsWith(".zip")) {
- FileLink fileLink = new FileLink();
- fileLink.setFileName(file.getName());
- fileLink.setDownloadUri(path + "/" + file.getName());
- }
- }
+ @Override
+ public ArrayList<FileLink> queryWorkFlow(String path) {
+ LOGGER.info("start query workFlow from http server.path:" + path);
+ File workFlowRoot = new File(ToolUtil.getHttpServerPath() + path);
+ ArrayList<FileLink> fileLinks = new ArrayList<FileLink>();
+ File[] files = workFlowRoot.listFiles();
+ if (files != null && files.length != 0) {
+ for (File file : files) {
+ if (file.isFile() && file.getName().endsWith(".zip")) {
+ FileLink fileLink = new FileLink();
+ fileLink.setFileName(file.getName());
+ fileLink.setDownloadUri(path + "/" + file.getName());
}
- LOGGER.info("start query workFlow from http server.size:" + fileLinks.size());
- return fileLinks;
+ }
}
+ LOGGER.info("start query workFlow from http server.size:" + fileLinks.size());
+ return fileLinks;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.filemanage.http;
+import org.openo.commontosca.catalog.common.HttpServerPathConfig;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
import java.io.InputStream;
import java.io.OutputStream;
-import org.openo.commontosca.catalog.common.HttpServerPathConfig;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
public class ToolUtil {
- private static final Logger LOGGER = LoggerFactory.getLogger(ToolUtil.class);
-
- public static boolean copyDirectory(String srcDirName, String destDirName, boolean overlay)
- throws IOException {
- File srcDir = new File(srcDirName);
- if (!srcDir.exists()) {
- return false;
- } else if (!srcDir.isDirectory()) {
- return false;
- }
+ private static final Logger LOGGER = LoggerFactory.getLogger(ToolUtil.class);
- if (!destDirName.endsWith(File.separator)) {
- destDirName = destDirName + File.separator;
- }
- File destDir = new File(destDirName);
- if (destDir.exists()) {
- if (overlay) {
- new File(destDirName).delete();
- } else {
- return false;
- }
- } else {
- if (!destDir.mkdirs()) {
- return false;
- }
- }
- boolean flag = true;
- File[] files = srcDir.listFiles();
- for (int i = 0; i < files.length; i++) {
- if (files[i].isFile()) {
- flag = copyFile(files[i].getAbsolutePath(), destDirName + files[i].getName(), true);
- if (!flag)
- break;
- } else if (files[i].isDirectory()) {
- flag =
- copyDirectory(files[i].getAbsolutePath(), destDirName + files[i].getName(),
- overlay);
- if (!flag)
- break;
- }
+ /**
+ * copy from directory.
+ * @param srcDirName source directory name
+ * @param destDirName destination directory name
+ * @param overlay overwrite or not
+ * @return boolean
+ * @throws IOException e
+ */
+ public static boolean copyDirectory(String srcDirName, String destDirName, boolean overlay)
+ throws IOException {
+ File srcDir = new File(srcDirName);
+ if (!srcDir.exists()) {
+ return false;
+ } else if (!srcDir.isDirectory()) {
+ return false;
+ }
+
+ if (!destDirName.endsWith(File.separator)) {
+ destDirName = destDirName + File.separator;
+ }
+ File destDir = new File(destDirName);
+ if (destDir.exists()) {
+ if (overlay) {
+ new File(destDirName).delete();
+ } else {
+ return false;
+ }
+ } else {
+ if (!destDir.mkdirs()) {
+ return false;
+ }
+ }
+ boolean flag = true;
+ File[] files = srcDir.listFiles();
+ for (int i = 0; i < files.length; i++) {
+ if (files[i].isFile()) {
+ flag = copyFile(files[i].getAbsolutePath(), destDirName + files[i].getName(), true);
+ if (!flag) {
+ break;
}
+ } else if (files[i].isDirectory()) {
+ flag = copyDirectory(files[i].getAbsolutePath(), destDirName + files[i].getName(), overlay);
if (!flag) {
- String MESSAGE = "Copy catagory " + srcDirName + " to " + destDirName + " failed！";
- LOGGER.error(MESSAGE);
- return false;
- } else {
- return true;
+ break;
}
+ }
}
+ if (!flag) {
+ String message = "Copy catagory " + srcDirName + " to " + destDirName + " failed！";
+ LOGGER.error(message);
+ return false;
+ } else {
+ return true;
+ }
+ }
- public static boolean copyFile(String srcFileName, String destFileName, boolean overlay) {
- File srcFile = new File(srcFileName);
-
- if (!srcFile.exists()) {
- String MESSAGE = "Source file ：" + srcFileName + " not exist !";
- LOGGER.error(MESSAGE);
- return false;
- } else if (!srcFile.isFile()) {
- return false;
- }
+ /**
+ * copy file.
+ * @param srcFileName source file name
+ * @param destFileName target file name
+ * @param overlay overwrite or not
+ * @return boolean
+ */
+ public static boolean copyFile(String srcFileName, String destFileName, boolean overlay) {
+ File srcFile = new File(srcFileName);
- File destFile = new File(destFileName);
- if (destFile.exists()) {
- if (overlay) {
- new File(destFileName).delete();
- }
- } else {
- if (!destFile.getParentFile().exists()) {
- if (!destFile.getParentFile().mkdirs()) {
- return false;
- }
- }
- }
+ if (!srcFile.exists()) {
+ String message = "Source file ：" + srcFileName + " not exist !";
+ LOGGER.error(message);
+ return false;
+ } else if (!srcFile.isFile()) {
+ return false;
+ }
- int byteread = 0;
- InputStream in = null;
- OutputStream out = null;
-
- try {
- in = new FileInputStream(srcFile);
- out = new FileOutputStream(destFile);
- byte[] buffer = new byte[1024];
-
- while ((byteread = in.read(buffer)) != -1) {
- out.write(buffer, 0, byteread);
- }
- return true;
- } catch (FileNotFoundException e) {
- return false;
- } catch (IOException e) {
- return false;
- } finally {
- try {
- if (out != null)
- out.close();
- if (in != null)
- in.close();
- } catch (IOException e) {
- e.printStackTrace();
- }
+ File destFile = new File(destFileName);
+ if (destFile.exists()) {
+ if (overlay) {
+ new File(destFileName).delete();
+ }
+ } else {
+ if (!destFile.getParentFile().exists()) {
+ if (!destFile.getParentFile().mkdirs()) {
+ return false;
}
+ }
}
- public static boolean createDir(String destDirName) {
- File dir = new File(destDirName);
- if (dir.exists()) {
- dir.delete();
+ int byteread = 0;
+ InputStream in = null;
+ OutputStream out = null;
+
+ try {
+ in = new FileInputStream(srcFile);
+ out = new FileOutputStream(destFile);
+ byte[] buffer = new byte[1024];
+
+ while ((byteread = in.read(buffer)) != -1) {
+ out.write(buffer, 0, byteread);
+ }
+ return true;
+ } catch (FileNotFoundException e1) {
+ return false;
+ } catch (IOException e1) {
+ return false;
+ } finally {
+ try {
+ if (out != null) {
+ out.close();
}
- if (!destDirName.endsWith(File.separator))
- destDirName = destDirName + File.separator;
- if (dir.mkdirs()) {
- return true;
- } else {
- return false;
+ if (in != null) {
+ in.close();
}
+ } catch (IOException e1) {
+ e1.printStackTrace();
+ }
}
+ }
- public static String getHttpServerPath() {
- return HttpServerPathConfig.getHttpServerPath();
+ /**
+ * create directory.
+ * @param destDirName target directory name
+ * @return boolean
+ */
+ public static boolean createDir(String destDirName) {
+ File dir = new File(destDirName);
+ if (dir.exists()) {
+ dir.delete();
}
+ if (!destDirName.endsWith(File.separator)) {
+ destDirName = destDirName + File.separator;
+ }
+ if (dir.mkdirs()) {
+ return true;
+ } else {
+ return false;
+ }
+ }
+
+ public static String getHttpServerPath() {
+ return HttpServerPathConfig.getHttpServerPath();
+ }
- public static boolean deleteDir(File dir) {
- if (dir.isDirectory()) {
- String[] children = dir.list();
- for (int i = 0; i < children.length; i++) {
- boolean success = deleteDir(new File(dir, children[i]));
- if (!success) {
- return false;
- }
- }
+ /**
+ * delete directory.
+ * @param dir file to delete
+ * @return boolean
+ */
+ public static boolean deleteDir(File dir) {
+ if (dir.isDirectory()) {
+ String[] children = dir.list();
+ for (int i = 0; i < children.length; i++) {
+ boolean success = deleteDir(new File(dir, children[i]));
+ if (!success) {
+ return false;
}
- return dir.delete();
+ }
}
+ return dir.delete();
+ }
}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.ftp;\r
\r
import lombok.AllArgsConstructor;\r
import lombok.Data;\r
import lombok.NoArgsConstructor;\r
\r
-\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
@Data\r
@NoArgsConstructor\r
@AllArgsConstructor\r
public class Ftp {\r
\r
- private String ipAddr;\r
+ private String ipAddr;\r
\r
- private Integer port;\r
+ private Integer port;\r
\r
- private String userName;\r
+ private String userName;\r
\r
- private String pwd;\r
+ private String pwd;\r
\r
- private String path;\r
+ private String path;\r
\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.ftp;\r
\r
+import org.apache.commons.net.ftp.FTPClient;\r
+import org.apache.commons.net.ftp.FTPFile;\r
+import org.apache.commons.net.ftp.FTPReply;\r
+import org.apache.log4j.Logger;\r
+\r
import java.io.File;\r
import java.io.FileInputStream;\r
import java.io.FileOutputStream;\r
import java.io.IOException;\r
import java.io.OutputStream;\r
\r
-import org.apache.commons.net.ftp.FTPClient;\r
-import org.apache.commons.net.ftp.FTPFile;\r
-import org.apache.commons.net.ftp.FTPReply;\r
-import org.apache.log4j.Logger;\r
-\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
public class FtpUtil {\r
\r
- private static Logger logger = Logger.getLogger(FtpUtil.class);\r
+ private static Logger logger = Logger.getLogger(FtpUtil.class);\r
\r
- private static FTPClient ftp;\r
+ private static FTPClient ftp;\r
\r
- /**\r
- * 获取ftp连接\r
- * \r
- * @param f\r
- * @return\r
- * @throws Exception\r
- */\r
- public static boolean connectFtp(Ftp f) throws Exception {\r
- ftp = new FTPClient();\r
- boolean flag = false;\r
- int reply;\r
- if (f.getPort() == null) {\r
- ftp.connect(f.getIpAddr(), 21);\r
- } else {\r
- ftp.connect(f.getIpAddr(), f.getPort());\r
- }\r
- ftp.login(f.getUserName(), f.getPwd());\r
- ftp.setFileType(FTPClient.BINARY_FILE_TYPE);\r
- reply = ftp.getReplyCode();\r
- if (!FTPReply.isPositiveCompletion(reply)) {\r
- ftp.disconnect();\r
- return flag;\r
- }\r
- ftp.changeWorkingDirectory(f.getPath());\r
- flag = true;\r
- return flag;\r
+ /**\r
+ * get ftp connection.\r
+ * \r
+ * @param conftp Ftp\r
+ * @return boolean\r
+ * @throws Exception e\r
+ */\r
+ public static boolean connectFtp(Ftp conftp) throws Exception {\r
+ ftp = new FTPClient();\r
+ boolean flag = false;\r
+ if (conftp.getPort() == null) {\r
+ ftp.connect(conftp.getIpAddr(), 21);\r
+ } else {\r
+ ftp.connect(conftp.getIpAddr(), conftp.getPort());\r
+ }\r
+ ftp.login(conftp.getUserName(), conftp.getPwd());\r
+ ftp.setFileType(FTPClient.BINARY_FILE_TYPE);\r
+ int reply = ftp.getReplyCode();\r
+ if (!FTPReply.isPositiveCompletion(reply)) {\r
+ ftp.disconnect();\r
+ return flag;\r
}\r
+ ftp.changeWorkingDirectory(conftp.getPath());\r
+ flag = true;\r
+ return flag;\r
+ }\r
\r
- /**\r
- * 关闭ftp连接\r
- */\r
- public static void closeFtp() {\r
- if (ftp != null && ftp.isConnected()) {\r
- try {\r
- ftp.logout();\r
- ftp.disconnect();\r
- } catch (IOException e) {\r
- e.printStackTrace();\r
- }\r
- }\r
+ /**\r
+ * close ftp connection.\r
+ */\r
+ public static void closeFtp() {\r
+ if (ftp != null && ftp.isConnected()) {\r
+ try {\r
+ ftp.logout();\r
+ ftp.disconnect();\r
+ } catch (IOException e1) {\r
+ e1.printStackTrace();\r
+ }\r
}\r
+ }\r
\r
- /**\r
- * ftp上传文件\r
- * \r
- * @param f\r
- * @throws Exception\r
- */\r
- public static void upload(File f) throws Exception {\r
- if (f.isDirectory()) {\r
- ftp.makeDirectory(f.getName());\r
- ftp.changeWorkingDirectory(f.getName());\r
- String[] files = f.list();\r
- for (String fstr : files) {\r
- File file1 = new File(f.getPath() + "/" + fstr);\r
- if (file1.isDirectory()) {\r
- upload(file1);\r
- ftp.changeToParentDirectory();\r
- } else {\r
- File file2 = new File(f.getPath() + "/" + fstr);\r
- FileInputStream input = new FileInputStream(file2);\r
- ftp.storeFile(file2.getName(), input);\r
- input.close();\r
- }\r
- }\r
+ /**\r
+ * upload file by ftp.\r
+ * \r
+ * @param file file to upload\r
+ * @throws Exception e\r
+ */\r
+ public static void upload(File file) throws Exception {\r
+ if (file.isDirectory()) {\r
+ ftp.makeDirectory(file.getName());\r
+ ftp.changeWorkingDirectory(file.getName());\r
+ String[] files = file.list();\r
+ for (String fstr : files) {\r
+ File file1 = new File(file.getPath() + "/" + fstr);\r
+ if (file1.isDirectory()) {\r
+ upload(file1);\r
+ ftp.changeToParentDirectory();\r
} else {\r
- File file2 = new File(f.getPath());\r
- FileInputStream input = new FileInputStream(file2);\r
- ftp.storeFile(file2.getName(), input);\r
- input.close();\r
+ File file2 = new File(file.getPath() + "/" + fstr);\r
+ FileInputStream input = new FileInputStream(file2);\r
+ ftp.storeFile(file2.getName(), input);\r
+ input.close();\r
}\r
+ }\r
+ } else {\r
+ File file2 = new File(file.getPath());\r
+ FileInputStream input = new FileInputStream(file2);\r
+ ftp.storeFile(file2.getName(), input);\r
+ input.close();\r
}\r
+ }\r
\r
- /**\r
- * 下载链接配置\r
- * \r
- * @param f\r
- * @param localBaseDir 本地目录\r
- * @param remoteBaseDir 远程目录\r
- * @throws Exception\r
- */\r
- public static void startDown(Ftp f, String localBaseDir, String remoteBaseDir) throws Exception {\r
- if (FtpUtil.connectFtp(f)) {\r
+ /**\r
+ * download inline config.\r
+ * \r
+ * @param downftp ftp to download\r
+ * @param localBaseDir local directory\r
+ * @param remoteBaseDir remote directory\r
+ * @throws Exception e\r
+ */\r
+ public static void startDown(Ftp downftp, String localBaseDir, String remoteBaseDir)\r
+ throws Exception {\r
+ if (FtpUtil.connectFtp(downftp)) {\r
\r
+ try {\r
+ FTPFile[] files = null;\r
+ boolean changedir = ftp.changeWorkingDirectory(remoteBaseDir);\r
+ if (changedir) {\r
+ ftp.setControlEncoding("GBK");\r
+ files = ftp.listFiles();\r
+ for (int i = 0; i < files.length; i++) {\r
try {\r
- FTPFile[] files = null;\r
- boolean changedir = ftp.changeWorkingDirectory(remoteBaseDir);\r
- if (changedir) {\r
- ftp.setControlEncoding("GBK");\r
- files = ftp.listFiles();\r
- for (int i = 0; i < files.length; i++) {\r
- try {\r
- downloadFile(files[i], localBaseDir, remoteBaseDir);\r
- } catch (Exception e) {\r
- logger.error(e);\r
- logger.error("<" + files[i].getName() + ">下载失败");\r
- }\r
- }\r
- }\r
- } catch (Exception e) {\r
- logger.error(e);\r
- logger.error("下载过程中出现异常");\r
+ downloadFile(files[i], localBaseDir, remoteBaseDir);\r
+ } catch (Exception e1) {\r
+ logger.error(e1);\r
+ logger.error("<" + files[i].getName() + ">download failed");\r
}\r
- } else {\r
- logger.error("链接失败！");\r
+ }\r
}\r
-\r
+ } catch (Exception e1) {\r
+ logger.error(e1);\r
+ logger.error("error occoured while download");\r
+ }\r
+ } else {\r
+ logger.error("Connect failed !");\r
}\r
\r
+ }\r
\r
- /**\r
- * \r
- * 下载FTP文件 当你需要下载FTP文件的时候，调用此方法 根据<b>获取的文件名，本地地址，远程地址</b>进行下载\r
- * \r
- * @param ftpFile\r
- * @param relativeLocalPath\r
- * @param relativeRemotePath\r
- */\r
- private static void downloadFile(FTPFile ftpFile, String relativeLocalPath,\r
- String relativeRemotePath) {\r
- if (ftpFile.isFile()) {\r
- if (ftpFile.getName().indexOf("?") == -1) {\r
- OutputStream outputStream = null;\r
- try {\r
- File locaFile = new File(relativeLocalPath + ftpFile.getName());\r
- // 判断文件是否存在，存在则返回\r
- if (locaFile.exists()) {\r
- return;\r
- } else {\r
- outputStream = new FileOutputStream(relativeLocalPath + ftpFile.getName());\r
- ftp.retrieveFile(ftpFile.getName(), outputStream);\r
- outputStream.flush();\r
- outputStream.close();\r
- }\r
- } catch (Exception e) {\r
- logger.error(e);\r
- } finally {\r
- try {\r
- if (outputStream != null) {\r
- outputStream.close();\r
- }\r
- } catch (IOException e) {\r
- logger.error("输出文件流异常");\r
- }\r
- }\r
- }\r
- } else {\r
- String newlocalRelatePath = relativeLocalPath + ftpFile.getName();\r
- String newRemote = new String(relativeRemotePath + ftpFile.getName().toString());\r
- File fl = new File(newlocalRelatePath);\r
- if (!fl.exists()) {\r
- fl.mkdirs();\r
- }\r
- try {\r
- newlocalRelatePath = newlocalRelatePath + '/';\r
- newRemote = newRemote + "/";\r
- String currentWorkDir = ftpFile.getName().toString();\r
- boolean changedir = ftp.changeWorkingDirectory(currentWorkDir);\r
- if (changedir) {\r
- FTPFile[] files = null;\r
- files = ftp.listFiles();\r
- for (int i = 0; i < files.length; i++) {\r
- downloadFile(files[i], newlocalRelatePath, newRemote);\r
- }\r
- }\r
- if (changedir) {\r
- ftp.changeToParentDirectory();\r
- }\r
- } catch (Exception e) {\r
- logger.error(e);\r
+\r
+ /**\r
+ * download ftp file.\r
+ * \r
+ * @param ftpFile ftp file to download\r
+ * @param relativeLocalPath relative local path\r
+ * @param relativeRemotePath relative remote path\r
+ */\r
+ private static void downloadFile(FTPFile ftpFile, String relativeLocalPath,\r
+ String relativeRemotePath) {\r
+ if (ftpFile.isFile()) {\r
+ if (ftpFile.getName().indexOf("?") == -1) {\r
+ OutputStream outputStream = null;\r
+ try {\r
+ File locaFile = new File(relativeLocalPath + ftpFile.getName());\r
+ // 判断文件是否存在，存在则返回\r
+ if (locaFile.exists()) {\r
+ return;\r
+ } else {\r
+ outputStream = new FileOutputStream(relativeLocalPath + ftpFile.getName());\r
+ ftp.retrieveFile(ftpFile.getName(), outputStream);\r
+ outputStream.flush();\r
+ outputStream.close();\r
+ }\r
+ } catch (Exception e1) {\r
+ logger.error(e1);\r
+ } finally {\r
+ try {\r
+ if (outputStream != null) {\r
+ outputStream.close();\r
}\r
+ } catch (IOException e1) {\r
+ logger.error("输出文件流异常");\r
+ }\r
+ }\r
+ }\r
+ } else {\r
+ String newlocalRelatePath = relativeLocalPath + ftpFile.getName();\r
+ String newRemote = new String(relativeRemotePath + ftpFile.getName().toString());\r
+ File fl = new File(newlocalRelatePath);\r
+ if (!fl.exists()) {\r
+ fl.mkdirs();\r
+ }\r
+ try {\r
+ newlocalRelatePath = newlocalRelatePath + '/';\r
+ newRemote = newRemote + "/";\r
+ String currentWorkDir = ftpFile.getName().toString();\r
+ boolean changedir = ftp.changeWorkingDirectory(currentWorkDir);\r
+ if (changedir) {\r
+ FTPFile[] files = null;\r
+ files = ftp.listFiles();\r
+ for (int i = 0; i < files.length; i++) {\r
+ downloadFile(files[i], newlocalRelatePath, newRemote);\r
+ }\r
+ }\r
+ if (changedir) {\r
+ ftp.changeToParentDirectory();\r
}\r
+ } catch (Exception e1) {\r
+ logger.error(e1);\r
+ }\r
}\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.health;\r
\r
import com.codahale.metrics.health.HealthCheck;\r
\r
public class ConsoleHealthCheck extends HealthCheck {\r
- private final String template;\r
+ private final String template;\r
\r
- public ConsoleHealthCheck(String template) {\r
- this.template = template;\r
- }\r
+ public ConsoleHealthCheck(String template) {\r
+ this.template = template;\r
+ }\r
\r
- @Override\r
- protected Result check() throws Exception {\r
- final String saying = String.format(template, "TEST");\r
- if (!saying.contains("TEST")) {\r
- return Result.unhealthy("template doesn't include a name");\r
- }\r
- return Result.healthy();\r
+ @Override\r
+ protected Result check() throws Exception {\r
+ final String saying = String.format(template, "TEST");\r
+ if (!saying.contains("TEST")) {\r
+ return Result.unhealthy("template doesn't include a name");\r
}\r
+ return Result.healthy();\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.common;\r
\r
public enum EnumToscaNodeTypeDefinition {\r
- VNF{\r
- @Override\r
- public String getName(){\r
- return "tosca.nodes.nfv.VNF";\r
- }\r
- },\r
- VDU{\r
- @Override\r
- public String getName(){\r
- return "tosca.nodes.nfv.VDU";\r
- }\r
- },\r
- VNFC{\r
- @Override\r
- public String getName(){\r
- return "tosca.nodes.nfv.VNFC";\r
- }\r
- },\r
- VL{\r
- @Override\r
- public String getName(){\r
- return "tosca.nodes.nfv.VL";\r
- }\r
- },\r
- CP{\r
- @Override\r
- public String getName(){\r
- return "tosca.nodes.nfv.CP";\r
- }\r
- };\r
- \r
- public abstract String getName();\r
- \r
- public static boolean isToscaNodeTypeDef(String type){\r
- for(EnumToscaNodeTypeDefinition enumDef : EnumToscaNodeTypeDefinition.values()){\r
- if(type.indexOf(enumDef.getName()) != -1){\r
- return true;\r
- }\r
- }\r
- return false;\r
+ VNF {\r
+ @Override\r
+ public String getName() {\r
+ return "tosca.nodes.nfv.VNF";\r
+ }\r
+ },\r
+ VDU {\r
+ @Override\r
+ public String getName() {\r
+ return "tosca.nodes.nfv.VDU";\r
+ }\r
+ },\r
+ VNFC {\r
+ @Override\r
+ public String getName() {\r
+ return "tosca.nodes.nfv.VNFC";\r
+ }\r
+ },\r
+ VL {\r
+ @Override\r
+ public String getName() {\r
+ return "tosca.nodes.nfv.VL";\r
+ }\r
+ },\r
+ CP {\r
+ @Override\r
+ public String getName() {\r
+ return "tosca.nodes.nfv.CP";\r
+ }\r
+ };\r
+\r
+ public abstract String getName();\r
+\r
+ /**\r
+ * judge wether is tosca node type definition or not.\r
+ * @param type node type\r
+ * @return boolean\r
+ */\r
+ public static boolean isToscaNodeTypeDef(String type) {\r
+ for (EnumToscaNodeTypeDefinition enumDef : EnumToscaNodeTypeDefinition.values()) {\r
+ if (type.indexOf(enumDef.getName()) != -1) {\r
+ return true;\r
+ }\r
}\r
+ return false;\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.common;\r
\r
public enum EnumToscaRelationShipDefinition {\r
- VirtualBindsTo{\r
- @Override\r
- public String getName(){\r
- return "tosca.relationships.nfv.VirtualBindsTo";\r
- }\r
- },\r
- VirtualLinksTo{\r
- @Override\r
- public String getName(){\r
- return "tosca.relationships.nfv.VirtualLinksTo";\r
- }\r
- },\r
- DeployedOn{\r
- @Override\r
- public String getName(){\r
- return "tosca.relationships.nfv.DeployedOn";\r
- }\r
- },\r
- BelongTo{\r
- @Override\r
- public String getName(){\r
- return "tosca.relationships.nfv.BelongTo";\r
- }\r
- };\r
- \r
- public abstract String getName();\r
- \r
+ VirtualBindsTo {\r
+ @Override\r
+ public String getName() {\r
+ return "tosca.relationships.nfv.VirtualBindsTo";\r
+ }\r
+ },\r
+ VirtualLinksTo {\r
+ @Override\r
+ public String getName() {\r
+ return "tosca.relationships.nfv.VirtualLinksTo";\r
+ }\r
+ },\r
+ DeployedOn {\r
+ @Override\r
+ public String getName() {\r
+ return "tosca.relationships.nfv.DeployedOn";\r
+ }\r
+ },\r
+ BelongTo {\r
+ @Override\r
+ public String getName() {\r
+ return "tosca.relationships.nfv.BelongTo";\r
+ }\r
+ };\r
+\r
+ public abstract String getName();\r
+\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.common;
+import com.google.gson.Gson;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonPrimitive;
+
+import org.openo.commontosca.catalog.common.ToolUtil;
+import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
+import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
+import org.openo.commontosca.catalog.db.entity.ServiceTemplateMappingData;
+import org.openo.commontosca.catalog.db.entity.TemplateData;
+import org.openo.commontosca.catalog.model.entity.NodeTemplate;
+import org.openo.commontosca.catalog.model.entity.Parameters;
+import org.openo.commontosca.catalog.model.entity.RelationShip;
+import org.openo.commontosca.catalog.model.entity.ServiceTemplate;
+import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;
+import org.openo.commontosca.catalog.model.entity.SubstitutionMapping;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.HashMap;
import java.util.Map;
import java.util.Map.Entry;
-import org.openo.commontosca.catalog.db.entity.ServiceTemplateMappingData;
-import org.openo.commontosca.catalog.db.entity.TemplateData;
-import org.openo.commontosca.catalog.model.entity.ServiceTemplate;
-import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;
-import org.openo.commontosca.catalog.model.entity.SubstitutionMapping;
-import org.openo.commontosca.catalog.common.ToolUtil;
-import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
-import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
-import org.openo.commontosca.catalog.model.entity.InputParameter;
-import org.openo.commontosca.catalog.model.entity.NodeTemplate;
-import org.openo.commontosca.catalog.model.entity.RelationShip;
-import com.google.gson.Gson;
-import com.google.gson.JsonElement;
-import com.google.gson.JsonObject;
-import com.google.gson.JsonPrimitive;
-/**
- * @author 10090474
- *
- */
public class TemplateDataHelper {
- /**
- * @param st
- * @param ntList
- * @return
- */
- public static TemplateData convert2TemplateData(ServiceTemplate st,
- String rawData, List<NodeTemplate> ntList) {
- TemplateData td = new TemplateData();
- td.setServiceTemplate(convert2ServiceTemplateData(st, rawData));
- td.setNodeTemplates(convert2NodeTemplateDataList(ntList,
- st.getServiceTemplateId()));
- return td;
- }
-
- /**
- * @param st
- * @return
- */
- private static ServiceTemplateData convert2ServiceTemplateData(
- ServiceTemplate st, String rawData) {
- ServiceTemplateData std = new ServiceTemplateData();
- std.setServiceTemplateId(st.getServiceTemplateId());
- std.setTemplateName(st.getTemplateName());
- std.setVendor(st.getVendor());
- std.setVersion(st.getVersion());
- std.setCsarId(st.getCsarid());
- std.setType(st.getType());
- std.setDownloadUri(st.getDownloadUri());
- std.setInputs(ToolUtil.toJson(st.getInputs()));
- std.setOperations(ToolUtil.toJson(st.getOperations()));
- std.setRowData(rawData);
- return std;
- }
-
- /**
- * @param ntList
- * @param serviceTemplateId
- * @return
- */
- private static ArrayList<NodeTemplateData> convert2NodeTemplateDataList(
- List<NodeTemplate> ntList, String serviceTemplateId) {
- ArrayList<NodeTemplateData> ntdList = new ArrayList<>();
- for (NodeTemplate nt : ntList) {
- ntdList.add(convert2NodeTemplateData(nt, serviceTemplateId));
-
- }
- return ntdList;
- }
-
-
- /**
- * @param nt
- * @param serviceTemplateId
- * @return
- */
- private static NodeTemplateData convert2NodeTemplateData(NodeTemplate nt,
- String serviceTemplateId) {
- NodeTemplateData ntd = new NodeTemplateData();
-
- ntd.setNodeTemplateId(nt.getId());
- ntd.setName(nt.getName());
- ntd.setType(nt.getType());
- ntd.setServiceTemplateId(serviceTemplateId);
- ntd.setProperties(ToolUtil.toJson(nt.getProperties()));
- ntd.setRelationShips(ToolUtil.toJson(nt.getRelationShips()));
-
- return ntd;
- }
-
-
- /**
- * @param stdList
- * @return
- */
- public static ServiceTemplate[] convert2ServiceTemplates(
- List<ServiceTemplateData> stdList) {
- List<ServiceTemplate> stList = new ArrayList<>();
- for (ServiceTemplateData std : stdList) {
- stList.add(convert2ServiceTemplate(std));
- }
+ /**
+ * convert to template data.
+ * @param st ServiceTemplate
+ * @param ntList NodeTemplate list
+ * @return TemplateData
+ */
+ public static TemplateData convert2TemplateData(ServiceTemplate st, String rawData,
+ List<NodeTemplate> ntList) {
+ TemplateData td = new TemplateData();
+ td.setServiceTemplate(convert2ServiceTemplateData(st, rawData));
+ td.setNodeTemplates(convert2NodeTemplateDataList(ntList, st.getServiceTemplateId()));
+ return td;
+ }
+
+ /**
+ * convert to service template data.
+ * @param st ServiceTemplate
+ * @return ServiceTemplateData
+ */
+ private static ServiceTemplateData convert2ServiceTemplateData(ServiceTemplate st,
+ String rawData) {
+ ServiceTemplateData std = new ServiceTemplateData();
+ std.setServiceTemplateId(st.getServiceTemplateId());
+ std.setTemplateName(st.getTemplateName());
+ std.setVendor(st.getVendor());
+ std.setVersion(st.getVersion());
+ std.setCsarId(st.getCsarid());
+ std.setType(st.getType());
+ std.setDownloadUri(st.getDownloadUri());
+ Parameters parameters = new Parameters(st.getInputs(), st.getOutputs());
+ std.setInputs(ToolUtil.toJson(parameters));
+ std.setOperations(ToolUtil.toJson(st.getOperations()));
+ std.setRowData(rawData);
+ return std;
+ }
+
+ /**
+ * convert to nodeTemplate data list.
+ * @param ntList NodeTemplate list
+ * @param serviceTemplateId service template id
+ * @return NodeTemplateData list
+ */
+ private static ArrayList<NodeTemplateData> convert2NodeTemplateDataList(List<NodeTemplate> ntList,
+ String serviceTemplateId) {
+ ArrayList<NodeTemplateData> ntdList = new ArrayList<>();
+ for (NodeTemplate nt : ntList) {
+ ntdList.add(convert2NodeTemplateData(nt, serviceTemplateId));
- return stList.toArray(new ServiceTemplate[0]);
}
-
- /**
- * @param std
- * @return
- */
- public static ServiceTemplate convert2ServiceTemplate(
- ServiceTemplateData std) {
- InputParameter[] inputs = ToolUtil.fromJson(std.getInputs(),
- InputParameter[].class);
- ServiceTemplateOperation[] operations = ToolUtil.fromJson(
- std.getOperations(), ServiceTemplateOperation[].class);
-
- return new ServiceTemplate(std.getServiceTemplateId(),
- std.getTemplateName(), std.getVendor(), std.getVersion(),
- std.getCsarId(), std.getType(), std.getDownloadUri(), inputs,
- operations);
- }
-
- /**
- *
- * @param ntdList
- * @return
- */
- public static NodeTemplate[] convert2NodeTemplates(
- List<NodeTemplateData> ntdList) {
- List<NodeTemplate> ntList = new ArrayList<>();
- for (NodeTemplateData ntd : ntdList) {
- ntList.add(convert2NodeTemplate(ntd));
- }
- return ntList.toArray(new NodeTemplate[0]);
- }
-
- /**
- * @param ntd
- * @return
- */
- public static NodeTemplate convert2NodeTemplate(NodeTemplateData ntd) {
- List<RelationShip> relationShips = convert2RelationShipList(ntd
- .getRelationShips());
- return new NodeTemplate(ntd.getNodeTemplateId(), ntd.getName(),
- ntd.getType(), convert2Property(ntd.getProperties()),
- relationShips);
- }
-
- /**
- * @param sRelationShips
- * @return
- */
- private static List<RelationShip> convert2RelationShipList(
- String sRelationShips) {
- RelationShip[] relationShips = ToolUtil.fromJson(sRelationShips,
- RelationShip[].class);
- return Arrays.asList(relationShips);
+ return ntdList;
+ }
+
+
+ /**
+ * convert to nodeTemplate data.
+ * @param nt NodeTemplate
+ * @param serviceTemplateId service template id
+ * @return NodeTemplateData
+ */
+ private static NodeTemplateData convert2NodeTemplateData(NodeTemplate nt,
+ String serviceTemplateId) {
+ NodeTemplateData ntd = new NodeTemplateData();
+
+ ntd.setNodeTemplateId(nt.getId());
+ ntd.setName(nt.getName());
+ ntd.setType(nt.getType());
+ ntd.setServiceTemplateId(serviceTemplateId);
+ ntd.setProperties(ToolUtil.toJson(nt.getProperties()));
+ ntd.setRelationShips(ToolUtil.toJson(nt.getRelationShips()));
+
+ return ntd;
+ }
+
+
+ /**
+ * convert to service templates.
+ * @param stdList ServiceTemplateData list
+ * @return ServiceTemplate list
+ */
+ public static ServiceTemplate[] convert2ServiceTemplates(List<ServiceTemplateData> stdList) {
+ List<ServiceTemplate> stList = new ArrayList<>();
+ for (ServiceTemplateData std : stdList) {
+ stList.add(convert2ServiceTemplate(std));
}
- /**
- * @param properties
- * @return
- */
- private static Map<String, Object> convert2Property(String properties) {
- JsonObject jsonObject = new Gson().fromJson(properties,
- JsonObject.class);
- return parseMapValue(jsonObject);
+ return stList.toArray(new ServiceTemplate[0]);
+ }
+
+ /**
+ * covert to service template.
+ * @param std ServiceTemplateData
+ * @return ServiceTemplate
+ */
+ public static ServiceTemplate convert2ServiceTemplate(ServiceTemplateData std) {
+ Parameters parameters = ToolUtil.fromJson(std.getInputs(), Parameters.class);
+ ServiceTemplateOperation[] operations =
+ ToolUtil.fromJson(std.getOperations(), ServiceTemplateOperation[].class);
+
+ return new ServiceTemplate(std.getServiceTemplateId(), std.getTemplateName(), std.getVendor(),
+ std.getVersion(), std.getCsarId(), std.getType(), std.getDownloadUri(),
+ parameters.getInputs(), parameters.getOutputs(), operations);
+ }
+
+ /**
+ * covert to nodeTemplates.
+ * @param ntdList NodeTemplateData list
+ * @return NodeTemplate list
+ */
+ public static NodeTemplate[] convert2NodeTemplates(List<NodeTemplateData> ntdList) {
+ List<NodeTemplate> ntList = new ArrayList<>();
+ for (NodeTemplateData ntd : ntdList) {
+ ntList.add(convert2NodeTemplate(ntd));
}
-
- private static Map<String, Object> parseMapValue(JsonObject jsonObject) {
- Map<String, Object> map = new HashMap<>();
-
- Iterator<Entry<String, JsonElement>> iterator = jsonObject.entrySet()
- .iterator();
- while (iterator.hasNext()) {
- Entry<String, JsonElement> next = iterator.next();
- if (next.getValue() instanceof JsonPrimitive) {
- map.put(next.getKey(), next.getValue().getAsString());
- continue;
- }
-
- if (next.getValue() instanceof JsonObject) {
- map.put(next.getKey(),
- parseMapValue((JsonObject) next.getValue()));
- continue;
- }
- }
- return map;
- }
-
-
- /**
- * @param stm
- * @return
- */
- public static ServiceTemplateMappingData convert2TemplateMappingData(
- SubstitutionMapping stm) {
- ServiceTemplateMappingData stmd = new ServiceTemplateMappingData();
-
- stmd.setMappingId(ToolUtil.generateId());
- stmd.setServiceTemplateId(stm.getServiceTemplateId());
- stmd.setNodeType(stm.getNode_type());
- stmd.setRequirements(ToolUtil.toJson(stm.getRequirements()));
- stmd.setCapabilities(ToolUtil.toJson(stm.getCapabilities()));
-
- return stmd;
- }
-
- /**
- * @param stmData
- * @return
- */
- public static SubstitutionMapping convert2SubstitutionMapping(
- ServiceTemplateMappingData stmData) {
- return new SubstitutionMapping(stmData.getServiceTemplateId(),
- stmData.getNodeType());
+ return ntList.toArray(new NodeTemplate[0]);
+ }
+
+ /**
+ * covert to nodeTemplate.
+ * @param ntd NodeTemplateData
+ * @return NodeTemplate
+ */
+ public static NodeTemplate convert2NodeTemplate(NodeTemplateData ntd) {
+ List<RelationShip> relationShips = convert2RelationShipList(ntd.getRelationShips());
+ return new NodeTemplate(ntd.getNodeTemplateId(), ntd.getName(), ntd.getType(),
+ convert2Property(ntd.getProperties()), relationShips);
+ }
+
+ /**
+ * covert to relationship list.
+ * @param sRelationShips relationships
+ * @return RelationShip list
+ */
+ private static List<RelationShip> convert2RelationShipList(String srelationShips) {
+ RelationShip[] relationShips = ToolUtil.fromJson(srelationShips, RelationShip[].class);
+ return Arrays.asList(relationShips);
+ }
+
+ /**
+ * convert to propterty.
+ * @param properties properties to covert
+ * @return map
+ */
+ private static Map<String, Object> convert2Property(String properties) {
+ JsonObject jsonObject = new Gson().fromJson(properties, JsonObject.class);
+ return parseMapValue(jsonObject);
+ }
+
+ private static Map<String, Object> parseMapValue(JsonObject jsonObject) {
+ Map<String, Object> map = new HashMap<>();
+
+ Iterator<Entry<String, JsonElement>> iterator = jsonObject.entrySet().iterator();
+ while (iterator.hasNext()) {
+ Entry<String, JsonElement> next = iterator.next();
+ if (next.getValue() instanceof JsonPrimitive) {
+ map.put(next.getKey(), next.getValue().getAsString());
+ continue;
+ }
+
+ if (next.getValue() instanceof JsonObject) {
+ map.put(next.getKey(), parseMapValue((JsonObject) next.getValue()));
+ continue;
+ }
}
+ return map;
+ }
+
+
+ /**
+ * covert to template mapping data.
+ * @param stm data to convert
+ * @return ServiceTemplateMappingData
+ */
+ public static ServiceTemplateMappingData convert2TemplateMappingData(SubstitutionMapping stm) {
+ ServiceTemplateMappingData stmd = new ServiceTemplateMappingData();
+
+ stmd.setMappingId(ToolUtil.generateId());
+ stmd.setServiceTemplateId(stm.getServiceTemplateId());
+ stmd.setNodeType(stm.getNodeType());
+ stmd.setRequirements(ToolUtil.toJson(stm.getRequirements()));
+ stmd.setCapabilities(ToolUtil.toJson(stm.getCapabilities()));
+
+ return stmd;
+ }
+
+ /**
+ * convert to substitution mapping.
+ * @param stmData data to covert
+ * @return SubstitutionMapping
+ */
+ public static SubstitutionMapping convert2SubstitutionMapping(
+ ServiceTemplateMappingData stmData) {
+ return new SubstitutionMapping(stmData.getServiceTemplateId(), stmData.getNodeType());
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
-/**
- * @author 10090474
- *
- */
@AllArgsConstructor
public enum EnumDataType {
- STRING("String"), INTEGER("Integer"), FLOAT("Float"), BOOLEAN("Boolean");
-
- private String value;
+ STRING("String"), INTEGER("Integer"), FLOAT("Float"), BOOLEAN("Boolean");
+
+ private String value;
- public String getValue() {
- return value;
- }
+ public String getValue() {
+ return value;
+ }
- public void setValue(String value) {
- this.value = value;
- }
+ public void setValue(String value) {
+ this.value = value;
+ }
- @Override
- public String toString() {
- return value;
- }
+ @Override
+ public String toString() {
+ return value;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-/**
- * @author 10090474
- *
- */
@Data
@NoArgsConstructor
@AllArgsConstructor
public class InputParameter {
- private String name;
- private EnumDataType type = EnumDataType.STRING;
- private String description;
- private String defaultValue;
- private boolean required;
+ private String name;
+ private EnumDataType type = EnumDataType.STRING;
+ private String description;
+ private String defaultValue;
+ private boolean required;
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
public class KeyValuePair {
- private String key;
- private String value;
+ private String key;
+ private String value;
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.entity;
-import java.util.List;
+package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.util.List;
+
+
@Data
@NoArgsConstructor
@AllArgsConstructor
public class NfvTemplate {
- private List<NodeTemplate> vduNodes;
- private List<NodeTemplate> networkNodes;
- private List<NodeTemplate> vnfcNodes;
- private List<NodeTemplate> vnfNodes;
+ private List<NodeTemplate> vduNodes;
+ private List<NodeTemplate> networkNodes;
+ private List<NodeTemplate> vnfcNodes;
+ private List<NodeTemplate> vnfNodes;
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.entity;
-import java.util.List;
-import java.util.Map;
+package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
+import java.util.List;
+import java.util.Map;
+
@Data
@NoArgsConstructor
@AllArgsConstructor
public class NodeTemplate {
- private String id;
- private String name;
- private String type;
- private Map<String, Object> properties;
- private List<RelationShip> relationShips;
+ private String id;
+ private String name;
+ private String type;
+ private Map<String, Object> properties;
+ private List<RelationShip> relationShips;
}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class OutputParameter {
+
+ private String name;
+
+ private String description;
+
+ private Object value;
+
+}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class Parameters {
+
+ private InputParameter[] inputs;
+
+ private OutputParameter[] outputs;
+
+}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-/**
- * @author 10090474
- *
- */
@Data
@NoArgsConstructor
@AllArgsConstructor
public class QueryRawDataCondition {
- private String csarId;
- private KeyValuePair[] inputParameters;
+ private String csarId;
+ private KeyValuePair[] inputParameters;
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
@Data
@NoArgsConstructor
@AllArgsConstructor
-public class RelationShip {
- private String sourceNodeName;
- private String targetNodeName;
- private String sourceNodeId;
- private String targetNodeId;
- private String type;
+public class RelationShip {
+
+ private String sourceNodeName;
+
+ private String targetNodeName;
+
+ private String sourceNodeId;
+
+ private String targetNodeId;
+
+ private String type;
+
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
public class ServiceTemplate {
- private String serviceTemplateId;
- private String templateName;
- private String vendor;
- private String version;
- private String csarid;
- private String type;
- private String downloadUri;
- private InputParameter[] inputs;
- private ServiceTemplateOperation[] operations;
+
+ private String serviceTemplateId;
+
+ private String templateName;
+
+ private String vendor;
+
+ private String version;
+
+ private String csarid;
+
+ private String type;
+
+ private String downloadUri;
+
+ private InputParameter[] inputs;
+
+ private OutputParameter[] outputs;
+
+ private ServiceTemplateOperation[] operations;
+
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
public class ServiceTemplateOperation {
- private String name;
- private String description;
- private String processId;
- private InputParameter[] inputs;
+
+ private String name;
+
+ private String description;
+
+ private String packageName;
+
+ private String processId;
+
+ private InputParameter[] inputs;
+
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
@NoArgsConstructor
@AllArgsConstructor
public class ServiceTemplateRawData {
- private String rawData;
+
+ private String rawData;
+
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.entity;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
+package org.openo.commontosca.catalog.model.entity;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-/**
- * @author 10090474
- *
- */
+import java.util.HashMap;
+import java.util.Map;
+
@Data
@NoArgsConstructor
@AllArgsConstructor
public class SubstitutionMapping {
- private String serviceTemplateId;
- private String node_type;
- private List<Map<String, String[]>> requirements = new ArrayList<>();
- private Map<String, String[]> capabilities = new HashMap<String, String[]>();
+ private String serviceTemplateId;
+ private String nodeType;
+ private Map<String, String[]> requirements = new HashMap<String, String[]>();
+ private Map<String, String[]> capabilities = new HashMap<String, String[]>();
- /**
- * @param key
- * @param value
- * @return
- */
- public boolean putRequirement(String key, String[] value) {
- Map<String, String[]> requirement = new HashMap<>();
- requirement.put(key, value);
- return this.requirements.add(requirement);
- }
+ /**
+ * put requirement.
+ * @param key key
+ * @param value value
+ * @return string list
+ */
+ public String[] putRequirement(String key, String[] value) {
+ return this.requirements.put(key, value);
+ }
- /**
- * @param key
- * @param value
- * @return
- */
- public String[] putCapability(String key, String[] value) {
- return this.capabilities.put(key, value);
- }
+ /**
+ * put capability.
+ * @param key key
+ * @param value value
+ * @return string list
+ */
+ public String[] putCapability(String key, String[] value) {
+ return this.capabilities.put(key, value);
+ }
- public SubstitutionMapping(String serviceTemplateId, String node_type) {
- super();
- this.serviceTemplateId = serviceTemplateId;
- this.node_type = node_type;
- }
+ /**
+ * substitution mapping.
+ * @param serviceTemplateId service template id
+ * @param nodeType node type
+ */
+ public SubstitutionMapping(String serviceTemplateId, String nodeType) {
+ super();
+ this.serviceTemplateId = serviceTemplateId;
+ this.nodeType = nodeType;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
import java.io.IOException;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerSelfService;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerSelfService;
+
/**
- * The opentosca container self service returns data to the entity
+ * The opentosca container self service returns data to the entity.
+ *
* @author 10189609
- *
+ *
*/
-public class ContainerSelfServiceProvider implements
- MessageBodyReader<ContainerSelfService> {
+public class ContainerSelfServiceProvider implements MessageBodyReader<ContainerSelfService> {
+
+ @Override
+ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType) {
+ return ContainerSelfService.class.isAssignableFrom(type);
+ }
+
+ @Override
+ public ContainerSelfService readFrom(Class<ContainerSelfService> type, Type genericType,
+ Annotation[] annotations, MediaType mediaType, MultivaluedMap<String, String> httpHeaders,
+ InputStream entityStream) throws IOException, WebApplicationException {
+ ContainerSelfService object = null;
- @Override
- public boolean isReadable(Class<?> type, Type genericType,
- Annotation[] annotations, MediaType mediaType) {
- return ContainerSelfService.class.isAssignableFrom(type);
- }
+ try {
+ JAXBContext jaxbContext = JAXBContext.newInstance(ContainerSelfService.class);
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ object = (ContainerSelfService) unmarshaller.unmarshal(entityStream);
+ } catch (JAXBException e1) {
+ e1.printStackTrace();
+ }
- @Override
- public ContainerSelfService readFrom(Class<ContainerSelfService> type,
- Type genericType, Annotation[] annotations, MediaType mediaType,
- MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
- throws IOException, WebApplicationException {
- ContainerSelfService object = null;
-
- try {
- JAXBContext jaxbContext = JAXBContext.newInstance(ContainerSelfService.class);
- Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- object = (ContainerSelfService) unmarshaller.unmarshal(entityStream);
- } catch (JAXBException e) {
- e.printStackTrace();
- }
-
- return object;
- }
+ return object;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
-import java.io.InputStream;
-import java.util.List;
+import com.google.gson.JsonObject;
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
+import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
import org.glassfish.jersey.client.ClientConfig;
import org.glassfish.jersey.media.multipart.BodyPart;
import org.glassfish.jersey.media.multipart.FormDataMultiPart;
import org.glassfish.jersey.media.multipart.MultiPartFeature;
import org.openo.commontosca.catalog.common.Config;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerSelfServiceOption;
import org.openo.commontosca.catalog.common.ToolUtil;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerSelfService;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerServiceNodeTemplateList;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerServiceTemplateList;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerSelfService;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerSelfServiceOption;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerServiceNodeTemplateList;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerServiceTemplateList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;
-import com.google.gson.JsonObject;
+import java.io.InputStream;
+import java.util.List;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
+
+
/**
- * By rest requesting access container services
+ * By rest requesting access container services.
+ *
* @author 10189609
- *
+ *
*/
public class ContainerServiceConsumer {
- private static final Logger LOG = LoggerFactory.getLogger(ContainerServiceConsumer.class);
- /**
- * get service template by template id from container service.
- * @param templateid id
- * @return template list entity
- */
- public static ContainerServiceTemplateList getServiceTemplates(
- final String templateid) {
- ClientConfig config = new ClientConfig(
- new ContainerServiceTemplateProvider());
- IContainerTemplateRest containerservicetemplateproxy = ConsumerFactory
- .createConsumer(getBaseURL(), config,
- IContainerTemplateRest.class);
- return containerservicetemplateproxy
- .getToscaServiceTemplate(templateid);
- }
+ private static final Logger LOG = LoggerFactory.getLogger(ContainerServiceConsumer.class);
+
+ /**
+ * get service template by template id from container service.
+ *
+ * @param templateid id
+ * @return template list entity
+ */
+ public static ContainerServiceTemplateList getServiceTemplates(final String templateid) {
+ ClientConfig config = new ClientConfig(new ContainerServiceTemplateProvider());
+ IContainerTemplateRest containerservicetemplateproxy =
+ ConsumerFactory.createConsumer(getBaseUrl(), config, IContainerTemplateRest.class);
+ return containerservicetemplateproxy.getToscaServiceTemplate(templateid);
+ }
- /**
- * get operation input param xml from container service
- * @param csarId
- * @param operationId
- * @return xml
- */
- public static String getOperationInputParamXml(final String csarId,
- final String operationId) {
- String inputparamsSoapXml = null;
- ClientConfig config = new ClientConfig()
- .register(new ContainerSelfServiceProvider());
- IContainerSelfServiceRest containerserviceoperationproxy = ConsumerFactory
- .createConsumer(getPackageURL(), config,
- IContainerSelfServiceRest.class);
- String csarid = ToolUtil.formatCsar(csarId);
- ContainerSelfService containerselfservice = containerserviceoperationproxy
- .getContainerSelfService(csarid);
- if (containerselfservice != null) {
- for (int i = 0; i < containerselfservice.getOptionList().size(); i++) {
- ContainerSelfServiceOption serviceOption = containerselfservice
- .getOptionList().get(i);
- if (serviceOption != null
- && operationId.equals(serviceOption.getId())) {
- inputparamsSoapXml = containerserviceoperationproxy
- .getContainerSelfServiceOptionInputMessage(
- csarid,
- serviceOption.getPlanInputMessageUrl());
- break;
- }
- }
+ /**
+ * get operation input param xml from container service.
+ *
+ * @param csarId package Id
+ * @param operationId operation id
+ * @return xml
+ */
+ public static String getOperationInputParamXml(final String csarId, final String operationId) {
+ String inputparamsSoapXml = null;
+ ClientConfig config = new ClientConfig().register(new ContainerSelfServiceProvider());
+ IContainerSelfServiceRest containerserviceoperationproxy =
+ ConsumerFactory.createConsumer(getPackageUrl(), config, IContainerSelfServiceRest.class);
+ String csarid = ToolUtil.formatCsar(csarId);
+ ContainerSelfService containerselfservice =
+ containerserviceoperationproxy.getContainerSelfService(csarid);
+ if (containerselfservice != null) {
+ for (int i = 0; i < containerselfservice.getOptionList().size(); i++) {
+ ContainerSelfServiceOption serviceOption = containerselfservice.getOptionList().get(i);
+ if (serviceOption != null && operationId.equals(serviceOption.getId())) {
+ inputparamsSoapXml =
+ containerserviceoperationproxy.getContainerSelfServiceOptionInputMessage(csarid,
+ serviceOption.getPlanInputMessageUrl());
+ break;
}
- return inputparamsSoapXml;
- }
-
- /**
- * get operations by csar id.
- * @param csarId
- * @return xml
- */
- public static String getOperations(final String csarId) {
- ClientConfig config = new ClientConfig()
- .register(new ContainerSelfServiceProvider());
- IContainerSelfServiceRest containerselfserviceproxy = ConsumerFactory
- .createConsumer(getPackageURL(), config,
- IContainerSelfServiceRest.class);
- return containerselfserviceproxy.getContainerSelfServiceXML(ToolUtil.formatCsar(csarId));
- }
-
- public static List<ContainerSelfServiceOption> getOperationList(final String csarId) {
- ClientConfig config = new ClientConfig()
- .register(new ContainerSelfServiceProvider());
- IContainerSelfServiceRest containerserviceoperationproxy = ConsumerFactory
- .createConsumer(getPackageURL(), config,
- IContainerSelfServiceRest.class);
- String csarid = ToolUtil.formatCsar(csarId);
- ContainerSelfService containerselfservice = containerserviceoperationproxy
- .getContainerSelfService(csarid);
- return containerselfservice.getOptionList();
+ }
}
+ return inputparamsSoapXml;
+ }
- /**
- * upload csar package to opentosca containerapi service.
- * @param uploadedInputStream stream
- * @param fileDetail
- * @return response
- */
- public static Response uploadServicePackage(
- InputStream uploadedInputStream,
- FormDataContentDisposition fileDetail) {
- final FormDataMultiPart formData = new FormDataMultiPart();
- final BodyPart bodyPart = new FormDataBodyPart(fileDetail,
- uploadedInputStream, MediaType.APPLICATION_OCTET_STREAM_TYPE);
- formData.bodyPart(bodyPart);
- formData.setContentDisposition(fileDetail);
- formData.setMediaType(MediaType.MULTIPART_FORM_DATA_TYPE);
- final Client client = ClientBuilder.newBuilder()
- .register(MultiPartFeature.class).build();
- final WebTarget target = client.target(getPackageURL()).path(
- "/containerapi/CSARs");
- final Response response = target.request().post(
- Entity.entity(formData, formData.getMediaType()));
- return response;
- }
+ /**
+ * get operations by csar id.
+ *
+ * @param csarId package id
+ * @return xml
+ */
+ public static String getOperations(final String csarId) {
+ ClientConfig config = new ClientConfig().register(new ContainerSelfServiceProvider());
+ IContainerSelfServiceRest containerselfserviceproxy =
+ ConsumerFactory.createConsumer(getPackageUrl(), config, IContainerSelfServiceRest.class);
+ return containerselfserviceproxy.getContainerSelfServiceXml(ToolUtil.formatCsar(csarId));
+ }
- /**
- * upload csar package by file location.
- * @param fileLocation
- * @param fileDetail
- * @return response
- */
- public static Response uploadServicePackageByLocation(String fileLocation) {
- ClientConfig config = new ClientConfig();
- IContainerExtPackageRest containerservicepackageproxy = ConsumerFactory
- .createConsumer(getBaseURL(), config,
- IContainerExtPackageRest.class);
- String result = containerservicepackageproxy
- .uploadPackageByToscaService(fileLocation);
- JsonObject json = new JsonObject();
- json.addProperty("result", result);
- return Response.ok(json.toString()).build();
- }
+ /**
+ * get operation list.
+ * @param csarId package id
+ * @return container operation list
+ */
+ public static List<ContainerSelfServiceOption> getOperationList(final String csarId) {
+ ClientConfig config = new ClientConfig().register(new ContainerSelfServiceProvider());
+ IContainerSelfServiceRest containerserviceoperationproxy =
+ ConsumerFactory.createConsumer(getPackageUrl(), config, IContainerSelfServiceRest.class);
+ String csarid = ToolUtil.formatCsar(csarId);
+ ContainerSelfService containerselfservice =
+ containerserviceoperationproxy.getContainerSelfService(csarid);
+ return containerselfservice.getOptionList();
+ }
- /**
- * delete a csar package by csar name.
- * @param csarName
- * @return
- */
- public static String delServicePackage(final String csarName) {
- ClientConfig config = new ClientConfig();
- IContainerExtPackageRest containerservicepackageproxy = ConsumerFactory
- .createConsumer(getBaseURL(), config,
- IContainerExtPackageRest.class);
- LOG.info("url:" + getBaseURL() + " csarName:" + csarName);
- return containerservicepackageproxy.deletePackageById(csarName);
- }
-
- /**
- * get node template list.
- * @param templateId
- * @return
- */
- public static ContainerServiceNodeTemplateList getNodeTemplates(
- final String templateId) {
- ClientConfig config = new ClientConfig(new ContainerServiceNodeTemplateProvider());
- IContainerTemplateRest containertemplateproxy = ConsumerFactory
- .createConsumer(getBaseURL(), config, IContainerTemplateRest.class);
- return containertemplateproxy.getToscaServiceNodeTemplates(templateId);
- }
+ /**
+ * upload csar package to opentosca containerapi service.
+ *
+ * @param uploadedInputStream stream
+ * @param fileDetail file detail
+ * @return response
+ */
+ public static Response uploadServicePackage(InputStream uploadedInputStream,
+ FormDataContentDisposition fileDetail) {
+ final FormDataMultiPart formData = new FormDataMultiPart();
+ final BodyPart bodyPart =
+ new FormDataBodyPart(fileDetail, uploadedInputStream,
+ MediaType.APPLICATION_OCTET_STREAM_TYPE);
+ formData.bodyPart(bodyPart);
+ formData.setContentDisposition(fileDetail);
+ formData.setMediaType(MediaType.MULTIPART_FORM_DATA_TYPE);
+ final Client client = ClientBuilder.newBuilder().register(MultiPartFeature.class).build();
+ final WebTarget target = client.target(getPackageUrl()).path("/containerapi/CSARs");
+ final Response response =
+ target.request().post(Entity.entity(formData, formData.getMediaType()));
+ return response;
+ }
- /**
- * get policy infomation by service template id from vnfd
- * @param serviceTemplateID
- * @return
- */
- public static String getPolicys(String serviceTemplateID) {
- ClientConfig config = new ClientConfig(new StringProvider());
- IContainerPortabilityRest containerPolicyproxy = ConsumerFactory
- .createConsumer(getBaseURL(), config,
- IContainerPortabilityRest.class);
- return containerPolicyproxy.getToscaPolicys(serviceTemplateID);
- }
-
- /**
- * http://127.0.0.1:1337/containerapi/extension
- *
- * @return
- */
- private static String getBaseURL() {
- StringBuffer buffer = new StringBuffer();
- buffer.append(Config.getConfigration().getOpentoscaServerAddr() + "/containerapi/extension");
- return buffer.toString();
- }
+ /**
+ * upload csar package by file location.
+ *
+ * @param fileLocation file location
+ * @return response
+ */
+ public static Response uploadServicePackageByLocation(String fileLocation) {
+ ClientConfig config = new ClientConfig();
+ IContainerExtPackageRest containerservicepackageproxy =
+ ConsumerFactory.createConsumer(getBaseUrl(), config, IContainerExtPackageRest.class);
+ String result = containerservicepackageproxy.uploadPackageByToscaService(fileLocation);
+ JsonObject json = new JsonObject();
+ json.addProperty("result", result);
+ return Response.ok(json.toString()).build();
+ }
- /**
- * http://127.0.0.1:1337
- *
- * @return
- */
- private static String getPackageURL() {
- StringBuffer buffer = new StringBuffer();
- buffer.append(Config.getConfigration().getOpentoscaServerAddr());
- return buffer.toString();
- }
+ /**
+ * delete a csar package by csar name.
+ *
+ * @param csarName package name
+ * @return package id which deleted
+ */
+ public static String delServicePackage(final String csarName) {
+ ClientConfig config = new ClientConfig();
+ IContainerExtPackageRest containerservicepackageproxy =
+ ConsumerFactory.createConsumer(getBaseUrl(), config, IContainerExtPackageRest.class);
+ LOG.info("url:" + getBaseUrl() + " csarName:" + csarName);
+ return containerservicepackageproxy.deletePackageById(csarName);
+ }
+
+ /**
+ * get node template list.
+ *
+ * @param templateId template id
+ * @return container service nodeTemplate list
+ */
+ public static ContainerServiceNodeTemplateList getNodeTemplates(final String templateId) {
+ ClientConfig config = new ClientConfig(new ContainerServiceNodeTemplateProvider());
+ IContainerTemplateRest containertemplateproxy =
+ ConsumerFactory.createConsumer(getBaseUrl(), config, IContainerTemplateRest.class);
+ return containertemplateproxy.getToscaServiceNodeTemplates(templateId);
+ }
+
+ /**
+ * get policy infomation by service template id from vnfd.
+ *
+ * @param serviceTemplateId service template id
+ * @return tosca policys
+ */
+ public static String getPolicys(String serviceTemplateId) {
+ ClientConfig config = new ClientConfig(new StringProvider());
+ IContainerPortabilityRest containerPolicyproxy =
+ ConsumerFactory.createConsumer(getBaseUrl(), config, IContainerPortabilityRest.class);
+ return containerPolicyproxy.getToscaPolicys(serviceTemplateId);
+ }
+
+ /**
+ * http://127.0.0.1:1337/containerapi/extension.
+ *
+ * @return base url
+ */
+ private static String getBaseUrl() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(Config.getConfigration().getOpentoscaServerAddr() + "/containerapi/extension");
+ return buffer.toString();
+ }
+
+ /**
+ * http://127.0.0.1:1337
+ *
+ * @return package url
+ */
+ private static String getPackageUrl() {
+ StringBuffer buffer = new StringBuffer();
+ buffer.append(Config.getConfigration().getOpentoscaServerAddr());
+ return buffer.toString();
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerServiceNodeTemplateList;
+import org.xml.sax.InputSource;
+import org.xml.sax.XMLReader;
+import org.xml.sax.helpers.XMLReaderFactory;
+
import java.io.IOException;
import java.io.InputStream;
import java.lang.annotation.Annotation;
import javax.xml.transform.Source;
import javax.xml.transform.sax.SAXSource;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerServiceNodeTemplateList;
-import org.xml.sax.InputSource;
-import org.xml.sax.XMLReader;
-import org.xml.sax.helpers.XMLReaderFactory;
-
/**
- * The opentosca container service returns data to the node template entity
+ * The opentosca container service returns data to the node template entity.
+ *
* @author 10189609
- *
+ *
*/
-public class ContainerServiceNodeTemplateProvider implements
- MessageBodyReader<ContainerServiceNodeTemplateList> {
+public class ContainerServiceNodeTemplateProvider implements
+ MessageBodyReader<ContainerServiceNodeTemplateList> {
+
+ @Override
+ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType) {
+ return ContainerServiceNodeTemplateList.class.isAssignableFrom(type);
+ }
+
+ @Override
+ public ContainerServiceNodeTemplateList readFrom(Class<ContainerServiceNodeTemplateList> type,
+ Type genericType, Annotation[] annotations, MediaType mediaType,
+ MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException,
+ WebApplicationException {
+ ContainerServiceNodeTemplateList nodetemplatelist = null;
+
+ try {
+ JAXBContext jaxbContext = JAXBContext.newInstance(ContainerServiceNodeTemplateList.class);
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ // ignore namespace
+ NamespaceFilter inFilter = new NamespaceFilter(null, false);
+ XMLReader reader = XMLReaderFactory.createXMLReader();
+ inFilter.setParent(reader);
+ Source source = new SAXSource(inFilter, new InputSource(entityStream));
- @Override
- public boolean isReadable(Class<?> type, Type genericType,
- Annotation[] annotations, MediaType mediaType) {
- return ContainerServiceNodeTemplateList.class.isAssignableFrom(type);
- }
+ nodetemplatelist = (ContainerServiceNodeTemplateList) unmarshaller.unmarshal(source);
+ } catch (Exception e1) {
+ e1.printStackTrace();
+ }
- @Override
- public ContainerServiceNodeTemplateList readFrom(
- Class<ContainerServiceNodeTemplateList> type, Type genericType,
- Annotation[] annotations, MediaType mediaType,
- MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
- throws IOException, WebApplicationException {
- ContainerServiceNodeTemplateList nodetemplatelist = null;
-
- try {
- JAXBContext jaxbContext = JAXBContext.newInstance(ContainerServiceNodeTemplateList.class);
- Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- //ignore namespace
- NamespaceFilter inFilter = new NamespaceFilter(null, false);
- XMLReader reader = XMLReaderFactory.createXMLReader();
- inFilter.setParent(reader);
- Source source = new SAXSource(inFilter, new InputSource(entityStream));
-
- nodetemplatelist = (ContainerServiceNodeTemplateList) unmarshaller.unmarshal(source);
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- return nodetemplatelist;
- }
+ return nodetemplatelist;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
import java.io.IOException;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerServicePackageList;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerServicePackageList;
/**
- * The opentosca container service returns data to the package entity
+ * The opentosca container service returns data to the package entity.
+ *
* @author 10189609
- *
+ *
*/
-public class ContainerServicePackageProvider implements MessageBodyReader<ContainerServicePackageList> {
+public class ContainerServicePackageProvider implements
+ MessageBodyReader<ContainerServicePackageList> {
+
+ @Override
+ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType) {
+ return ContainerServicePackageList.class.isAssignableFrom(type);
+ }
+
+ @Override
+ public ContainerServicePackageList readFrom(Class<ContainerServicePackageList> type,
+ Type genericType, Annotation[] annotations, MediaType mediaType,
+ MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException,
+ WebApplicationException {
+ ContainerServicePackageList packageList = null;
- @Override
- public boolean isReadable(Class<?> type, Type genericType,
- Annotation[] annotations, MediaType mediaType) {
- return ContainerServicePackageList.class.isAssignableFrom(type);
- }
+ try {
+ JAXBContext jaxbContext = JAXBContext.newInstance(ContainerServicePackageList.class);
+ Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
+ packageList = (ContainerServicePackageList) unmarshaller.unmarshal(entityStream);
+ } catch (JAXBException e1) {
+ e1.printStackTrace();
+ }
- @Override
- public ContainerServicePackageList readFrom(
- Class<ContainerServicePackageList> type, Type genericType,
- Annotation[] annotations, MediaType mediaType,
- MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
- throws IOException, WebApplicationException {
- ContainerServicePackageList packageList = null;
-
- try
- {
- JAXBContext jaxbContext = JAXBContext.newInstance(ContainerServicePackageList.class);
- Unmarshaller unmarshaller = jaxbContext.createUnmarshaller();
- packageList = (ContainerServicePackageList) unmarshaller.unmarshal(entityStream);
- } catch (JAXBException e) {
- e.printStackTrace();
- }
-
- return packageList;
- }
+ return packageList;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
import java.io.IOException;
import javax.xml.bind.JAXBException;
import javax.xml.bind.Unmarshaller;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerServiceTemplateList;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerServiceTemplateList;
+
/**
- * The opentosca container self service returns data to the service template entity
+ * The opentosca container self service returns data to the service template entity.
+ *
* @author 10189609
- *
+ *
*/
public class ContainerServiceTemplateProvider implements
- MessageBodyReader<ContainerServiceTemplateList> {
+ MessageBodyReader<ContainerServiceTemplateList> {
+
+ @Override
+ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType) {
+ return ContainerServiceTemplateList.class.isAssignableFrom(type);
+ }
+
+ @Override
+ public ContainerServiceTemplateList readFrom(Class<ContainerServiceTemplateList> type,
+ Type genericType, Annotation[] annotations, MediaType mediaType,
+ MultivaluedMap<String, String> httpHeaders, InputStream entityStream) throws IOException,
+ WebApplicationException {
+ ContainerServiceTemplateList object = null;
- @Override
- public boolean isReadable(Class<?> type, Type genericType,
- Annotation[] annotations, MediaType mediaType) {
- return ContainerServiceTemplateList.class.isAssignableFrom( type );
- }
+ try {
+ JAXBContext jaxbContext = JAXBContext.newInstance(ContainerServiceTemplateList.class);
+ Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
+ object = (ContainerServiceTemplateList) jaxbUnmarshaller.unmarshal(entityStream);
+ } catch (JAXBException e1) {
+ e1.printStackTrace();
+ }
- @Override
- public ContainerServiceTemplateList readFrom(Class<ContainerServiceTemplateList> type,
- Type genericType, Annotation[] annotations, MediaType mediaType,
- MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
- throws IOException, WebApplicationException {
- ContainerServiceTemplateList object = null;
-
- try
- {
- JAXBContext jaxbContext = JAXBContext.newInstance(ContainerServiceTemplateList.class);
- Unmarshaller jaxbUnmarshaller = jaxbContext.createUnmarshaller();
- object = (ContainerServiceTemplateList)jaxbUnmarshaller.unmarshal(entityStream);
- }
- catch(JAXBException e)
- {
- e.printStackTrace();
- }
-
- return object;
- }
+ return object;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
import javax.ws.rs.Consumes;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerServicePackageList;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerServicePackageList;
+
/**
* The opentosca container interface for csar.
+ *
* @author 10189609
- *
+ *
*/
@Path("/csars")
public interface IContainerExtPackageRest {
- @GET
- @Produces(MediaType.APPLICATION_OCTET_STREAM)
- public ContainerServicePackageList getToscaServicePackage(@QueryParam("csarName") String csarName);
-
- @POST
- @Consumes(MediaType.TEXT_PLAIN)
- public String uploadPackageByToscaService(@QueryParam("fileLocation") String fileLocation);
-
- @Path("/{csarId}")
- @DELETE
- public String deletePackageById(@PathParam("csarId") String csarId);
+ @GET
+ @Produces(MediaType.APPLICATION_OCTET_STREAM)
+ public ContainerServicePackageList getToscaServicePackage(
+ @QueryParam("csarName") String csarName);
+
+ @POST
+ @Consumes(MediaType.TEXT_PLAIN)
+ public String uploadPackageByToscaService(@QueryParam("fileLocation") String fileLocation);
+
+ @Path("/{csarId}")
+ @DELETE
+ public String deletePackageById(@PathParam("csarId") String csarId);
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
import javax.ws.rs.GET;
/**
* The opentosca container interface for policy.
+ *
* @author 10189609
- *
+ *
*/
@Path("/servicetemplates")
-public interface IContainerPortabilityRest {
-
- @Path("/{templateid}/policys")
- @GET
- String getToscaPolicys(@PathParam("templateid") String serviceTemplateID);
+public interface IContainerPortabilityRest {
+
+ @Path("/{templateid}/policys")
+ @GET
+ String getToscaPolicys(@PathParam("templateid") String serviceTemplateId);
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
import javax.ws.rs.GET;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerSelfService;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerSelfService;
+
/**
* The opentosca container interface for self service.
+ *
* @author 10189609
- *
+ *
*/
@Path("/containerapi/CSARs/{csarid}/Content/SELFSERVICE-Metadata")
-public interface IContainerSelfServiceRest {
- @GET
- @Path("/data.xml")
- @Produces({ "application/octet-stream" })
- ContainerSelfService getContainerSelfService(@PathParam("csarid") String csarId);
-
- @GET
- @Path("/data.xml")
- @Produces({ "application/octet-stream" })
- String getContainerSelfServiceXML(@PathParam("csarid") String csarId);
-
- @GET
- @Path("/{inputmessageurl}")
- @Produces({ "application/octet-stream" })
- String getContainerSelfServiceOptionInputMessage(@PathParam("csarid") String csarId,
- @PathParam("inputmessageurl") String inputmessageUrl);
+public interface IContainerSelfServiceRest {
+ @GET
+ @Path("/data.xml")
+ @Produces({"application/octet-stream"})
+ ContainerSelfService getContainerSelfService(@PathParam("csarid") String csarId);
+
+ @GET
+ @Path("/data.xml")
+ @Produces({"application/octet-stream"})
+ String getContainerSelfServiceXml(@PathParam("csarid") String csarId);
+
+ @GET
+ @Path("/{inputmessageurl}")
+ @Produces({"application/octet-stream"})
+ String getContainerSelfServiceOptionInputMessage(@PathParam("csarid") String csarId,
+ @PathParam("inputmessageurl") String inputmessageUrl);
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
import javax.ws.rs.GET;
import javax.ws.rs.QueryParam;
import javax.ws.rs.core.MediaType;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerServiceNodeTemplateList;
-import org.openo.commontosca.catalog.model.externalservice.entity.containerEntity.ContainerServiceTemplateList;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerServiceNodeTemplateList;
+import org.openo.commontosca.catalog.model.externalservice.entity.container.ContainerServiceTemplateList;
+
/**
* The opentosca container interface for service template.
+ *
* @author 10189609
- *
+ *
*/
@Path("/servicetemplates")
public interface IContainerTemplateRest {
- @GET
- @Produces(MediaType.APPLICATION_OCTET_STREAM)
- ContainerServiceTemplateList getToscaServiceTemplate(@QueryParam("templateid") String templateId);
-
- @Path("/{templateid}/nodetemplates")
- @GET
- @Produces(MediaType.APPLICATION_OCTET_STREAM)
- ContainerServiceNodeTemplateList getToscaServiceNodeTemplates(@PathParam("templateid") String templateId);
+ @GET
+ @Produces(MediaType.APPLICATION_OCTET_STREAM)
+ ContainerServiceTemplateList getToscaServiceTemplate(@QueryParam("templateid") String templateId);
+
+ @Path("/{templateid}/nodetemplates")
+ @GET
+ @Produces(MediaType.APPLICATION_OCTET_STREAM)
+ ContainerServiceNodeTemplateList getToscaServiceNodeTemplates(
+ @PathParam("templateid") String templateId);
}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.externalservice.container;\r
\r
import org.xml.sax.Attributes;\r
import org.xml.sax.helpers.XMLFilterImpl;\r
\r
/**\r
- * NamespaceFilter\r
+ * NamespaceFilter.\r
+ * \r
* @author 10189609\r
- *\r
+ * \r
*/\r
public class NamespaceFilter extends XMLFilterImpl {\r
\r
- private String usedNamespaceUri;\r
- private boolean addNamespace;\r
+ private String usedNamespaceUri;\r
+ private boolean addNamespace;\r
\r
- //State variable\r
- private boolean addedNamespace = false;\r
+ // State variable\r
+ private boolean addedNamespace = false;\r
\r
- public NamespaceFilter(String namespaceUri,\r
- boolean addNamespace) {\r
- super();\r
+ /**\r
+ * constructor.\r
+ * @param namespaceUri namspace uri\r
+ * @param addNamespace add namespace or not\r
+ */\r
+ public NamespaceFilter(String namespaceUri, boolean addNamespace) {\r
+ super();\r
\r
- if (addNamespace)\r
- this.usedNamespaceUri = namespaceUri;\r
- else \r
- this.usedNamespaceUri = "";\r
- this.addNamespace = addNamespace;\r
+ if (addNamespace) {\r
+ this.usedNamespaceUri = namespaceUri;\r
+ } else {\r
+ this.usedNamespaceUri = "";\r
}\r
+ this.addNamespace = addNamespace;\r
+ }\r
\r
\r
\r
- @Override\r
- public void startDocument() throws SAXException {\r
- super.startDocument();\r
- if (addNamespace) {\r
- startControlledPrefixMapping();\r
- }\r
+ @Override\r
+ public void startDocument() throws SAXException {\r
+ super.startDocument();\r
+ if (addNamespace) {\r
+ startControlledPrefixMapping();\r
}\r
+ }\r
\r
\r
\r
- @Override\r
- public void startElement(String arg0, String arg1, String arg2,\r
- Attributes arg3) throws SAXException {\r
-\r
- super.startElement(this.usedNamespaceUri, arg1, arg2, arg3);\r
- }\r
+ @Override\r
+ public void startElement(String arg0, String arg1, String arg2, Attributes arg3)\r
+ throws SAXException {\r
\r
- @Override\r
- public void endElement(String arg0, String arg1, String arg2)\r
- throws SAXException {\r
+ super.startElement(this.usedNamespaceUri, arg1, arg2, arg3);\r
+ }\r
\r
- super.endElement(this.usedNamespaceUri, arg1, arg2);\r
- }\r
+ @Override\r
+ public void endElement(String arg0, String arg1, String arg2) throws SAXException {\r
\r
- @Override\r
- public void startPrefixMapping(String prefix, String url)\r
- throws SAXException {\r
+ super.endElement(this.usedNamespaceUri, arg1, arg2);\r
+ }\r
\r
+ @Override\r
+ public void startPrefixMapping(String prefix, String url) throws SAXException {\r
\r
- if (addNamespace) {\r
- this.startControlledPrefixMapping();\r
- } else {\r
- //Remove the namespace, i.e. don´t call startPrefixMapping for parent!\r
- }\r
\r
+ if (addNamespace) {\r
+ this.startControlledPrefixMapping();\r
+ } else {\r
+ // Remove the namespace, i.e. don´t call startPrefixMapping for parent!\r
}\r
\r
- private void startControlledPrefixMapping() throws SAXException {\r
+ }\r
+\r
+ private void startControlledPrefixMapping() throws SAXException {\r
\r
- if (this.addNamespace && !this.addedNamespace) {\r
- //We should add namespace since it is set and has not yet been done.\r
- super.startPrefixMapping("", this.usedNamespaceUri);\r
+ if (this.addNamespace && !this.addedNamespace) {\r
+ // We should add namespace since it is set and has not yet been done.\r
+ super.startPrefixMapping("", this.usedNamespaceUri);\r
\r
- //Make sure we dont do it twice\r
- this.addedNamespace = true;\r
- }\r
+ // Make sure we dont do it twice\r
+ this.addedNamespace = true;\r
}\r
+ }\r
\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.externalservice.container;
import java.io.IOException;
/**
* The opentosca container service returns data directly.
+ *
* @author 10189609
- *
+ *
*/
public class StringProvider implements MessageBodyReader<String> {
- @Override
- public boolean isReadable(Class<?> type, Type genericType,
- Annotation[] annotations, MediaType mediaType) {
- return false;//false representation not convert query results , returned directly
- }
+ @Override
+ public boolean isReadable(Class<?> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType) {
+ return false;// false representation not convert query results , returned directly
+ }
- @Override
- public String readFrom(Class<String> type, Type genericType,
- Annotation[] annotations, MediaType mediaType,
- MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
- throws IOException, WebApplicationException {
- return null;
- }
+ @Override
+ public String readFrom(Class<String> type, Type genericType, Annotation[] annotations,
+ MediaType mediaType, MultivaluedMap<String, String> httpHeaders, InputStream entityStream)
+ throws IOException, WebApplicationException {
+ return null;
+ }
}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+@XmlRootElement(name = "Application", namespace = ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
+public class ContainerSelfService {
+ public static final String NAMESPACE_OF_SELFSERVICE =
+ "http://www.eclipse.org/winery/model/selfservice";
+
+ @XmlElement(namespace = NAMESPACE_OF_SELFSERVICE)
+ private String displayName;
+
+ @XmlElement(namespace = NAMESPACE_OF_SELFSERVICE)
+ private String description;
+
+ @XmlElement(namespace = NAMESPACE_OF_SELFSERVICE)
+ private String iconUrl;
+
+ @XmlElement(namespace = NAMESPACE_OF_SELFSERVICE)
+ private String imageUrl;
+
+ @XmlElementWrapper(name = "options", namespace = NAMESPACE_OF_SELFSERVICE)
+ @XmlElement(name = "option", namespace = NAMESPACE_OF_SELFSERVICE)
+ private List<ContainerSelfServiceOption> optionList;
+
+ public String getDisplayName() {
+ return displayName;
+ }
+
+ public void setDisplayName(String displayName) {
+ this.displayName = displayName;
+ }
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getIconUrl() {
+ return iconUrl;
+ }
+
+ public void setIconUrl(String iconUrl) {
+ this.iconUrl = iconUrl;
+ }
+
+ public String getImageUrl() {
+ return imageUrl;
+ }
+
+ public void setImageUrl(String imageUrl) {
+ this.imageUrl = imageUrl;
+ }
+
+ public List<ContainerSelfServiceOption> getOptionList() {
+ return optionList;
+ }
+
+ public void setOptionList(List<ContainerSelfServiceOption> optionList) {
+ this.optionList = optionList;
+ }
+}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlTransient;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ContainerSelfServiceOption {
+ @XmlElement(namespace = ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
+ private String description;
+ @XmlElement(namespace = ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
+ private String iconUrl;
+ @XmlElement(namespace = ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
+ private String planServiceName;
+ @XmlElement(namespace = ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
+ private String planInputMessageUrl;
+ @XmlAttribute
+ private String id;
+ @XmlAttribute
+ private String name;
+ @XmlTransient
+ private String inputMessageSoap;
+
+ public String getDescription() {
+ return description;
+ }
+
+ public void setDescription(String description) {
+ this.description = description;
+ }
+
+ public String getIconUrl() {
+ return iconUrl;
+ }
+
+ public void setIconUrl(String iconUrl) {
+ this.iconUrl = iconUrl;
+ }
+
+ public String getPlanServiceName() {
+ return planServiceName;
+ }
+
+ public void setPlanServiceName(String planServiceName) {
+ this.planServiceName = planServiceName;
+ }
+
+ public String getPlanInputMessageUrl() {
+ return planInputMessageUrl;
+ }
+
+ public void setPlanInputMessageUrl(String planInputMessageUrl) {
+ this.planInputMessageUrl = planInputMessageUrl;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getInputMessageSoap() {
+ return inputMessageSoap;
+ }
+
+ public void setInputMessageSoap(String inputMessageSoap) {
+ this.inputMessageSoap = inputMessageSoap;
+ }
+}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@XmlAccessorType(XmlAccessType.FIELD)
public class ContainerServiceCommonParam {
- @XmlElement
- private String key;
+ @XmlElement
+ private String key;
- @XmlElement
- private String value;
+ @XmlElement
+ private String value;
- public String getKey() {
- return key;
- }
+ public String getKey() {
+ return key;
+ }
- public void setKey(String key) {
- this.key = key;
- }
+ public void setKey(String key) {
+ this.key = key;
+ }
- public String getValue() {
- return value;
- }
+ public String getValue() {
+ return value;
+ }
- public void setValue(String value) {
- this.value = value;
- }
+ public void setValue(String value) {
+ this.value = value;
+ }
}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
+
+import org.openo.commontosca.catalog.common.ToolUtil;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
+public class ContainerServiceNodeTemplate {
+
+ @XmlAttribute(name = "nodetemplateid")
+ private String id;
+
+ @XmlAttribute(name = "nodetemplatename")
+ private String name;
+
+ @XmlAttribute
+ private String type;
+
+ @XmlElementWrapper(name = "properties")
+ @XmlElement(name = "property")
+ private List<ContainerServiceCommonParam> properties;
+
+ @XmlElementWrapper(name = "relationshipInfos")
+ @XmlElement(name = "relationship")
+ private List<ContainerServiceRelationShip> relationShips;
+
+ @XmlElement(name = "Capabilities")
+ private ContainerServiceNodeTemplate.Capablitiies capabilities;
+
+ public ContainerServiceNodeTemplate.Capablitiies getCapabilities() {
+ return capabilities;
+ }
+
+ public void setCapabilities(ContainerServiceNodeTemplate.Capablitiies capabilities) {
+ this.capabilities = capabilities;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+ public List<ContainerServiceCommonParam> getProperties() {
+ return properties;
+ }
+
+ public void setProperties(List<ContainerServiceCommonParam> properties) {
+ this.properties = properties;
+ }
+
+ public List<ContainerServiceRelationShip> getRelationShips() {
+ return relationShips;
+ }
+
+ public void setRelationShips(List<ContainerServiceRelationShip> relationShips) {
+ this.relationShips = relationShips;
+ }
+
+ @XmlRootElement
+ @XmlAccessorType(XmlAccessType.NONE)
+ public static class Capablitiies {
+ @XmlElement(name = "Capability")
+ private List<ContainerServiceNodeTemplate.Capability> capabilityList;
+
+ public List<ContainerServiceNodeTemplate.Capability> getCapabilityList() {
+ return capabilityList;
+ }
+
+ public void setCapabilityList(List<ContainerServiceNodeTemplate.Capability> capabilityList) {
+ this.capabilityList = capabilityList;
+ }
+ }
+
+ @XmlRootElement
+ @XmlAccessorType(XmlAccessType.NONE)
+ public static class Capability {
+ @XmlAttribute(name = "id")
+ private String flavorName;
+
+ @XmlElement(name = "Properties")
+ private ContainerServiceNodeTemplate.CapabilityProperties properties;
+
+ public String getFlavorName() {
+ return flavorName;
+ }
+
+ public void setFlavorName(String flavorName) {
+ this.flavorName = flavorName;
+ }
+
+ public ContainerServiceNodeTemplate.CapabilityProperties getProperties() {
+ return properties;
+ }
+
+ public void setProperties(ContainerServiceNodeTemplate.CapabilityProperties properties) {
+ this.properties = properties;
+ }
+
+ }
+
+ @XmlRootElement
+ @XmlAccessorType(XmlAccessType.NONE)
+ public static class CapabilityProperties {
+ @XmlElement(name = "Properties")
+ private ContainerServiceNodeTemplate.CapabilityProperty property;
+
+ public ContainerServiceNodeTemplate.CapabilityProperty getProperty() {
+ return property;
+ }
+
+ public void setProperty(ContainerServiceNodeTemplate.CapabilityProperty property) {
+ this.property = property;
+ }
+ }
+
+ @XmlRootElement
+ @XmlAccessorType(XmlAccessType.FIELD)
+ public static class CapabilityProperty {
+ @XmlElement
+ private String vcpu;
+
+ @XmlElement
+ private String vram;
+
+ @XmlElement
+ private String rootDisk;
+
+ @XmlElement
+ private String swapDisk;
+
+ @XmlElement
+ private String tempDisk;
+
+ public String getVcpu() {
+ return vcpu;
+ }
+
+ public void setVcpu(String vcpu) {
+ this.vcpu = vcpu;
+ }
+
+ public String getVram() {
+ return vram;
+ }
+
+ public void setVram(String vram) {
+ this.vram = vram;
+ }
+
+ public String getRootDisk() {
+ return rootDisk;
+ }
+
+ public void setRootDisk(String rootDisk) {
+ this.rootDisk = rootDisk;
+ }
+
+ public String getSwapDisk() {
+ return swapDisk;
+ }
+
+ public void setSwapDisk(String swapDisk) {
+ this.swapDisk = swapDisk;
+ }
+
+ public String getTempDisk() {
+ return tempDisk;
+ }
+
+ public void setTempDisk(String tempDisk) {
+ this.tempDisk = tempDisk;
+ }
+ }
+
+ public class NtFlavor {
+ private String flavorName;
+
+ private String vcpu;
+
+ private String vram;
+
+ private String rootDisk;
+
+ private String swapDisk;
+
+ private String tempDisk;
+
+ public String getFlavorName() {
+ return flavorName;
+ }
+
+ public void setFlavorName(String flavorName) {
+ this.flavorName = flavorName;
+ }
+
+ public String getVcpu() {
+ return vcpu;
+ }
+
+ public void setVcpu(String vcpu) {
+ this.vcpu = vcpu;
+ }
+
+ public String getVram() {
+ return vram;
+ }
+
+ public void setVram(String vram) {
+ this.vram = vram;
+ }
+
+ public String getRootDisk() {
+ return rootDisk;
+ }
+
+ public void setRootDisk(String rootDisk) {
+ this.rootDisk = rootDisk;
+ }
+
+ public String getSwapDisk() {
+ return swapDisk;
+ }
+
+ public void setSwapDisk(String swapDisk) {
+ this.swapDisk = swapDisk;
+ }
+
+ public String getTempDisk() {
+ return tempDisk;
+ }
+
+ public void setTempDisk(String tempDisk) {
+ this.tempDisk = tempDisk;
+ }
+
+ }
+
+ /**
+ * get nt flavor list.
+ * @return nt flavor list
+ */
+ public List<NtFlavor> getNtFlavorList() {
+ if (null == this.capabilities || ToolUtil.isEmptyCollection(capabilities.getCapabilityList())) {
+ return null;
+ }
+
+ List<NtFlavor> ntFlavors = new ArrayList<NtFlavor>();
+ List<Capability> capabilityList = capabilities.getCapabilityList();
+ for (Capability capabilty : capabilityList) {
+ NtFlavor ntFlavor = convertCap2Flavor(capabilty);
+ ntFlavors.add(ntFlavor);
+ }
+
+ return ntFlavors;
+ }
+
+ private NtFlavor convertCap2Flavor(Capability capabilty) {
+ NtFlavor ntFlavor = new NtFlavor();
+ ntFlavor.setFlavorName(capabilty.getFlavorName());
+ if (null != capabilty.getProperties() && null != capabilty.getProperties().getProperty()) {
+ CapabilityProperty property = capabilty.getProperties().getProperty();
+ ntFlavor.setRootDisk(property.getRootDisk());
+ ntFlavor.setSwapDisk(property.getSwapDisk());
+ ntFlavor.setTempDisk(property.getTempDisk());
+ ntFlavor.setVcpu(property.getVcpu());
+ ntFlavor.setVram(property.getVram());
+ }
+
+ return ntFlavor;
+ }
+
+}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name="nodetemplates")
+@XmlRootElement(name = "nodetemplates")
public class ContainerServiceNodeTemplateList {
- @XmlElement(name="nodetemplate")
- private List<ContainerServiceNodeTemplate> nodeTemplate;
-
- public List<ContainerServiceNodeTemplate> getNodeTemplate() {
- return nodeTemplate;
- }
-
- public void setNodeTemplate(List<ContainerServiceNodeTemplate> nodeTemplate) {
- this.nodeTemplate = nodeTemplate;
- }
-
-
+ @XmlElement(name = "nodetemplate")
+ private List<ContainerServiceNodeTemplate> nodeTemplate;
+
+ public List<ContainerServiceNodeTemplate> getNodeTemplate() {
+ return nodeTemplate;
+ }
+
+ public void setNodeTemplate(List<ContainerServiceNodeTemplate> nodeTemplate) {
+ this.nodeTemplate = nodeTemplate;
+ }
+
+
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
-/**
- * @author 10189609
- *
- */
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
+
public class ContainerServiceOperationParameter {
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
@XmlAccessorType(XmlAccessType.FIELD)
@XmlRootElement
public class ContainerServicePackage {
- @XmlAttribute
- private String name;
- @XmlAttribute
- private String createTime;
- @XmlAttribute
- private String size;
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getCreateTime() {
- return createTime;
- }
- public void setCreateTime(String createTime) {
- this.createTime = createTime;
- }
- public String getSize() {
- return size;
- }
- public void setSize(String size) {
- this.size = size;
- }
-
-
+ @XmlAttribute
+ private String name;
+ @XmlAttribute
+ private String createTime;
+ @XmlAttribute
+ private String size;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getCreateTime() {
+ return createTime;
+ }
+
+ public void setCreateTime(String createTime) {
+ this.createTime = createTime;
+ }
+
+ public String getSize() {
+ return size;
+ }
+
+ public void setSize(String size) {
+ this.size = size;
+ }
+
+
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name="packages")
+@XmlRootElement(name = "packages")
public class ContainerServicePackageList {
- public static final String NAMESPACE_OF_SELFSERVICE="http://www.eclipse.org/winery/model/selfservice";
-
- @XmlElement(name="package")
- private List<ContainerServicePackage> packageList;
-
- public List<ContainerServicePackage> getPackageList() {
- return packageList;
- }
-
- public void setPackageList(List<ContainerServicePackage> packageList) {
- this.packageList = packageList;
- }
-
+ public static final String NAMESPACE_OF_SELFSERVICE =
+ "http://www.eclipse.org/winery/model/selfservice";
+
+ @XmlElement(name = "package")
+ private List<ContainerServicePackage> packageList;
+
+ public List<ContainerServicePackage> getPackageList() {
+ return packageList;
+ }
+
+ public void setPackageList(List<ContainerServicePackage> packageList) {
+ this.packageList = packageList;
+ }
+
}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlElement;
+
+@XmlAccessorType(XmlAccessType.FIELD)
+public class ContainerServiceRelationShip {
+ @XmlElement
+ private String sourceNodeName;
+
+ @XmlElement
+ private String targetNodeName;
+
+ @XmlElement
+ private String sourceNodeId;
+
+ @XmlElement
+ private String targetNodeId;
+
+ @XmlElement
+ private String type;
+
+ public String getSourceNodeId() {
+ return sourceNodeId;
+ }
+
+ public void setSourceNodeId(String sourceNodeId) {
+ this.sourceNodeId = sourceNodeId;
+ }
+
+ public String getTargetNodeId() {
+ return targetNodeId;
+ }
+
+ public void setTargetNodeId(String targetNodeId) {
+ this.targetNodeId = targetNodeId;
+ }
+
+ public String getSourceNodeName() {
+ return sourceNodeName;
+ }
+
+ public void setSourceNodeName(String sourceNodeName) {
+ this.sourceNodeName = sourceNodeName;
+ }
+
+ public String getTargetNodeName() {
+ return targetNodeName;
+ }
+
+ public void setTargetNodeName(String targetNodeName) {
+ this.targetNodeName = targetNodeName;
+ }
+
+ public String getType() {
+ return type;
+ }
+
+ public void setType(String type) {
+ this.type = type;
+ }
+
+}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
+
+import java.util.List;
+
+import javax.xml.bind.annotation.XmlAccessType;
+import javax.xml.bind.annotation.XmlAccessorType;
+import javax.xml.bind.annotation.XmlAttribute;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import javax.xml.bind.annotation.XmlRootElement;
+
+@XmlRootElement
+@XmlAccessorType(XmlAccessType.NONE)
+public class ContainerServiceTemplate {
+ @XmlAttribute
+ private String templateid;
+
+ @XmlAttribute
+ private String templatename;
+
+ @XmlElement(name = "BoundaryDefinitions")
+ private BoundaryDefinitions boundary;
+
+ public String getTemplateid() {
+ return templateid;
+ }
+
+ public void setTemplateid(String templateid) {
+ this.templateid = templateid;
+ }
+
+ public String getTemplatename() {
+ return templatename;
+ }
+
+ public void setTemplatename(String templatename) {
+ this.templatename = templatename;
+ }
+
+ public BoundaryDefinitions getBoundary() {
+ return boundary;
+ }
+
+ public void setBoundary(BoundaryDefinitions boundary) {
+ this.boundary = boundary;
+ }
+
+ @XmlRootElement
+ @XmlAccessorType(XmlAccessType.NONE)
+ public static class BoundaryDefinitions {
+ @XmlElement(name = "Properties", namespace = "http://docs.oasis-open.org/tosca/ns/2011/12")
+ private BoundaryProperties properties;
+
+ public BoundaryProperties getProperties() {
+ return properties;
+ }
+
+ public void setProperties(BoundaryProperties properties) {
+ this.properties = properties;
+ }
+
+ }
+
+ @XmlRootElement
+ @XmlAccessorType(XmlAccessType.NONE)
+ public static class BoundaryProperties {
+ @XmlElement(name = "Properties")
+ private BoundaryProperty property;
+
+ public BoundaryProperty getProperty() {
+ return property;
+ }
+
+ public void setProperty(BoundaryProperty property) {
+ this.property = property;
+ }
+ }
+
+ @XmlRootElement
+ @XmlAccessorType(XmlAccessType.NONE)
+ public static class BoundaryProperty {
+ public String getTemplateVersion() {
+ return templateVersion;
+ }
+
+ public void setTemplateVersion(String templateVersion) {
+ this.templateVersion = templateVersion;
+ }
+
+ public String getTemplateAuthor() {
+ return templateAuthor;
+ }
+
+ public void setTemplateAuthor(String templateAuthor) {
+ this.templateAuthor = templateAuthor;
+ }
+
+ public String getVendor() {
+ return vendor;
+ }
+
+ public void setVendor(String vendor) {
+ this.vendor = vendor;
+ }
+
+ public String getVersion() {
+ return version;
+ }
+
+ public void setVersion(String version) {
+ this.version = version;
+ }
+
+ public String getNfvType() {
+ return nfvType;
+ }
+
+ public void setNfvType(String nfvType) {
+ this.nfvType = nfvType;
+ }
+
+ public String getMoc() {
+ return moc;
+ }
+
+ public void setMoc(String moc) {
+ this.moc = moc;
+ }
+
+ public String getFlavor() {
+ return flavor;
+ }
+
+ public void setFlavor(String flavor) {
+ this.flavor = flavor;
+ }
+
+ public List<StFlavor> getStFlavor() {
+ return stFlavor;
+ }
+
+ public void setStFlavor(List<StFlavor> stFlavor) {
+ this.stFlavor = stFlavor;
+ }
+
+ @XmlElement
+ private String templateVersion;
+
+ @XmlElement
+ private String templateAuthor;
+
+ @XmlElement
+ private String vendor;
+
+ @XmlElement
+ private String version;
+
+ @XmlElement
+ private String nfvType;
+
+ @XmlElement
+ private String moc;
+
+ @XmlElement
+ private String flavor;
+
+ @XmlElementWrapper(name = "flavorList")
+ @XmlElement(name = "flavor")
+ private List<StFlavor> stFlavor;
+ }
+
+ @XmlRootElement
+ @XmlAccessorType(XmlAccessType.NONE)
+ public static class StFlavor {
+ @XmlAttribute
+ private String name;
+
+ @XmlAttribute
+ private String desc;
+
+ @XmlElementWrapper(name = "nodeList")
+ @XmlElement(name = "node")
+ private List<StFlavorConstituent> stFlavorConstituent;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getDesc() {
+ return desc;
+ }
+
+ public void setDesc(String desc) {
+ this.desc = desc;
+ }
+
+ public List<StFlavorConstituent> getStFlavorConstituent() {
+ return stFlavorConstituent;
+ }
+
+ public void setStFlavorConstituent(List<StFlavorConstituent> stFlavorConstituent) {
+ this.stFlavorConstituent = stFlavorConstituent;
+ }
+ }
+
+ @XmlRootElement
+ @XmlAccessorType(XmlAccessType.NONE)
+ public static class StFlavorConstituent {
+ @XmlAttribute
+ private String numberOfInstances;
+
+ @XmlAttribute
+ private String name;
+
+ @XmlAttribute
+ private String refNodeFlavor;
+
+ @XmlAttribute
+ private String affinity;
+
+ @XmlAttribute
+ private String redundancyModel;
+
+ @XmlAttribute
+ private String capability;
+
+ public String getAffinity() {
+ return affinity;
+ }
+
+ public void setAffinity(String affinity) {
+ this.affinity = affinity;
+ }
+
+ public String getRedundancyModel() {
+ return redundancyModel;
+ }
+
+ public void setRedundancyModel(String redundancyModel) {
+ this.redundancyModel = redundancyModel;
+ }
+
+ public String getCapability() {
+ return capability;
+ }
+
+ public void setCapability(String capability) {
+ this.capability = capability;
+ }
+
+ public String getNumberOfInstances() {
+ return numberOfInstances;
+ }
+
+ public void setNumberOfInstances(String numberOfInstances) {
+ this.numberOfInstances = numberOfInstances;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getRefNodeFlavor() {
+ return refNodeFlavor;
+ }
+
+ public void setRefNodeFlavor(String refNodeFlavor) {
+ this.refNodeFlavor = refNodeFlavor;
+ }
+ }
+
+ private Boolean propNullFlag;
+
+ private boolean isPropNotNull() {
+ if (null == propNullFlag) {
+ propNullFlag =
+ null != this.getBoundary() && null != this.getBoundary().getProperties()
+ && null != this.getBoundary().getProperties().getProperty();
+ }
+ return propNullFlag;
+ }
+
+ public String getProductType() {
+ return isPropNotNull() ? this.getBoundary().getProperties().getProperty().getMoc() : null;
+ }
+
+ public String getVendor() {
+ return isPropNotNull() ? this.getBoundary().getProperties().getProperty().getVendor() : null;
+ }
+
+ public String getVersion() {
+ return isPropNotNull() ? this.getBoundary().getProperties().getProperty().getVersion() : null;
+ }
+
+ public String getNfvtype() {
+ return isPropNotNull() ? this.getBoundary().getProperties().getProperty().getNfvType() : null;
+ }
+
+ public String getFlavor() {
+ return isPropNotNull() ? this.getBoundary().getProperties().getProperty().getFlavor() : null;
+ }
+
+ public List<StFlavor> getStFlavorList() {
+ return isPropNotNull() ? this.getBoundary().getProperties().getProperty().getStFlavor() : null;
+ }
+}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
+
+package org.openo.commontosca.catalog.model.externalservice.entity.container;
import java.util.List;
import javax.xml.bind.annotation.XmlRootElement;
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name="servicetemplates")
+@XmlRootElement(name = "servicetemplates")
public class ContainerServiceTemplateList {
- public static final String NAMESPACE_OF_SELFSERVICE="http://www.eclipse.org/winery/model/selfservice";
-
- @XmlElement(name="serviceTemplate")
- private List<ContainerServiceTemplate> serviceTemplateList;
+ public static final String NAMESPACE_OF_SELFSERVICE =
+ "http://www.eclipse.org/winery/model/selfservice";
+
+ @XmlElement(name = "serviceTemplate")
+ private List<ContainerServiceTemplate> serviceTemplateList;
- public List<ContainerServiceTemplate> getServiceTemplateList() {
- return serviceTemplateList;
- }
+ public List<ContainerServiceTemplate> getServiceTemplateList() {
+ return serviceTemplateList;
+ }
- public void setServiceTemplateList(List<ContainerServiceTemplate> optionList) {
- this.serviceTemplateList = optionList;
- }
+ public void setServiceTemplateList(List<ContainerServiceTemplate> optionList) {
+ this.serviceTemplateList = optionList;
+ }
}
+++ /dev/null
-/**
- * Copyright 2016 [ZTE] and others.
- *
- * 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.
- */
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlRootElement(name="Application",namespace=ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
-public class ContainerSelfService {
- public static final String NAMESPACE_OF_SELFSERVICE="http://www.eclipse.org/winery/model/selfservice";
-
- @XmlElement(namespace=NAMESPACE_OF_SELFSERVICE)
- private String displayName;
-
- @XmlElement(namespace=NAMESPACE_OF_SELFSERVICE)
- private String description;
-
- @XmlElement(namespace=NAMESPACE_OF_SELFSERVICE)
- private String iconUrl;
-
- @XmlElement(namespace=NAMESPACE_OF_SELFSERVICE)
- private String imageUrl;
-
- @XmlElementWrapper(name="options",namespace=NAMESPACE_OF_SELFSERVICE)
- @XmlElement(name="option",namespace=NAMESPACE_OF_SELFSERVICE)
- private List<ContainerSelfServiceOption> optionList;
-
- public String getDisplayName() {
- return displayName;
- }
-
- public void setDisplayName(String displayName) {
- this.displayName = displayName;
- }
-
- public String getDescription() {
- return description;
- }
-
- public void setDescription(String description) {
- this.description = description;
- }
-
- public String getIconUrl() {
- return iconUrl;
- }
-
- public void setIconUrl(String iconUrl) {
- this.iconUrl = iconUrl;
- }
-
- public String getImageUrl() {
- return imageUrl;
- }
-
- public void setImageUrl(String imageUrl) {
- this.imageUrl = imageUrl;
- }
-
- public List<ContainerSelfServiceOption> getOptionList() {
- return optionList;
- }
-
- public void setOptionList(List<ContainerSelfServiceOption> optionList) {
- this.optionList = optionList;
- }
-}
-
+++ /dev/null
-/**
- * Copyright 2016 [ZTE] and others.
- *
- * 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.
- */
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlTransient;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ContainerSelfServiceOption {
- @XmlElement(namespace=ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
- private String description;
- @XmlElement(namespace=ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
- private String iconUrl;
- @XmlElement(namespace=ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
- private String planServiceName;
- @XmlElement(namespace=ContainerSelfService.NAMESPACE_OF_SELFSERVICE)
- private String planInputMessageUrl;
- @XmlAttribute
- private String id;
- @XmlAttribute
- private String name;
- @XmlTransient
- private String inputMessageSoap;
- public String getDescription() {
- return description;
- }
- public void setDescription(String description) {
- this.description = description;
- }
- public String getIconUrl() {
- return iconUrl;
- }
- public void setIconUrl(String iconUrl) {
- this.iconUrl = iconUrl;
- }
- public String getPlanServiceName() {
- return planServiceName;
- }
- public void setPlanServiceName(String planServiceName) {
- this.planServiceName = planServiceName;
- }
- public String getPlanInputMessageUrl() {
- return planInputMessageUrl;
- }
- public void setPlanInputMessageUrl(String planInputMessageUrl) {
- this.planInputMessageUrl = planInputMessageUrl;
- }
- public String getId() {
- return id;
- }
- public void setId(String id) {
- this.id = id;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getInputMessageSoap() {
- return inputMessageSoap;
- }
- public void setInputMessageSoap(String inputMessageSoap) {
- this.inputMessageSoap = inputMessageSoap;
- }
-}
+++ /dev/null
-/**
- * Copyright 2016 [ZTE] and others.
- *
- * 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.
- */
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-import org.openo.commontosca.catalog.common.ToolUtil;
-
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
-public class ContainerServiceNodeTemplate {
-
- @XmlAttribute(name = "nodetemplateid")
- private String id;
-
- @XmlAttribute(name = "nodetemplatename")
- private String name;
-
- @XmlAttribute
- private String type;
-
- @XmlElementWrapper(name = "properties")
- @XmlElement(name = "property")
- private List<ContainerServiceCommonParam> properties;
-
- @XmlElementWrapper(name = "relationshipInfos")
- @XmlElement(name = "relationship")
- private List<ContainerServiceRelationShip> relationShips;
-
- @XmlElement(name = "Capabilities")
- private ContainerServiceNodeTemplate.Capablitiies capabilities;
-
- public ContainerServiceNodeTemplate.Capablitiies getCapabilities() {
- return capabilities;
- }
-
- public void setCapabilities(
- ContainerServiceNodeTemplate.Capablitiies capabilities) {
- this.capabilities = capabilities;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
- public List<ContainerServiceCommonParam> getProperties() {
- return properties;
- }
-
- public void setProperties(List<ContainerServiceCommonParam> properties) {
- this.properties = properties;
- }
-
- public List<ContainerServiceRelationShip> getRelationShips() {
- return relationShips;
- }
-
- public void setRelationShips(
- List<ContainerServiceRelationShip> relationShips) {
- this.relationShips = relationShips;
- }
-
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.NONE)
- public static class Capablitiies {
- @XmlElement(name = "Capability")
- private List<ContainerServiceNodeTemplate.Capability> capabilityList;
-
- public List<ContainerServiceNodeTemplate.Capability> getCapabilityList() {
- return capabilityList;
- }
-
- public void setCapabilityList(
- List<ContainerServiceNodeTemplate.Capability> capabilityList) {
- this.capabilityList = capabilityList;
- }
- }
-
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.NONE)
- public static class Capability {
- @XmlAttribute(name = "id")
- private String flavorName;
-
- @XmlElement(name = "Properties")
- private ContainerServiceNodeTemplate.CapabilityProperties properties;
-
- public String getFlavorName() {
- return flavorName;
- }
-
- public void setFlavorName(String flavorName) {
- this.flavorName = flavorName;
- }
-
- public ContainerServiceNodeTemplate.CapabilityProperties getProperties() {
- return properties;
- }
-
- public void setProperties(
- ContainerServiceNodeTemplate.CapabilityProperties properties) {
- this.properties = properties;
- }
-
- }
-
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.NONE)
- public static class CapabilityProperties {
- @XmlElement(name = "Properties")
- private ContainerServiceNodeTemplate.CapabilityProperty property;
-
- public ContainerServiceNodeTemplate.CapabilityProperty getProperty() {
- return property;
- }
-
- public void setProperty(
- ContainerServiceNodeTemplate.CapabilityProperty property) {
- this.property = property;
- }
- }
-
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.FIELD)
- public static class CapabilityProperty {
- @XmlElement
- private String vCPU;
-
- @XmlElement
- private String vRAM;
-
- @XmlElement
- private String rootDisk;
-
- @XmlElement
- private String swapDisk;
-
- @XmlElement
- private String tempDisk;
-
- public String getvCPU() {
- return vCPU;
- }
-
- public void setvCPU(String vCPU) {
- this.vCPU = vCPU;
- }
-
- public String getvRAM() {
- return vRAM;
- }
-
- public void setvRAM(String vRAM) {
- this.vRAM = vRAM;
- }
-
- public String getRootDisk() {
- return rootDisk;
- }
-
- public void setRootDisk(String rootDisk) {
- this.rootDisk = rootDisk;
- }
-
- public String getSwapDisk() {
- return swapDisk;
- }
-
- public void setSwapDisk(String swapDisk) {
- this.swapDisk = swapDisk;
- }
-
- public String getTempDisk() {
- return tempDisk;
- }
-
- public void setTempDisk(String tempDisk) {
- this.tempDisk = tempDisk;
- }
- }
-
- public class NTFlavor {
- private String flavorName;
-
- private String vCPU;
-
- private String vRAM;
-
- private String rootDisk;
-
- private String swapDisk;
-
- private String tempDisk;
-
- public String getFlavorName() {
- return flavorName;
- }
-
- public void setFlavorName(String flavorName) {
- this.flavorName = flavorName;
- }
-
- public String getvCPU() {
- return vCPU;
- }
-
- public void setvCPU(String vCPU) {
- this.vCPU = vCPU;
- }
-
- public String getvRAM() {
- return vRAM;
- }
-
- public void setvRAM(String vRAM) {
- this.vRAM = vRAM;
- }
-
- public String getRootDisk() {
- return rootDisk;
- }
-
- public void setRootDisk(String rootDisk) {
- this.rootDisk = rootDisk;
- }
-
- public String getSwapDisk() {
- return swapDisk;
- }
-
- public void setSwapDisk(String swapDisk) {
- this.swapDisk = swapDisk;
- }
-
- public String getTempDisk() {
- return tempDisk;
- }
-
- public void setTempDisk(String tempDisk) {
- this.tempDisk = tempDisk;
- }
-
- }
-
- public List<NTFlavor> getNTFlavorList() {
- if (null == this.capabilities
- || ToolUtil.isEmptyCollection(capabilities.getCapabilityList())) {
- return null;
- }
-
- List<NTFlavor> ntFlavors = new ArrayList<NTFlavor>();
- List<Capability> capabilityList = capabilities.getCapabilityList();
- for (Capability capabilty : capabilityList) {
- NTFlavor ntFlavor = convertCap2Flavor(capabilty);
- ntFlavors.add(ntFlavor);
- }
-
- return ntFlavors;
- }
-
- private NTFlavor convertCap2Flavor(Capability capabilty) {
- NTFlavor ntFlavor = new NTFlavor();
- ntFlavor.setFlavorName(capabilty.getFlavorName());
- if (null != capabilty.getProperties()
- && null != capabilty.getProperties().getProperty()) {
- CapabilityProperty property = capabilty.getProperties()
- .getProperty();
- ntFlavor.setRootDisk(property.getRootDisk());
- ntFlavor.setSwapDisk(property.getSwapDisk());
- ntFlavor.setTempDisk(property.getTempDisk());
- ntFlavor.setvCPU(property.getvCPU());
- ntFlavor.setvRAM(property.getvRAM());
- }
-
- return ntFlavor;
- }
-
-}
+++ /dev/null
-/**
- * Copyright 2016 [ZTE] and others.
- *
- * 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.
- */
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-
-@XmlAccessorType(XmlAccessType.FIELD)
-public class ContainerServiceRelationShip {
- @XmlElement
- private String sourceNodeName;
-
- @XmlElement
- private String targetNodeName;
-
- @XmlElement
- private String sourceNodeId;
-
- @XmlElement
- private String targetNodeId;
-
- @XmlElement
- private String type;
-
- public String getSourceNodeId() {
- return sourceNodeId;
- }
-
- public void setSourceNodeId(String sourceNodeId) {
- this.sourceNodeId = sourceNodeId;
- }
-
- public String getTargetNodeId() {
- return targetNodeId;
- }
-
- public void setTargetNodeId(String targetNodeId) {
- this.targetNodeId = targetNodeId;
- }
-
- public String getSourceNodeName() {
- return sourceNodeName;
- }
-
- public void setSourceNodeName(String sourceNodeName) {
- this.sourceNodeName = sourceNodeName;
- }
-
- public String getTargetNodeName() {
- return targetNodeName;
- }
-
- public void setTargetNodeName(String targetNodeName) {
- this.targetNodeName = targetNodeName;
- }
-
- public String getType() {
- return type;
- }
-
- public void setType(String type) {
- this.type = type;
- }
-
-}
+++ /dev/null
-/**
- * Copyright 2016 [ZTE] and others.
- *
- * 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.
- */
-package org.openo.commontosca.catalog.model.externalservice.entity.containerEntity;
-
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-
-@XmlRootElement
-@XmlAccessorType(XmlAccessType.NONE)
-public class ContainerServiceTemplate {
- @XmlAttribute
- private String templateid;
-
- @XmlAttribute
- private String templatename;
-
- @XmlElement(name = "BoundaryDefinitions")
- private BoundaryDefinitions boundary;
-
- public String getTemplateid() {
- return templateid;
- }
-
- public void setTemplateid(String templateid) {
- this.templateid = templateid;
- }
-
- public String getTemplatename() {
- return templatename;
- }
-
- public void setTemplatename(String templatename) {
- this.templatename = templatename;
- }
-
- public BoundaryDefinitions getBoundary() {
- return boundary;
- }
-
- public void setBoundary(BoundaryDefinitions boundary) {
- this.boundary = boundary;
- }
-
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.NONE)
- public static class BoundaryDefinitions {
- @XmlElement(name = "Properties", namespace = "http://docs.oasis-open.org/tosca/ns/2011/12")
- private BoundaryProperties properties;
-
- public BoundaryProperties getProperties() {
- return properties;
- }
-
- public void setProperties(BoundaryProperties properties) {
- this.properties = properties;
- }
-
- }
-
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.NONE)
- public static class BoundaryProperties {
- @XmlElement(name = "Properties")
- private BoundaryProperty property;
-
- public BoundaryProperty getProperty() {
- return property;
- }
-
- public void setProperty(BoundaryProperty property) {
- this.property = property;
- }
- }
-
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.NONE)
- public static class BoundaryProperty {
- public String getTemplateVersion() {
- return templateVersion;
- }
-
- public void setTemplateVersion(String templateVersion) {
- this.templateVersion = templateVersion;
- }
-
- public String getTemplateAuthor() {
- return templateAuthor;
- }
-
- public void setTemplateAuthor(String templateAuthor) {
- this.templateAuthor = templateAuthor;
- }
-
- public String getVendor() {
- return vendor;
- }
-
- public void setVendor(String vendor) {
- this.vendor = vendor;
- }
-
- public String getVersion() {
- return version;
- }
-
- public void setVersion(String version) {
- this.version = version;
- }
-
- public String getNfvType() {
- return nfvType;
- }
-
- public void setNfvType(String nfvType) {
- this.nfvType = nfvType;
- }
-
- public String getMoc() {
- return moc;
- }
-
- public void setMoc(String moc) {
- this.moc = moc;
- }
-
- public String getFlavor() {
- return flavor;
- }
-
- public void setFlavor(String flavor) {
- this.flavor = flavor;
- }
-
- public List<STFlavor> getStFlavor() {
- return stFlavor;
- }
-
- public void setStFlavor(List<STFlavor> stFlavor) {
- this.stFlavor = stFlavor;
- }
-
- @XmlElement
- private String templateVersion;
-
- @XmlElement
- private String templateAuthor;
-
- @XmlElement
- private String vendor;
-
- @XmlElement
- private String version;
-
- @XmlElement
- private String nfvType;
-
- @XmlElement
- private String moc;
-
- @XmlElement
- private String flavor;
-
- @XmlElementWrapper(name = "flavorList")
- @XmlElement(name = "flavor")
- private List<STFlavor> stFlavor;
- }
-
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.NONE)
- public static class STFlavor {
- @XmlAttribute
- private String name;
-
- @XmlAttribute
- private String desc;
-
- @XmlElementWrapper(name = "nodeList")
- @XmlElement(name = "node")
- private List<STFlavorConstituent> stFlavorConstituent;
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getDesc() {
- return desc;
- }
-
- public void setDesc(String desc) {
- this.desc = desc;
- }
-
- public List<STFlavorConstituent> getStFlavorConstituent() {
- return stFlavorConstituent;
- }
-
- public void setStFlavorConstituent(
- List<STFlavorConstituent> stFlavorConstituent) {
- this.stFlavorConstituent = stFlavorConstituent;
- }
- }
-
- @XmlRootElement
- @XmlAccessorType(XmlAccessType.NONE)
- public static class STFlavorConstituent {
- @XmlAttribute
- private String numberOfInstances;
-
- @XmlAttribute
- private String name;
-
- @XmlAttribute
- private String refNodeFlavor;
-
- @XmlAttribute
- private String affinity;
-
- @XmlAttribute
- private String redundancyModel;
-
- @XmlAttribute
- private String capability;
-
- public String getAffinity() {
- return affinity;
- }
-
- public void setAffinity(String affinity) {
- this.affinity = affinity;
- }
-
- public String getRedundancyModel() {
- return redundancyModel;
- }
-
- public void setRedundancyModel(String redundancyModel) {
- this.redundancyModel = redundancyModel;
- }
-
- public String getCapability() {
- return capability;
- }
-
- public void setCapability(String capability) {
- this.capability = capability;
- }
-
- public String getNumberOfInstances() {
- return numberOfInstances;
- }
-
- public void setNumberOfInstances(String numberOfInstances) {
- this.numberOfInstances = numberOfInstances;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getRefNodeFlavor() {
- return refNodeFlavor;
- }
-
- public void setRefNodeFlavor(String refNodeFlavor) {
- this.refNodeFlavor = refNodeFlavor;
- }
- }
-
- private Boolean propNullFlag;
-
- private boolean isPropNotNull() {
- if (null == propNullFlag) {
- propNullFlag = null != this.getBoundary()
- && null != this.getBoundary().getProperties()
- && null != this.getBoundary().getProperties().getProperty();
- }
- return propNullFlag;
- }
-
- public String getProductType() {
- return isPropNotNull() ? this.getBoundary().getProperties()
- .getProperty().getMoc() : null;
- }
-
- public String getVendor() {
- return isPropNotNull() ? this.getBoundary().getProperties()
- .getProperty().getVendor() : null;
- }
-
- public String getVersion() {
- return isPropNotNull() ? this.getBoundary().getProperties()
- .getProperty().getVersion() : null;
- }
-
- public String getNfvtype() {
- return isPropNotNull() ? this.getBoundary().getProperties()
- .getProperty().getNfvType() : null;
- }
-
- public String getFlavor() {
- return isPropNotNull() ? this.getBoundary().getProperties()
- .getProperty().getFlavor() : null;
- }
-
- public List<STFlavor> getSTFlavorList() {
- return isPropNotNull() ? this.getBoundary().getProperties()
- .getProperty().getStFlavor() : null;
- }
-}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.externalservice.entity.lifecycleEnity;
+
+package org.openo.commontosca.catalog.model.externalservice.entity.lifecycle;
public class InstanceEntity {
- private String serviceTemplateId;
+ private String serviceTemplateId;
- public String getServiceTemplateId() {
- return serviceTemplateId;
- }
+ public String getServiceTemplateId() {
+ return serviceTemplateId;
+ }
- public void setServiceTemplateId(String serviceTemplateId) {
- this.serviceTemplateId = serviceTemplateId;
- }
+ public void setServiceTemplateId(String serviceTemplateId) {
+ this.serviceTemplateId = serviceTemplateId;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.model.externalservice.entity.roEntity;
+
+package org.openo.commontosca.catalog.model.externalservice.entity.ro;
import java.util.ArrayList;
-public class ResourceResponseEntity
-{
- ArrayList <VimEntity> data=new ArrayList<VimEntity>();
- String operationResult;
+public class ResourceResponseEntity {
+ ArrayList<VimEntity> data = new ArrayList<VimEntity>();
+ String operationResult;
+
+ public String getOperationResult() {
+ return operationResult;
+ }
+
+ public void setOperationResult(String operationResult) {
+ this.operationResult = operationResult;
+ }
- public String getOperationResult()
- {
- return operationResult;
- }
+ public ArrayList<VimEntity> getData() {
+ return data;
+ }
- public void setOperationResult(String operationResult)
- {
- this.operationResult = operationResult;
- }
- public ArrayList <VimEntity> getData()
- {
- return data;
- }
- public void setData(ArrayList <VimEntity> data)
- {
- this.data = data;
- }
+ public void setData(ArrayList<VimEntity> data) {
+ this.data = data;
+ }
}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.externalservice.entity.ro;
+
+public class VimEntity {
+ private String oid;
+ private String name;
+ private String user;
+ private String url;
+ private String userName;
+ private String password;
+
+ public String getOid() {
+ return oid;
+ }
+
+ public void setOid(String oid) {
+ this.oid = oid;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getUser() {
+ return user;
+ }
+
+ public void setUser(String user) {
+ this.user = user;
+ }
+
+ public String getUrl() {
+ return url;
+ }
+
+ public void setUrl(String url) {
+ this.url = url;
+ }
+
+ public String getUserName() {
+ return userName;
+ }
+
+ public void setUserName(String userName) {
+ this.userName = userName;
+ }
+
+ public String getPassword() {
+ return password;
+ }
+
+ public void setPassword(String password) {
+ this.password = password;
+ }
+
+}
+++ /dev/null
-/**
- * Copyright 2016 [ZTE] and others.
- *
- * 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.
- */
-package org.openo.commontosca.catalog.model.externalservice.entity.roEntity;
-
-public class VimEntity
-{
- private String oid;
- private String name;
- private String user;
- private String url;
- private String userName;
- private String password;
- public String getOid() {
- return oid;
- }
- public void setOid(String oid) {
- this.oid = oid;
- }
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getUser() {
- return user;
- }
- public void setUser(String user) {
- this.user = user;
- }
- public String getUrl() {
- return url;
- }
- public void setUrl(String url) {
- this.url = url;
- }
- public String getUserName() {
- return userName;
- }
- public void setUserName(String userName) {
- this.userName = userName;
- }
- public String getPassword() {
- return password;
- }
- public void setPassword(String password) {
- this.password = password;
- }
-
-}
\ No newline at end of file
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.externalservice.lifecycle;\r
\r
import javax.ws.rs.GET;\r
\r
/**\r
* The lifecycle interface.\r
+ * \r
* @author 10189609\r
- *\r
+ * \r
*/\r
@Path("/appinstances")\r
public interface ILifeCycleServiceRest {\r
- @GET\r
- @Produces(MediaType.APPLICATION_JSON)\r
- public String getVNFInstances();\r
+ @GET\r
+ @Produces(MediaType.APPLICATION_JSON)\r
+ public String getVnfInstances();\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.externalservice.lifecycle;\r
\r
-import java.lang.reflect.Type;\r
-import java.util.ArrayList;\r
+import com.google.gson.Gson;\r
+import com.google.gson.reflect.TypeToken;\r
\r
-import org.openo.commontosca.catalog.common.MSBUtil;\r
+import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
+import org.openo.commontosca.catalog.common.MsbUtil;\r
import org.openo.commontosca.catalog.common.ToolUtil;\r
-import org.openo.commontosca.catalog.model.externalservice.entity.lifecycleEnity.InstanceEntity;\r
+import org.openo.commontosca.catalog.model.externalservice.entity.lifecycle.InstanceEntity;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
-import com.google.gson.Gson;\r
-import com.google.gson.reflect.TypeToken;\r
+import java.lang.reflect.Type;\r
+import java.util.ArrayList;\r
+\r
+\r
\r
/**\r
* The lifecycle service.\r
+ * \r
* @author 10189609\r
- *\r
+ * \r
*/\r
public class LifeCycleServiceConsumer {\r
- private static final Logger LOG = LoggerFactory.getLogger(LifeCycleServiceConsumer.class);\r
- \r
- /**\r
- * get lifecycle application instances.\r
- * @return instance entity\r
- */\r
- public static ArrayList<InstanceEntity> getInstances() {\r
- ILifeCycleServiceRest resourceserviceproxy = ConsumerFactory\r
- .createConsumer(MSBUtil.getNsocLifecycleBaseUrl(), ILifeCycleServiceRest.class); \r
- String result = "";\r
- try {\r
- result = resourceserviceproxy.getVNFInstances();\r
- } catch (Exception e) {\r
- LOG.error("query vim info faild.", e);\r
- return null;\r
- }\r
- if (ToolUtil.isEmptyString(result)) {\r
- return null;\r
- }\r
- \r
- Gson gson = new Gson();\r
- Type listType = new TypeToken<ArrayList<InstanceEntity>>() {}.getType();\r
- return gson.fromJson(result, listType);\r
- }\r
+ private static final Logger LOG = LoggerFactory.getLogger(LifeCycleServiceConsumer.class);\r
+\r
+ /**\r
+ * get lifecycle application instances.\r
+ * \r
+ * @return instance entity\r
+ */\r
+ public static ArrayList<InstanceEntity> getInstances() {\r
+ ILifeCycleServiceRest resourceserviceproxy =\r
+ ConsumerFactory.createConsumer(MsbUtil.getNsocLifecycleBaseUrl(),\r
+ ILifeCycleServiceRest.class);\r
+ String result = "";\r
+ try {\r
+ result = resourceserviceproxy.getVnfInstances();\r
+ } catch (Exception e1) {\r
+ LOG.error("query vim info faild.", e1);\r
+ return null;\r
+ }\r
+ if (ToolUtil.isEmptyString(result)) {\r
+ return null;\r
+ }\r
+\r
+ Gson gson = new Gson();\r
+ Type listType = new TypeToken<ArrayList<InstanceEntity>>() {}.getType();\r
+ return gson.fromJson(result, listType);\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.externalservice.ro;\r
\r
import javax.ws.rs.GET;\r
\r
/**\r
* The roc resource interface.\r
+ * \r
* @author 10189609\r
- *\r
+ * \r
*/\r
@Path("/resource")\r
public interface IResourceServiceRest {\r
- @Path("/vims/{vim_id}")\r
- @GET\r
- @Produces(MediaType.APPLICATION_JSON)\r
- public String getResourceVim(@PathParam("vim_id") String vimId) throws Exception;\r
+ @Path("/vims/{vim_id}")\r
+ @GET\r
+ @Produces(MediaType.APPLICATION_JSON)\r
+ public String getResourceVim(@PathParam("vim_id") String vimId) throws Exception;\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.externalservice.ro;\r
\r
-import org.openo.commontosca.catalog.common.MSBUtil;\r
+import com.google.gson.Gson;\r
+\r
+import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
+\r
+import org.openo.commontosca.catalog.common.MsbUtil;\r
import org.openo.commontosca.catalog.common.ToolUtil;\r
-import org.openo.commontosca.catalog.model.externalservice.entity.roEntity.ResourceResponseEntity;\r
-import org.openo.commontosca.catalog.model.externalservice.entity.roEntity.VimEntity;\r
+import org.openo.commontosca.catalog.model.externalservice.entity.ro.ResourceResponseEntity;\r
+import org.openo.commontosca.catalog.model.externalservice.entity.ro.VimEntity;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
-import com.google.gson.Gson;\r
\r
/**\r
* The roc resource service.\r
+ * \r
* @author 10189609\r
- *\r
+ * \r
*/\r
public class ResourceServiceConsumer {\r
- private static final Logger LOG = LoggerFactory.getLogger(ResourceServiceConsumer.class);\r
- \r
- private static final String RESOURCE_REST_RESULT = "SUCCESS";\r
- \r
- /**\r
- * get vim entity from roc by vimid\r
- * @param vimId id\r
- * @return vim entity\r
- */\r
- public static VimEntity getResourceVim(String vimId) {\r
- LOG.info("begin query vim info from roc,vimId:" + vimId);\r
- IResourceServiceRest resourceserviceproxy = ConsumerFactory\r
- .createConsumer(MSBUtil.getRocBaseUrl(), IResourceServiceRest.class); \r
- String result = "";\r
- try {\r
- result = resourceserviceproxy.getResourceVim(vimId);\r
- } catch (Exception e) {\r
- LOG.error("query vim info faild.", e);\r
- return null;\r
- }\r
- if (ToolUtil.isEmptyString(result)) {\r
- LOG.error("query vim info faild, vim info is null, vimId:" + vimId);\r
- return null;\r
- }\r
- \r
- Gson gson = new Gson();\r
- ResourceResponseEntity responseEntity = gson.fromJson(result, ResourceResponseEntity.class);\r
- if (!RESOURCE_REST_RESULT.equalsIgnoreCase(responseEntity.getOperationResult())) \r
- {\r
- LOG.error("query vim info faild.vimId:" + vimId);\r
- return null;\r
- }\r
- if (responseEntity.getData().size() <= 0)\r
- {\r
- LOG.error("query vim info faild, vim info is empty, vimId:" + vimId);\r
- return null;\r
- }\r
- \r
- LOG.info("end query vim info from roc.");\r
- return responseEntity.getData().get(0);\r
- }\r
+ private static final Logger LOG = LoggerFactory.getLogger(ResourceServiceConsumer.class);\r
+\r
+ private static final String RESOURCE_REST_RESULT = "SUCCESS";\r
+\r
+ /**\r
+ * get vim entity from roc by vimid.\r
+ * \r
+ * @param vimId id\r
+ * @return vim entity\r
+ */\r
+ public static VimEntity getResourceVim(String vimId) {\r
+ LOG.info("begin query vim info from roc,vimId:" + vimId);\r
+ IResourceServiceRest resourceserviceproxy =\r
+ ConsumerFactory.createConsumer(MsbUtil.getRocBaseUrl(), IResourceServiceRest.class);\r
+ String result = "";\r
+ try {\r
+ result = resourceserviceproxy.getResourceVim(vimId);\r
+ } catch (Exception e1) {\r
+ LOG.error("query vim info faild.", e1);\r
+ return null;\r
+ }\r
+ if (ToolUtil.isEmptyString(result)) {\r
+ LOG.error("query vim info faild, vim info is null, vimId:" + vimId);\r
+ return null;\r
+ }\r
+\r
+ Gson gson = new Gson();\r
+ ResourceResponseEntity responseEntity = gson.fromJson(result, ResourceResponseEntity.class);\r
+ if (!RESOURCE_REST_RESULT.equalsIgnoreCase(responseEntity.getOperationResult())) {\r
+ LOG.error("query vim info faild.vimId:" + vimId);\r
+ return null;\r
+ }\r
+ if (responseEntity.getData().size() <= 0) {\r
+ LOG.error("query vim info faild, vim info is empty, vimId:" + vimId);\r
+ return null;\r
+ }\r
+\r
+ LOG.info("end query vim info from roc.");\r
+ return responseEntity.getData().get(0);\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.parser;\r
\r
import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
\r
public abstract class AbstractModelParser {\r
- /**\r
- * @param packageId\r
- * @param fileLocation\r
- * @return service template id\r
- * @throws CatalogResourceException\r
- */\r
- public abstract String parse(String packageId, String fileLocation)\r
- throws CatalogResourceException;\r
- \r
+ \r
+ public abstract String parse(String packageId, String fileLocation)\r
+ throws CatalogResourceException;\r
+\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.parser;\r
\r
/**\r
* enum data.\r
+ * \r
* @author 10189609\r
- *\r
+ * \r
*/\r
public enum EnumPackageFormat {\r
- TOSCA_XML, TOSCA_YAML\r
+ TOSCA_XML, TOSCA_YAML\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.parser;\r
\r
public enum EnumTemplateType {\r
- NS, VNF\r
+ NS, VNF\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.parser;\r
\r
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
+\r
import java.util.HashMap;\r
import java.util.Map;\r
\r
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
\r
public class ModelParserFactory {\r
- private final static ModelParserFactory instance = new ModelParserFactory();\r
- public static ModelParserFactory getInstance() {\r
- return instance;\r
- }\r
+ private static final ModelParserFactory instance = new ModelParserFactory();\r
\r
- private Map<EnumPackageFormat, AbstractModelParser> pkgType2ParseMap = new HashMap<EnumPackageFormat, AbstractModelParser>();\r
+ public static ModelParserFactory getInstance() {\r
+ return instance;\r
+ }\r
\r
- private ModelParserFactory() {\r
- // PackageParseMap.put(EnumPackageFormat.TOSCA_XML, new\r
- // ToscaXmlModelParser());\r
- pkgType2ParseMap.put(EnumPackageFormat.TOSCA_YAML, new ToscaYamlModelParser());\r
- }\r
+ private Map<EnumPackageFormat, AbstractModelParser> pkgType2ParseMap =\r
+ new HashMap<EnumPackageFormat, AbstractModelParser>();\r
\r
- /**\r
- * \r
- * @param packageId\r
- * @param fileLocation\r
- * @param format\r
- * @return service template id\r
- * @throws CatalogResourceException\r
- */\r
- public String parse(String packageId, String fileLocation,\r
- EnumPackageFormat format) throws CatalogResourceException {\r
- if (pkgType2ParseMap.get(format) == null) {\r
- throw new CatalogResourceException(\r
- "Can't find its parser. package type = "\r
- + format.toString());\r
- }\r
-\r
- return pkgType2ParseMap.get(format).parse(packageId, fileLocation);\r
+ private ModelParserFactory() {\r
+ // PackageParseMap.put(EnumPackageFormat.TOSCA_XML, new\r
+ // ToscaXmlModelParser());\r
+ pkgType2ParseMap.put(EnumPackageFormat.TOSCA_YAML, new ToscaYamlModelParser());\r
+ }\r
+\r
+ /**\r
+ * parse package.\r
+ * @param packageId package id\r
+ * @param fileLocation package location\r
+ * @param format package format\r
+ * @return service template id \r
+ * @throws CatalogResourceException e\r
+ */\r
+ public String parse(String packageId, String fileLocation, EnumPackageFormat format)\r
+ throws CatalogResourceException {\r
+ if (pkgType2ParseMap.get(format) == null) {\r
+ throw new CatalogResourceException("Can't find its parser. package type = "\r
+ + format.toString());\r
}\r
+\r
+ return pkgType2ParseMap.get(format).parse(packageId, fileLocation);\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.parser;\r
\r
+import org.openo.commontosca.catalog.common.ToolUtil;\r
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
+import org.openo.commontosca.catalog.db.resource.TemplateManager;\r
+import org.openo.commontosca.catalog.entity.response.CsarFileUriResponse;\r
+import org.openo.commontosca.catalog.model.common.TemplateDataHelper;\r
+import org.openo.commontosca.catalog.model.entity.EnumDataType;\r
+import org.openo.commontosca.catalog.model.entity.InputParameter;\r
+import org.openo.commontosca.catalog.model.entity.NodeTemplate;\r
+import org.openo.commontosca.catalog.model.entity.OutputParameter;\r
+import org.openo.commontosca.catalog.model.entity.RelationShip;\r
+import org.openo.commontosca.catalog.model.entity.ServiceTemplate;\r
+import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;\r
+import org.openo.commontosca.catalog.model.entity.SubstitutionMapping;\r
+import org.openo.commontosca.catalog.model.parser.yaml.YamlParseServiceConsumer;\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.EnumYamlServiceTemplateInfo;\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult;\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.Plan;\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.Plan.PlanValue.PlanInput;\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.TopologyTemplate.Input;\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.TopologyTemplate.NodeTemplate.Relationship;\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult.TopologyTemplate.Output;\r
+import org.openo.commontosca.catalog.model.plan.wso2.Wso2ServiceConsumer;\r
+import org.openo.commontosca.catalog.model.plan.wso2.entity.DeployPackageResponse;\r
+import org.openo.commontosca.catalog.wrapper.PackageWrapper;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
+\r
import java.io.BufferedInputStream;\r
import java.io.BufferedReader;\r
import java.io.File;\r
import java.util.zip.ZipFile;\r
import java.util.zip.ZipInputStream;\r
\r
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
-import org.openo.commontosca.catalog.db.resource.TemplateManager;\r
-import org.openo.commontosca.catalog.entity.response.CsarFileUriResponse;\r
-import org.openo.commontosca.catalog.model.common.TemplateDataHelper;\r
-import org.openo.commontosca.catalog.model.entity.InputParameter;\r
-import org.openo.commontosca.catalog.model.entity.RelationShip;\r
-import org.openo.commontosca.catalog.model.entity.ServiceTemplate;\r
-import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;\r
-import org.openo.commontosca.catalog.model.entity.SubstitutionMapping;\r
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult;\r
-import org.openo.commontosca.catalog.wrapper.PackageWrapper;\r
-import org.openo.commontosca.catalog.common.ToolUtil;\r
-import org.openo.commontosca.catalog.model.entity.EnumDataType;\r
-import org.openo.commontosca.catalog.model.entity.NodeTemplate;\r
-import org.openo.commontosca.catalog.model.parser.yaml.YamlParseServiceConsumer;\r
-import org.openo.commontosca.catalog.model.parser.yaml.entity.EnumYamlServiceTemplateInfo;\r
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;\r
\r
-public class ToscaYamlModelParser extends AbstractModelParser{\r
-\r
- private static final Object TOSCA_META_FIELD_ENTRY_DEFINITIONS = "Entry-Definitions";\r
-\r
- /**\r
- * \r
- */\r
- @Override\r
- public String parse(String packageId, String fileLocation)\r
- throws CatalogResourceException {\r
- ParseYamlResult result = YamlParseServiceConsumer.getServiceTemplates(comboRequest(fileLocation));\r
-\r
- Map<String, String> toscaMeta = parseToscaMeta(fileLocation);\r
- String stFileName = toscaMeta.get(TOSCA_META_FIELD_ENTRY_DEFINITIONS);\r
- CsarFileUriResponse stDownloadUri = PackageWrapper.getInstance()\r
- .getCsarFileDownloadUri(packageId, stFileName);\r
-\r
- ServiceTemplate st = parseServiceTemplate(packageId, result,\r
- stDownloadUri.getDownloadUri());\r
- List<NodeTemplate> ntList = parseNodeTemplates(packageId,\r
- st.getServiceTemplateId(), result);\r
- st.setType(getTemplateType(result, ntList).toString());\r
-\r
- TemplateManager.getInstance().addServiceTemplate(\r
- TemplateDataHelper.convert2TemplateData(st,\r
- ToolUtil.toJson(result), ntList));\r
-\r
- SubstitutionMapping stm = parseSubstitutionMapping(\r
- st.getServiceTemplateId(), result);\r
- if (stm != null) {\r
- TemplateManager.getInstance().addServiceTemplateMapping(\r
- TemplateDataHelper.convert2TemplateMappingData(stm));\r
- }\r
+public class ToscaYamlModelParser extends AbstractModelParser {\r
\r
- return st.getServiceTemplateId();\r
- }\r
+ private static final Object TOSCA_META_FIELD_ENTRY_DEFINITIONS = "Entry-Definitions";\r
+ private static final Logger LOGGER = LoggerFactory.getLogger(ToscaYamlModelParser.class);\r
\r
- /**\r
- * @param fileLocation\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- @SuppressWarnings("resource")\r
- private Map<String, String> parseToscaMeta(String fileLocation)\r
- throws CatalogResourceException {\r
- Map<String, String> toscaMeta = new HashMap<>();\r
-\r
- ZipInputStream zin = null;\r
- BufferedReader br = null;\r
- try {\r
- InputStream in = new BufferedInputStream(new FileInputStream(\r
- fileLocation));\r
- zin = new ZipInputStream(in);\r
- ZipEntry ze;\r
- while ((ze = zin.getNextEntry()) != null) {\r
- if (("TOSCA-Metadata" + File.separator + "TOSCA.meta")\r
- .equals(ze.getName())\r
- || "TOSCA-Metadata/TOSCA.meta".equals(ze.getName())) {\r
- ZipFile zf = new ZipFile(fileLocation);\r
- br = new BufferedReader(new InputStreamReader(\r
- zf.getInputStream(ze)));\r
- String line;\r
- String[] tmps;\r
- while ((line = br.readLine()) != null) {\r
- if (line.indexOf(":") > 0) {\r
- tmps = line.split(":");\r
- toscaMeta.put(tmps[0].trim(), tmps[1].trim());\r
- }\r
- }\r
-\r
- return toscaMeta;\r
- }\r
- }\r
+ @Override\r
+ public String parse(String packageId, String fileLocation) throws CatalogResourceException {\r
+ ParseYamlResult result =\r
+ YamlParseServiceConsumer.getServiceTemplates(comboRequest(fileLocation));\r
\r
- } catch (IOException e) {\r
- throw new CatalogResourceException("Parse Tosca Meta Fail.", e);\r
- } finally {\r
- closeStreamAndReader(zin, br);\r
- }\r
+ Map<String, String> toscaMeta = parseToscaMeta(fileLocation);\r
+ String stFileName = toscaMeta.get(TOSCA_META_FIELD_ENTRY_DEFINITIONS);\r
+ CsarFileUriResponse stDownloadUri =\r
+ PackageWrapper.getInstance().getCsarFileDownloadUri(packageId, stFileName);\r
\r
- return toscaMeta;\r
+ ServiceTemplate st = parseServiceTemplate(packageId, result, stDownloadUri.getDownloadUri());\r
+ ServiceTemplateOperation[] operations = parseOperations(result.getPlanList(), fileLocation);\r
+ st.setOperations(operations);\r
+ List<NodeTemplate> ntList = parseNodeTemplates(packageId, st.getServiceTemplateId(), result);\r
+ st.setType(getTemplateType(result, ntList).toString());\r
+\r
+ TemplateManager.getInstance().addServiceTemplate(\r
+ TemplateDataHelper.convert2TemplateData(st, ToolUtil.toJson(result), ntList));\r
+\r
+ SubstitutionMapping stm = parseSubstitutionMapping(st.getServiceTemplateId(), result);\r
+ if (stm != null) {\r
+ TemplateManager.getInstance()\r
+ .addServiceTemplateMapping(TemplateDataHelper.convert2TemplateMappingData(stm));\r
}\r
\r
- private void closeStreamAndReader(ZipInputStream zin, BufferedReader br) {\r
- if (br != null) {\r
- try {\r
- br.close();\r
- } catch (IOException e) {\r
- }\r
- }\r
- if (zin != null) {\r
- try {\r
- zin.closeEntry();\r
- } catch (IOException e) {\r
+ return st.getServiceTemplateId();\r
+ }\r
+\r
+ @SuppressWarnings("resource")\r
+ private Map<String, String> parseToscaMeta(String fileLocation) throws CatalogResourceException {\r
+ Map<String, String> toscaMeta = new HashMap<>();\r
+\r
+ ZipInputStream zin = null;\r
+ BufferedReader br = null;\r
+ try {\r
+ InputStream in = new BufferedInputStream(new FileInputStream(fileLocation));\r
+ zin = new ZipInputStream(in);\r
+ ZipEntry ze;\r
+ while ((ze = zin.getNextEntry()) != null) {\r
+ if (("TOSCA-Metadata" + File.separator + "TOSCA.meta").equals(ze.getName())\r
+ || "TOSCA-Metadata/TOSCA.meta".equals(ze.getName())) {\r
+ ZipFile zf = new ZipFile(fileLocation);\r
+ br = new BufferedReader(new InputStreamReader(zf.getInputStream(ze)));\r
+ String line;\r
+ String[] tmps;\r
+ while ((line = br.readLine()) != null) {\r
+ if (line.indexOf(":") > 0) {\r
+ tmps = line.split(":");\r
+ toscaMeta.put(tmps[0].trim(), tmps[1].trim());\r
}\r
+ }\r
+\r
+ return toscaMeta;\r
}\r
- }\r
+ }\r
\r
- private ParseYamlRequestParemeter comboRequest(String fileLocation) {\r
- ParseYamlRequestParemeter request = new ParseYamlRequestParemeter();\r
- request.setPath(fileLocation);\r
- return request;\r
+ } catch (IOException e1) {\r
+ throw new CatalogResourceException("Parse Tosca Meta Fail.", e1);\r
+ } finally {\r
+ closeStreamAndReader(zin, br);\r
}\r
\r
- /**\r
- * @param serviceTemplateId\r
- * @param result\r
- * @return\r
- */\r
- private SubstitutionMapping parseSubstitutionMapping(\r
- String serviceTemplateId, ParseYamlResult result) {\r
- String type = getSubstitutionMappingType(result);\r
- if (ToolUtil.isTrimedEmptyString(type)) {\r
- return null;\r
- }\r
+ return toscaMeta;\r
+ }\r
\r
- ParseYamlResult.TopologyTemplate.SubstitutionMapping stm = result\r
- .getTopologyTemplate().getSubstitutionMappings();\r
- return new SubstitutionMapping(serviceTemplateId, type,\r
- stm.getRequirementList(), stm.getCapabilityList());\r
+ private void closeStreamAndReader(ZipInputStream zin, BufferedReader br) {\r
+ if (br != null) {\r
+ try {\r
+ br.close();\r
+ } catch (IOException e1) {\r
+ LOGGER.error("Buffered reader close failed !");\r
+ }\r
+ }\r
+ if (zin != null) {\r
+ try {\r
+ zin.closeEntry();\r
+ } catch (IOException e2) {\r
+ LOGGER.error("Zip inputStream close failed !");\r
+ }\r
+ }\r
+ }\r
+\r
+ private ParseYamlRequestParemeter comboRequest(String fileLocation) {\r
+ ParseYamlRequestParemeter request = new ParseYamlRequestParemeter();\r
+ request.setPath(fileLocation);\r
+ return request;\r
+ }\r
+\r
+ private SubstitutionMapping parseSubstitutionMapping(String serviceTemplateId,\r
+ ParseYamlResult result) {\r
+ String type = getSubstitutionMappingType(result);\r
+ if (ToolUtil.isTrimedEmptyString(type)) {\r
+ return null;\r
}\r
\r
- private ServiceTemplate parseServiceTemplate(String packageId,\r
- ParseYamlResult result, String stDownloadUri) {\r
- ServiceTemplate st = new ServiceTemplate();\r
-\r
- st.setServiceTemplateId(ToolUtil.generateId());\r
- st.setTemplateName(result.getMetadata().get(\r
- EnumYamlServiceTemplateInfo.ID.getName()));\r
- st.setVendor(result.getMetadata().get(\r
- EnumYamlServiceTemplateInfo.PROVIDER.getName()));\r
- st.setVersion(result.getMetadata().get(\r
- EnumYamlServiceTemplateInfo.VERSION.getName()));\r
- st.setCsarid(packageId);\r
- st.setDownloadUri(stDownloadUri);\r
- st.setInputs(parseInputs(result));\r
- ServiceTemplateOperation[] operations = parseOperations(result\r
- .getPlanList());\r
- st.setOperations(operations);\r
- return st;\r
+ org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult\r
+ .TopologyTemplate.SubstitutionMapping stm =\r
+ result.getTopologyTemplate().getSubstitutionMappings();\r
+ return new SubstitutionMapping(serviceTemplateId, type, stm.getRequirementList(),\r
+ stm.getCapabilityList());\r
+ }\r
+\r
+ private ServiceTemplate parseServiceTemplate(String packageId, ParseYamlResult result,\r
+ String stDownloadUri) {\r
+ ServiceTemplate st = new ServiceTemplate();\r
+\r
+ st.setServiceTemplateId(ToolUtil.generateId());\r
+ st.setTemplateName(result.getMetadata().get(EnumYamlServiceTemplateInfo.ID.getName()));\r
+ st.setVendor(result.getMetadata().get(EnumYamlServiceTemplateInfo.PROVIDER.getName()));\r
+ st.setVersion(result.getMetadata().get(EnumYamlServiceTemplateInfo.VERSION.getName()));\r
+ st.setCsarid(packageId);\r
+ st.setDownloadUri(stDownloadUri);\r
+ st.setInputs(parseInputs(result));\r
+ st.setOutputs(parseOutputs(result));\r
+ return st;\r
+ }\r
+\r
+ private InputParameter[] parseInputs(ParseYamlResult result) {\r
+ List<Input> inputList = result.getTopologyTemplate().getInputs();\r
+ if (inputList == null) {\r
+ return new InputParameter[0];\r
+ }\r
+ List<InputParameter> retList = new ArrayList<InputParameter>();\r
+ for (Input input : inputList) {\r
+ retList.add(new InputParameter(input.getName(), getEnumDataType(input.getType()),\r
+ input.getDescription(), input.getDefault(), input.isRequired()));\r
}\r
+ return retList.toArray(new InputParameter[0]);\r
+ }\r
\r
- /**\r
- * @param planList\r
- * @return\r
- */\r
- private ServiceTemplateOperation[] parseOperations(List<ParseYamlResult.Plan> planList) {\r
- if (planList == null || planList.isEmpty()) {\r
- return new ServiceTemplateOperation[0];\r
- }\r
+ private OutputParameter[] parseOutputs(ParseYamlResult result) {\r
+ List<Output> outputList = result.getTopologyTemplate().getOutputs();\r
+ if (outputList == null || outputList.isEmpty()) {\r
+ return new OutputParameter[0];\r
+ }\r
+ List<OutputParameter> retList = new ArrayList<OutputParameter>();\r
+ for (Output output : outputList) {\r
+ retList\r
+ .add(new OutputParameter(output.getName(), output.getDescription(), output.getValue()));\r
+ }\r
+ return retList.toArray(new OutputParameter[0]);\r
+ }\r
+\r
+ private ServiceTemplateOperation[] parseOperations(List<Plan> planList, String zipFileLocation)\r
+ throws CatalogResourceException {\r
+ if (planList == null || planList.isEmpty()) {\r
+ return new ServiceTemplateOperation[0];\r
+ }\r
\r
- List<ServiceTemplateOperation> opList = new ArrayList<>();\r
- for (ParseYamlResult.Plan plan : planList) {\r
- ServiceTemplateOperation op = new ServiceTemplateOperation();\r
- op.setName(plan.getName());\r
- op.setDescription(plan.getDescription());\r
- String processId = null; // TODO\r
- op.setProcessId(processId);\r
- InputParameter[] inputs = parsePlanInputs(plan.getInputList());\r
- op.setInputs(inputs);\r
+ List<ServiceTemplateOperation> opList = new ArrayList<>();\r
+ for (Plan plan : planList) {\r
+ ServiceTemplateOperation op = new ServiceTemplateOperation();\r
+ op.setName(plan.getName());\r
+ op.setDescription(plan.getDescription());\r
+ checkPlanLanguage(plan.getPlanLanguage());\r
+ DeployPackageResponse response =\r
+ Wso2ServiceConsumer.deployPackage(zipFileLocation, plan.getReference());\r
+ op.setPackageName(parsePackageName(response));\r
+ op.setProcessId(response.getProcessId());\r
+ op.setInputs(parsePlanInputs(plan.getInputList()));\r
\r
- opList.add(op);\r
+ opList.add(op);\r
\r
- }\r
- return opList.toArray(new ServiceTemplateOperation[0]);\r
}\r
+ return opList.toArray(new ServiceTemplateOperation[0]);\r
+ }\r
\r
- /**\r
- * @param inputList\r
- * @return\r
- */\r
- private InputParameter[] parsePlanInputs(List<ParseYamlResult.Plan.PlanValue.PlanInput> inputList) {\r
- if (inputList == null || inputList.isEmpty()) {\r
- return new InputParameter[0];\r
- }\r
+ private String parsePackageName(DeployPackageResponse response) {\r
+ String packageName = response.getPackageName();\r
+ if (packageName != null && packageName.indexOf("-") > 0) {\r
+ packageName = packageName.substring(0, packageName.lastIndexOf("-"));\r
+ }\r
+ return packageName;\r
+ }\r
\r
- List<InputParameter> retList = new ArrayList<>();\r
- for (ParseYamlResult.Plan.PlanValue.PlanInput input : inputList) {\r
- retList.add(new InputParameter(input.getName(),\r
- getEnumDataType(input.getType()), input.getDescription(),\r
- input.getDefault(), input.isRequired()));\r
- }\r
- return retList.toArray(new InputParameter[0]);\r
+ private void checkPlanLanguage(String planLanguage) throws CatalogResourceException {\r
+ if (planLanguage == null || planLanguage.isEmpty()) {\r
+ throw new CatalogResourceException("Plan Language is empty.");\r
+ }\r
+ if (planLanguage.equalsIgnoreCase("bpel")) {\r
+ return;\r
}\r
+ if (planLanguage.equalsIgnoreCase("bpmn")) {\r
+ return;\r
+ }\r
+ if (planLanguage.equalsIgnoreCase("bpmn4tosca")) {\r
+ return;\r
+ }\r
+ throw new CatalogResourceException(\r
+ "Plan Language is not supported. Language = " + planLanguage);\r
+ }\r
\r
- private InputParameter[] parseInputs(ParseYamlResult result) {\r
- List<ParseYamlResult.TopologyTemplate.Input> inputList = result.getTopologyTemplate().getInputs();\r
- if(inputList == null){\r
- return null;\r
- }\r
- ArrayList<InputParameter> retList = new ArrayList<InputParameter>();\r
- for(ParseYamlResult.TopologyTemplate.Input input : inputList){\r
- retList.add(new InputParameter(input.getName(),\r
- getEnumDataType(input.getType()), input.getDescription(),\r
- input.getDefault(), input.isRequired()));\r
- }\r
- return retList.toArray(new InputParameter[0]);\r
+ private InputParameter[] parsePlanInputs(List<PlanInput> inputList) {\r
+ if (inputList == null || inputList.isEmpty()) {\r
+ return new InputParameter[0];\r
}\r
\r
- /**\r
- * @param type\r
- * @return\r
- */\r
- private EnumDataType getEnumDataType(String type) {\r
- if (EnumDataType.INTEGER.toString().equalsIgnoreCase(type)) {\r
- return EnumDataType.INTEGER;\r
- }\r
+ List<InputParameter> retList = new ArrayList<>();\r
+ for (PlanInput input : inputList) {\r
+ retList.add(new InputParameter(input.getName(), getEnumDataType(input.getType()),\r
+ input.getDescription(), input.getDefault(), input.isRequired()));\r
+ }\r
+ return retList.toArray(new InputParameter[0]);\r
+ }\r
\r
- if (EnumDataType.FLOAT.toString().equalsIgnoreCase(type)) {\r
- return EnumDataType.FLOAT;\r
- }\r
+ private EnumDataType getEnumDataType(String type) {\r
+ if (EnumDataType.INTEGER.toString().equalsIgnoreCase(type)) {\r
+ return EnumDataType.INTEGER;\r
+ }\r
\r
- if (EnumDataType.BOOLEAN.toString().equalsIgnoreCase(type)) {\r
- return EnumDataType.BOOLEAN;\r
- }\r
+ if (EnumDataType.FLOAT.toString().equalsIgnoreCase(type)) {\r
+ return EnumDataType.FLOAT;\r
+ }\r
\r
- return EnumDataType.STRING;\r
+ if (EnumDataType.BOOLEAN.toString().equalsIgnoreCase(type)) {\r
+ return EnumDataType.BOOLEAN;\r
}\r
\r
- /**\r
- * @param csarId\r
- * @param templateId\r
- * @param result\r
- * @return\r
- */\r
- private List<NodeTemplate> parseNodeTemplates(String csarId,\r
- String templateId, ParseYamlResult result) {\r
- List<ParseYamlResult.TopologyTemplate.NodeTemplate> nodetemplateList = result.getTopologyTemplate().getNodeTemplates();\r
- if(nodetemplateList == null){\r
- return null;\r
- }\r
- \r
- List<NodeTemplate> retList = new ArrayList<>();\r
- for (ParseYamlResult.TopologyTemplate.NodeTemplate nodeTemplate : nodetemplateList) {\r
- NodeTemplate ret = new NodeTemplate();\r
- ret.setId(nodeTemplate.getName());\r
- ret.setName(nodeTemplate.getName());\r
- ret.setType(nodeTemplate.getNodeType());\r
- ret.setProperties(nodeTemplate.getPropertyList());\r
- List<RelationShip> relationShipList = parseNodeTemplateRelationShip(nodeTemplate\r
- .getRelationships());\r
- ret.setRelationShips(relationShipList);\r
-\r
- retList.add(ret);\r
- }\r
+ return EnumDataType.STRING;\r
+ }\r
\r
- return retList;\r
+ private List<NodeTemplate> parseNodeTemplates(String csarId, String templateId,\r
+ ParseYamlResult result) {\r
+ List<ParseYamlResult.TopologyTemplate.NodeTemplate> nodetemplateList =\r
+ result.getTopologyTemplate().getNodeTemplates();\r
+ if (nodetemplateList == null) {\r
+ return null;\r
}\r
- \r
- \r
- private List<RelationShip> parseNodeTemplateRelationShip(\r
- List<ParseYamlResult.TopologyTemplate.NodeTemplate.Relationship> relationshipList) {\r
- List<RelationShip> retList = new ArrayList<>();\r
-\r
- if (relationshipList == null) {\r
- return retList;\r
- }\r
\r
- for (ParseYamlResult.TopologyTemplate.NodeTemplate.Relationship relationship : relationshipList) {\r
- RelationShip ret = new RelationShip();\r
- ret.setSourceNodeId(relationship.getSourceNodeName());\r
- ret.setSourceNodeName(relationship.getSourceNodeName());\r
- ret.setTargetNodeId(relationship.getTargetNodeName());\r
- ret.setTargetNodeName(relationship.getTargetNodeName());\r
- ret.setType(relationship.getType());\r
- retList.add(ret);\r
- }\r
+ List<NodeTemplate> retList = new ArrayList<>();\r
+ for (ParseYamlResult.TopologyTemplate.NodeTemplate nodeTemplate : nodetemplateList) {\r
+ NodeTemplate ret = new NodeTemplate();\r
+ ret.setId(nodeTemplate.getName());\r
+ ret.setName(nodeTemplate.getName());\r
+ ret.setType(nodeTemplate.getNodeType());\r
+ ret.setProperties(nodeTemplate.getPropertyList());\r
+ List<RelationShip> relationShipList =\r
+ parseNodeTemplateRelationShip(nodeTemplate.getRelationships());\r
+ ret.setRelationShips(relationShipList);\r
+\r
+ retList.add(ret);\r
+ }\r
+\r
+ return retList;\r
+ }\r
+\r
\r
- return retList;\r
+ private List<RelationShip> parseNodeTemplateRelationShip(List<Relationship> relationshipList) {\r
+ List<RelationShip> retList = new ArrayList<>();\r
+\r
+ if (relationshipList == null) {\r
+ return retList;\r
}\r
- \r
- private EnumTemplateType getTemplateType(ParseYamlResult result,\r
- List<NodeTemplate> ntList) {\r
- String type = getSubstitutionMappingType(result);\r
- if (isNSType(type)) {\r
- return EnumTemplateType.NS;\r
- }\r
- \r
- if (isVNFType(type)) {\r
- return EnumTemplateType.VNF;\r
- }\r
\r
- return getTemplateTypeFromNodeTemplates(ntList);\r
+ for (Relationship relationship : relationshipList) {\r
+ RelationShip ret = new RelationShip();\r
+ ret.setSourceNodeId(relationship.getSourceNodeName());\r
+ ret.setSourceNodeName(relationship.getSourceNodeName());\r
+ ret.setTargetNodeId(relationship.getTargetNodeName());\r
+ ret.setTargetNodeName(relationship.getTargetNodeName());\r
+ ret.setType(relationship.getType());\r
+ retList.add(ret);\r
}\r
\r
- private String getSubstitutionMappingType(ParseYamlResult result) {\r
- if (result.getTopologyTemplate().getSubstitutionMappings() == null) {\r
- return null;\r
- }\r
- return result.getTopologyTemplate().getSubstitutionMappings()\r
- .getNode_type();\r
+ return retList;\r
+ }\r
+\r
+ private EnumTemplateType getTemplateType(ParseYamlResult result, List<NodeTemplate> ntList) {\r
+ String type = getSubstitutionMappingType(result);\r
+ if (isNsType(type)) {\r
+ return EnumTemplateType.NS;\r
}\r
\r
- /**\r
- * @param ntList\r
- * @return\r
- */\r
- private EnumTemplateType getTemplateTypeFromNodeTemplates(\r
- List<NodeTemplate> ntList) {\r
- for (NodeTemplate nt : ntList) {\r
- if (isNSType(nt.getType()) || isVNFType(nt.getType())) {\r
- return EnumTemplateType.NS;\r
- }\r
- }\r
+ if (isVnfType(type)) {\r
+ return EnumTemplateType.VNF;\r
+ }\r
\r
- return EnumTemplateType.VNF;\r
+ return getTemplateTypeFromNodeTemplates(ntList);\r
+ }\r
+\r
+ private String getSubstitutionMappingType(ParseYamlResult result) {\r
+ if (result.getTopologyTemplate().getSubstitutionMappings() == null) {\r
+ return null;\r
+ }\r
+ return result.getTopologyTemplate().getSubstitutionMappings().getNodeType();\r
+ }\r
+\r
+ private EnumTemplateType getTemplateTypeFromNodeTemplates(List<NodeTemplate> ntList) {\r
+ for (NodeTemplate nt : ntList) {\r
+ if (isNsType(nt.getType()) || isVnfType(nt.getType())) {\r
+ return EnumTemplateType.NS;\r
+ }\r
}\r
\r
- private boolean isVNFType(String type) {\r
- if (ToolUtil.isTrimedEmptyString(type)) {\r
- return false;\r
- }\r
- return type.toUpperCase().contains(".VNF");\r
+ return EnumTemplateType.VNF;\r
+ }\r
+\r
+ private boolean isVnfType(String type) {\r
+ if (ToolUtil.isTrimedEmptyString(type)) {\r
+ return false;\r
}\r
+ return type.toUpperCase().contains(".VNF");\r
+ }\r
\r
- private boolean isNSType(String type) {\r
- if (ToolUtil.isTrimedEmptyString(type)) {\r
- return false;\r
- }\r
- return type.toUpperCase().contains(".NS");\r
+ private boolean isNsType(String type) {\r
+ if (ToolUtil.isTrimedEmptyString(type)) {\r
+ return false;\r
}\r
+ return type.toUpperCase().contains(".NS");\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.parser.yaml;\r
\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;\r
+\r
import javax.ws.rs.Consumes;\r
import javax.ws.rs.POST;\r
import javax.ws.rs.Path;\r
import javax.ws.rs.Produces;\r
import javax.ws.rs.core.MediaType;\r
\r
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;\r
\r
-/**\r
- * \r
- * @author 10090474\r
- * \r
- */\r
@Path("/parse")\r
public interface IYamlParseRest {\r
- /**\r
- * @param request\r
- * @return\r
- * @throws Exception\r
- */\r
- @POST\r
- @Consumes(MediaType.APPLICATION_JSON)\r
- @Produces(MediaType.APPLICATION_JSON)\r
- String parse(ParseYamlRequestParemeter request)\r
- throws Exception;\r
+\r
+ @POST\r
+ @Consumes(MediaType.APPLICATION_JSON)\r
+ @Produces(MediaType.APPLICATION_JSON)\r
+ String parse(ParseYamlRequestParemeter request) throws Exception;\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.parser.yaml;\r
\r
+import com.google.gson.Gson;\r
+\r
+import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
+\r
import org.glassfish.jersey.client.ClientConfig;\r
-import org.openo.commontosca.catalog.common.MSBUtil;\r
+import org.openo.commontosca.catalog.common.MsbUtil;\r
import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
-import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult;\r
import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlRequestParemeter;\r
+import org.openo.commontosca.catalog.model.parser.yaml.entity.ParseYamlResult;\r
\r
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
-import com.google.gson.Gson;\r
\r
-/**\r
- * \r
- * @author 10090474\r
- * \r
- */\r
public class YamlParseServiceConsumer {\r
- /**\r
- * get service template by template id from container service.\r
- * \r
- * @param request\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public static ParseYamlResult getServiceTemplates(\r
- final ParseYamlRequestParemeter request)\r
- throws CatalogResourceException {\r
- try {\r
- ClientConfig config = new ClientConfig();\r
- IYamlParseRest yamlParseProxy = ConsumerFactory\r
- .createConsumer(MSBUtil.getYamlParseBaseUrl(), config,\r
- IYamlParseRest.class);\r
- String jsonStr = yamlParseProxy.parse(request);\r
- return new Gson().fromJson(jsonStr, ParseYamlResult.class);\r
- } catch (Exception e) {\r
- throw new CatalogResourceException("Call parser api failed.", e);\r
- }\r
-\r
+ /**\r
+ * get service template by template id from container service.\r
+ * \r
+ * @param request parse yaml request\r
+ * @return parase yaml result\r
+ * @throws CatalogResourceException e\r
+ */\r
+ public static ParseYamlResult getServiceTemplates(final ParseYamlRequestParemeter request)\r
+ throws CatalogResourceException {\r
+ try {\r
+ ClientConfig config = new ClientConfig();\r
+ IYamlParseRest yamlParseProxy =\r
+ ConsumerFactory.createConsumer(MsbUtil.getYamlParseBaseUrl(), config,\r
+ IYamlParseRest.class);\r
+ String jsonStr = yamlParseProxy.parse(request);\r
+ return new Gson().fromJson(jsonStr, ParseYamlResult.class);\r
+ } catch (Exception e1) {\r
+ throw new CatalogResourceException("Call parser api failed.", e1);\r
}\r
+\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.model.parser.yaml.entity;\r
\r
+package org.openo.commontosca.catalog.model.parser.yaml.entity;\r
\r
\r
public enum EnumYamlServiceTemplateInfo {\r
- ID{\r
- @Override\r
- public String getName() {\r
- return "id";\r
- }\r
- },\r
- VERSION{\r
- @Override\r
- public String getName() {\r
- return "version";\r
- }\r
- },\r
- PROVIDER{\r
- @Override\r
- public String getName() {\r
- return "vendor";\r
- }\r
- };\r
- \r
- public abstract String getName();\r
+ ID {\r
+ @Override\r
+ public String getName() {\r
+ return "id";\r
+ }\r
+ },\r
+ VERSION {\r
+ @Override\r
+ public String getName() {\r
+ return "version";\r
+ }\r
+ },\r
+ PROVIDER {\r
+ @Override\r
+ public String getName() {\r
+ return "vendor";\r
+ }\r
+ };\r
+\r
+ public abstract String getName();\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.parser.yaml.entity;\r
\r
import java.util.List;\r
\r
public class ParseYamlRequestParemeter {\r
- private String path = "E:\\NFVO\\130. yaml2xml\\0. tosca-parser\\sample\\ag-vnfd-floatingIp.zip";\r
- \r
- private List<Extension> extensionList;\r
- \r
- public String getPath() {\r
- return path;\r
- }\r
+ private String path = "E:\\NFVO\\130. yaml2xml\\0. tosca-parser\\sample\\ag-vnfd-floatingIp.zip";\r
\r
- public void setPath(String path) {\r
- this.path = path;\r
- }\r
+ private List<Extension> extensionList;\r
+\r
+ public String getPath() {\r
+ return path;\r
+ }\r
+\r
+ public void setPath(String path) {\r
+ this.path = path;\r
+ }\r
\r
- public List<Extension> getExtensionList() {\r
- return extensionList;\r
+ public List<Extension> getExtensionList() {\r
+ return extensionList;\r
+ }\r
+\r
+ public void setExtensionList(List<Extension> extensionList) {\r
+ this.extensionList = extensionList;\r
+ }\r
+\r
+ public Extension createExtension() {\r
+ return new Extension();\r
+ }\r
+\r
+ public class Extension {\r
+ private String name;\r
+ private String value;\r
+\r
+ public String getName() {\r
+ return name;\r
}\r
\r
- public void setExtensionList(List<Extension> extensionList) {\r
- this.extensionList = extensionList;\r
+ public void setName(String name) {\r
+ this.name = name;\r
}\r
\r
- public Extension createExtension(){\r
- return new Extension();\r
+ public String getValue() {\r
+ return value;\r
}\r
- \r
- public class Extension {\r
- private String name;\r
- private String value;\r
- public String getName() {\r
- return name;\r
- }\r
- public void setName(String name) {\r
- this.name = name;\r
- }\r
- public String getValue() {\r
- return value;\r
- }\r
- public void setValue(String value) {\r
- this.value = value;\r
- }\r
+\r
+ public void setValue(String value) {\r
+ this.value = value;\r
}\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.parser.yaml.entity;\r
\r
+import com.google.gson.Gson;\r
+import com.google.gson.JsonArray;\r
+import com.google.gson.JsonElement;\r
+import com.google.gson.JsonObject;\r
+import com.google.gson.annotations.SerializedName;\r
+\r
import java.util.ArrayList;\r
import java.util.HashMap;\r
import java.util.Iterator;\r
import java.util.Map;\r
import java.util.Map.Entry;\r
\r
-import com.google.gson.Gson;\r
-import com.google.gson.JsonArray;\r
-import com.google.gson.JsonElement;\r
-import com.google.gson.JsonObject;\r
\r
public class ParseYamlResult {\r
- private String toscaDefinitionsVersion;\r
+ private String toscaDefinitionsVersion;\r
+ private String description;\r
+ private JsonObject nodeTypes;\r
+ private JsonObject capabilityTypes;\r
+ private JsonObject relationshipTypes;\r
+ private JsonObject policyTypes;\r
+ private TopologyTemplate topologyTemplate;\r
+ private Map<String, String> metadata;\r
+ private JsonObject plans;\r
+\r
+\r
+ public String getToscaDefinitionsVersion() {\r
+ return toscaDefinitionsVersion;\r
+ }\r
+\r
+ public void setToscaDefinitionsVersion(String toscaDefinitionsVersion) {\r
+ this.toscaDefinitionsVersion = toscaDefinitionsVersion;\r
+ }\r
+\r
+ public String getDescription() {\r
+ return description;\r
+ }\r
+\r
+ public void setDescription(String description) {\r
+ this.description = description;\r
+ }\r
+\r
+ public JsonObject getNodeTypes() {\r
+ return nodeTypes;\r
+ }\r
+\r
+ public void setNodeTypes(JsonObject nodeTypes) {\r
+ this.nodeTypes = nodeTypes;\r
+ }\r
+\r
+ public List<NodeType> getNodeTypeList() {\r
+ return jsonObject2NodeTypes(nodeTypes);\r
+ }\r
+\r
+ private ArrayList<NodeType> jsonObject2NodeTypes(JsonObject nodeTypes) {\r
+ ArrayList<NodeType> nodeTypeList = new ArrayList<NodeType>();\r
+ Iterator<Entry<String, JsonElement>> iterator = nodeTypes.entrySet().iterator();\r
+ while (iterator.hasNext()) {\r
+ NodeType type = new NodeType();\r
+ Entry<String, JsonElement> next = iterator.next();\r
+ type.setType(next.getKey());\r
+ type.setValue(new Gson().fromJson(next.getValue(), NodeType.NodeTypeValue.class));\r
+ nodeTypeList.add(type);\r
+ }\r
+ return nodeTypeList;\r
+ }\r
+\r
+ public JsonObject getCapabilityTypes() {\r
+ return capabilityTypes;\r
+ }\r
+\r
+ public void setCapabilityTypes(JsonObject capabilityTypes) {\r
+ this.capabilityTypes = capabilityTypes;\r
+ }\r
+\r
+ public JsonObject getRelationshipTypes() {\r
+ return relationshipTypes;\r
+ }\r
+\r
+ public void setRelationshipTypes(JsonObject relationshipTypes) {\r
+ this.relationshipTypes = relationshipTypes;\r
+ }\r
+\r
+ public List<RelationshipType> getRelationshipTypeList() {\r
+ return jsonObject2RelationshipTypes(relationshipTypes);\r
+ }\r
+\r
+ private ArrayList<RelationshipType> jsonObject2RelationshipTypes(JsonObject relationshipTypes) {\r
+ ArrayList<RelationshipType> relationshipTypeList = new ArrayList<RelationshipType>();\r
+ Iterator<Entry<String, JsonElement>> iterator = relationshipTypes.entrySet().iterator();\r
+ while (iterator.hasNext()) {\r
+ RelationshipType type = new RelationshipType();\r
+ Entry<String, JsonElement> next = iterator.next();\r
+ type.setType(next.getKey());\r
+ type.setValue(new Gson().fromJson(next.getValue(), RelationshipType.RelationshipValue.class));\r
+ relationshipTypeList.add(type);\r
+ }\r
+ return relationshipTypeList;\r
+ }\r
+\r
+ public JsonObject getPolicyTypes() {\r
+ return policyTypes;\r
+ }\r
+\r
+ public void setPolicyTypes(JsonObject policyTypes) {\r
+ this.policyTypes = policyTypes;\r
+ }\r
+\r
+ public TopologyTemplate getTopologyTemplate() {\r
+ return topologyTemplate;\r
+ }\r
+\r
+ public void setTopologyTemplate(TopologyTemplate topologyTemplate) {\r
+ this.topologyTemplate = topologyTemplate;\r
+ }\r
+\r
+ public Map<String, String> getMetadata() {\r
+ return metadata;\r
+ }\r
+\r
+ public void setMetadata(Map<String, String> metadata) {\r
+ this.metadata = metadata;\r
+ }\r
+\r
+ public JsonObject getPlans() {\r
+ return plans;\r
+ }\r
+\r
+ public void setPlans(JsonObject plans) {\r
+ this.plans = plans;\r
+ }\r
+\r
+ public List<Plan> getPlanList() {\r
+ return jsonObject2PlanList(this.plans);\r
+ }\r
+\r
+ private List<Plan> jsonObject2PlanList(JsonObject plans) {\r
+ List<Plan> retList = new ArrayList<Plan>();\r
+ Iterator<Entry<String, JsonElement>> iterator = plans.entrySet().iterator();\r
+ while (iterator.hasNext()) {\r
+ Plan ret = new Plan();\r
+ Entry<String, JsonElement> next = iterator.next();\r
+ ret.setName(next.getKey());\r
+ ret.setValue(new Gson().fromJson(next.getValue(), Plan.PlanValue.class));\r
+ retList.add(ret);\r
+ }\r
+ return retList;\r
+ }\r
+\r
+ public class TopologyTemplate {\r
private String description;\r
- private JsonObject nodeTypes;\r
- private JsonObject capabilityTypes;\r
- private JsonObject relationshipTypes;\r
- private JsonObject policyTypes;\r
- private TopologyTemplate topologyTemplate;\r
- private Map<String, String> metadata;\r
- private JsonObject plans;\r
- \r
+ private List<Input> inputs;\r
+ private List<Output> outputs;\r
+ private List<NodeTemplate> nodeTemplates;\r
+ private SubstitutionMapping substitutionMappings;\r
\r
- public String getToscaDefinitionsVersion() {\r
- return toscaDefinitionsVersion;\r
+ public String getDescription() {\r
+ return description;\r
}\r
\r
- public void setToscaDefinitionsVersion(String toscaDefinitionsVersion) {\r
- this.toscaDefinitionsVersion = toscaDefinitionsVersion;\r
+ public void setDescription(String description) {\r
+ this.description = description;\r
}\r
\r
- public String getDescription() {\r
- return description;\r
+ public List<Input> getInputs() {\r
+ return inputs;\r
}\r
\r
- public void setDescription(String description) {\r
- this.description = description;\r
+ public void setInputs(List<Input> inputs) {\r
+ this.inputs = inputs;\r
}\r
\r
- public JsonObject getNodeTypes() {\r
- return nodeTypes;\r
+ public List<Output> getOutputs() {\r
+ return outputs;\r
}\r
\r
- public void setNodeTypes(JsonObject nodeTypes) {\r
- this.nodeTypes = nodeTypes;\r
+ public void setOutputs(List<Output> outputs) {\r
+ this.outputs = outputs;\r
}\r
\r
- /**\r
- * @return\r
- */\r
- public List<NodeType> getNodeTypeList() {\r
- return jsonObject2NodeTypes(nodeTypes);\r
+ public List<NodeTemplate> getNodeTemplates() {\r
+ return nodeTemplates;\r
}\r
\r
- private ArrayList<NodeType> jsonObject2NodeTypes(JsonObject nodeTypes) {\r
- ArrayList<NodeType> nodeTypeList = new ArrayList<NodeType>();\r
- Iterator<Entry<String, JsonElement>> iterator = nodeTypes.entrySet().iterator();\r
- while (iterator.hasNext()) {\r
- NodeType type = new NodeType();\r
- Entry<String, JsonElement> next = iterator.next();\r
- type.setType(next.getKey());\r
- type.setValue(new Gson().fromJson(next.getValue(),\r
- NodeType.NodeTypeValue.class));\r
- nodeTypeList.add(type);\r
- }\r
- return nodeTypeList;\r
+ public void setNodeTemplates(List<NodeTemplate> nodeTemplates) {\r
+ this.nodeTemplates = nodeTemplates;\r
}\r
\r
- public JsonObject getCapabilityTypes() {\r
- return capabilityTypes;\r
+ public SubstitutionMapping getSubstitutionMappings() {\r
+ return substitutionMappings;\r
}\r
\r
- public void setCapabilityTypes(JsonObject capabilityTypes) {\r
- this.capabilityTypes = capabilityTypes;\r
+ public void setSubstitutionMappings(SubstitutionMapping substitutionMappings) {\r
+ this.substitutionMappings = substitutionMappings;\r
}\r
\r
- public JsonObject getRelationshipTypes() {\r
- return relationshipTypes;\r
+ public class Input {\r
+ private String name;\r
+ private String type;\r
+ private String description;\r
+ private String defaultValue;\r
+ private boolean required;\r
+\r
+ public String getName() {\r
+ return name;\r
+ }\r
+\r
+ public void setName(String name) {\r
+ this.name = name;\r
+ }\r
+\r
+ public String getType() {\r
+ return type;\r
+ }\r
+\r
+ public void setType(String type) {\r
+ this.type = type;\r
+ }\r
+\r
+ public String getDescription() {\r
+ return description;\r
+ }\r
+\r
+ public void setDescription(String description) {\r
+ this.description = description;\r
+ }\r
+\r
+ public String getDefault() {\r
+ return defaultValue;\r
+ }\r
+\r
+ public void setDefault(String defaultValue) {\r
+ this.defaultValue = defaultValue;\r
+ }\r
+\r
+ public boolean isRequired() {\r
+ return required;\r
+ }\r
+\r
+ public void setRequired(boolean required) {\r
+ this.required = required;\r
+ }\r
}\r
\r
- public void setRelationshipTypes(JsonObject relationshipTypes) {\r
- this.relationshipTypes = relationshipTypes;\r
+ public class Output {\r
+ private String name;\r
+ private String description;\r
+ private Object value;\r
+\r
+ public String getName() {\r
+ return name;\r
+ }\r
+\r
+ public void setName(String name) {\r
+ this.name = name;\r
+ }\r
+\r
+ public String getDescription() {\r
+ return description;\r
+ }\r
+\r
+ public void setDescription(String description) {\r
+ this.description = description;\r
+ }\r
+\r
+ public Object getValue() {\r
+ return value;\r
+ }\r
+\r
+ public void setValue(Object value) {\r
+ this.value = value;\r
+ }\r
}\r
\r
- public List<RelationshipType> getRelationshipTypeList() {\r
- return jsonObject2RelationshipTypes(relationshipTypes);\r
+ public class NodeTemplate {\r
+ private String name;\r
+ private String nodeType;\r
+ private JsonObject properties;\r
+ private JsonObject[] requirements;\r
+ private JsonObject capabilities;\r
+ private List<Relationship> relationships;\r
+\r
+ public String getName() {\r
+ return name;\r
+ }\r
+\r
+ public void setName(String name) {\r
+ this.name = name;\r
+ }\r
+\r
+ public String getNodeType() {\r
+ return nodeType;\r
+ }\r
+\r
+ public void setNodeType(String nodeType) {\r
+ this.nodeType = nodeType;\r
+ }\r
+\r
+ public JsonObject getProperties() {\r
+ return properties;\r
+ }\r
+\r
+ public void setProperties(JsonObject properties) {\r
+ this.properties = properties;\r
+ }\r
+\r
+ public Map<String, Object> getPropertyList() {\r
+ return jsonObject2Properties(properties);\r
+ }\r
+\r
+ private Map<String, Object> jsonObject2Properties(JsonObject properties) {\r
+ Map<String, Object> ret = new HashMap<>();\r
+ Iterator<Entry<String, JsonElement>> iterator = properties.entrySet().iterator();\r
+ while (iterator.hasNext()) {\r
+ Entry<String, JsonElement> next = iterator.next();\r
+ ret.put(next.getKey(), next.getValue().getAsString());\r
+ }\r
+ return ret;\r
+ }\r
+\r
+ public JsonObject[] getRequirements() {\r
+ return requirements;\r
+ }\r
+\r
+ public void setRequirements(JsonObject[] requirements) {\r
+ this.requirements = requirements;\r
+ }\r
+\r
+ public JsonObject getCapabilities() {\r
+ return capabilities;\r
+ }\r
+\r
+ public void setCapabilities(JsonObject capabilities) {\r
+ this.capabilities = capabilities;\r
+ }\r
+\r
+ public List<Relationship> getRelationships() {\r
+ return relationships;\r
+ }\r
+\r
+ public void setRelationships(List<Relationship> relationships) {\r
+ this.relationships = relationships;\r
+ }\r
+\r
+ /**\r
+ * get scalable.\r
+ * @return NodeTemplateScalable\r
+ */\r
+ public NodeTemplateScalable getScalable() {\r
+ if (capabilities == null) {\r
+ return null;\r
+ }\r
+ JsonElement scaleableJson = capabilities.get("scalable");\r
+ if (scaleableJson == null || !scaleableJson.isJsonObject()) {\r
+ return null;\r
+ }\r
+ JsonElement propertyJson = scaleableJson.getAsJsonObject().get("properties");\r
+ if (propertyJson == null || !propertyJson.isJsonObject()) {\r
+ return null;\r
+ }\r
+\r
+ NodeTemplateScalable scalable = new NodeTemplateScalable();\r
+ scalable\r
+ .setMin_instances(propertyJson.getAsJsonObject().get("min_instances").getAsString());\r
+ scalable\r
+ .setMax_instances(propertyJson.getAsJsonObject().get("max_instances").getAsString());\r
+ scalable.setDefault_instances(\r
+ propertyJson.getAsJsonObject().get("default_instances").getAsString());\r
+ return scalable;\r
+ }\r
+\r
+ public class Relationship {\r
+ private String targetNodeName;\r
+ private String type;\r
+ private String sourceNodeName;\r
+\r
+ public String getTargetNodeName() {\r
+ return targetNodeName;\r
+ }\r
+\r
+ public void setTargetNodeName(String targetNodeName) {\r
+ this.targetNodeName = targetNodeName;\r
+ }\r
+\r
+ public String getType() {\r
+ return type;\r
+ }\r
+\r
+ public void setType(String type) {\r
+ this.type = type;\r
+ }\r
+\r
+ public String getSourceNodeName() {\r
+ return sourceNodeName;\r
+ }\r
+\r
+ public void setSourceNodeName(String sourceNodeName) {\r
+ this.sourceNodeName = sourceNodeName;\r
+ }\r
+ }\r
+\r
+ public class NodeTemplateScalable {\r
+ private String minInstances;\r
+ private String maxInstances;\r
+ private String defaultInstances;\r
+\r
+ public String getMin_instances() {\r
+ return minInstances;\r
+ }\r
+\r
+ public void setMin_instances(String minInstances) {\r
+ this.minInstances = minInstances;\r
+ }\r
+\r
+ public String getMax_instances() {\r
+ return maxInstances;\r
+ }\r
+\r
+ public void setMax_instances(String maxInstances) {\r
+ this.maxInstances = maxInstances;\r
+ }\r
+\r
+ public String getDefault_instances() {\r
+ return defaultInstances;\r
+ }\r
+\r
+ public void setDefault_instances(String defaultInstances) {\r
+ this.defaultInstances = defaultInstances;\r
+ }\r
+ }\r
}\r
\r
- /**\r
- * @param relationshipTypes\r
- * @return\r
- */\r
- private ArrayList<RelationshipType> jsonObject2RelationshipTypes(JsonObject relationshipTypes) {\r
- ArrayList<RelationshipType> relationshipTypeList = new ArrayList<RelationshipType>();\r
- Iterator<Entry<String, JsonElement>> iterator = relationshipTypes.entrySet().iterator();\r
+ public class SubstitutionMapping {\r
+ private String nodeType;\r
+ private JsonObject requirements;\r
+ private JsonObject capabilities;\r
+ private JsonObject properties;\r
+\r
+ public String getNodeType() {\r
+ return nodeType;\r
+ }\r
+\r
+ public void setNodeType(String nodeType) {\r
+ this.nodeType = nodeType;\r
+ }\r
+\r
+ public JsonObject getRequirements() {\r
+ return requirements;\r
+ }\r
+\r
+ public void setRequirements(JsonObject requirements) {\r
+ this.requirements = requirements;\r
+ }\r
+\r
+ public Map<String, String[]> getRequirementList() {\r
+ return jsonObjects2Requirements(this.requirements);\r
+ }\r
+\r
+ private Map<String, String[]> jsonObjects2Requirements(JsonObject requirements) {\r
+ Map<String, String[]> ret = new HashMap<String, String[]>();\r
+\r
+ Iterator<Entry<String, JsonElement>> iterator = requirements.entrySet().iterator();\r
+ while (iterator.hasNext()) {\r
+ Entry<String, JsonElement> next = iterator.next();\r
+ if (next.getValue().isJsonPrimitive() || next.getValue().isJsonObject()) {\r
+ ret.put(next.getKey(), new String[] {next.getValue().getAsString()});\r
+ continue;\r
+ }\r
+\r
+ if (next.getValue().isJsonArray()) {\r
+ String[] value = parseListValue((JsonArray) next.getValue());\r
+ ret.put(next.getKey(), value);\r
+ }\r
+ }\r
+\r
+ return ret;\r
+ }\r
+\r
+ private String[] parseListValue(JsonArray jsonArray) {\r
+ String[] value = new String[jsonArray.size()];\r
+ for (int i = 0, size = jsonArray.size(); i < size; i++) {\r
+ value[i] = jsonArray.get(i).getAsString();\r
+ }\r
+ return value;\r
+ }\r
+\r
+ public JsonObject getCapabilities() {\r
+ return capabilities;\r
+ }\r
+\r
+ public void setCapabilities(JsonObject capabilities) {\r
+ this.capabilities = capabilities;\r
+ }\r
+\r
+ public Map<String, String[]> getCapabilityList() {\r
+ return jsonObject2Capabilities(this.capabilities);\r
+ }\r
+\r
+ private Map<String, String[]> jsonObject2Capabilities(JsonObject capabilities) {\r
+ Map<String, String[]> ret = new HashMap<String, String[]>();\r
+\r
+ Iterator<Entry<String, JsonElement>> iterator = capabilities.entrySet().iterator();\r
while (iterator.hasNext()) {\r
- RelationshipType type = new RelationshipType();\r
- Entry<String, JsonElement> next = iterator.next();\r
- type.setType(next.getKey());\r
- type.setValue(new Gson().fromJson(next.getValue(),\r
- RelationshipType.RelationshipValue.class));\r
- relationshipTypeList.add(type);\r
+ Entry<String, JsonElement> next = iterator.next();\r
+\r
+ if (next.getValue().isJsonPrimitive() || next.getValue().isJsonObject()) {\r
+ ret.put(next.getKey(), new String[] {next.getValue().getAsString()});\r
+ continue;\r
+ }\r
+\r
+ if (next.getValue().isJsonArray()) {\r
+ String[] value = parseListValue((JsonArray) next.getValue());\r
+ ret.put(next.getKey(), value);\r
+ }\r
+ }\r
+\r
+ return ret;\r
+ }\r
+\r
+ public JsonObject getProperties() {\r
+ return properties;\r
+ }\r
+\r
+ public void setProperties(JsonObject properties) {\r
+ this.properties = properties;\r
+ }\r
+\r
+ public Map<String, Object> getPropertyList() {\r
+ return jsonObject2Properties(properties);\r
+ }\r
+\r
+ private Map<String, Object> jsonObject2Properties(JsonObject properties) {\r
+ Map<String, Object> ret = new HashMap<>();\r
+ Iterator<Entry<String, JsonElement>> iterator = properties.entrySet().iterator();\r
+ while (iterator.hasNext()) {\r
+ Entry<String, JsonElement> next = iterator.next();\r
+ ret.put(next.getKey(), next.getValue().getAsString());\r
}\r
- return relationshipTypeList;\r
+ return ret;\r
+ }\r
}\r
- \r
- public JsonObject getPolicyTypes() {\r
- return policyTypes;\r
+ }\r
+\r
+\r
+ public class RelationshipType {\r
+ private String type;\r
+ private RelationshipValue value;\r
+\r
+ public String getType() {\r
+ return type;\r
}\r
\r
- public void setPolicyTypes(JsonObject policyTypes) {\r
- this.policyTypes = policyTypes;\r
+ public void setType(String type) {\r
+ this.type = type;\r
}\r
\r
- public TopologyTemplate getTopologyTemplate() {\r
- return topologyTemplate;\r
+ public RelationshipValue getValue() {\r
+ return value;\r
}\r
\r
- public void setTopologyTemplate(TopologyTemplate topologyTemplate) {\r
- this.topologyTemplate = topologyTemplate;\r
+ public void setValue(RelationshipValue value) {\r
+ this.value = value;\r
}\r
\r
- public Map<String, String> getMetadata() {\r
- return metadata;\r
+ public class RelationshipValue {\r
+ private String derivedFrom;\r
+ private String[] validTargetTypes;\r
+\r
+ public String getDerivedFrom() {\r
+ return derivedFrom;\r
+ }\r
+\r
+ public void setDerivedFrom(String derivedFrom) {\r
+ this.derivedFrom = derivedFrom;\r
+ }\r
+\r
+ public String[] getValid_target_types() {\r
+ return validTargetTypes;\r
+ }\r
+\r
+ public void setValid_target_types(String[] validTargetTypes) {\r
+ this.validTargetTypes = validTargetTypes;\r
+ }\r
}\r
+ }\r
+\r
+\r
+ public class NodeType {\r
+ private String type;\r
+ private NodeTypeValue value;\r
\r
- public void setMetadata(Map<String, String> metadata) {\r
- this.metadata = metadata;\r
+ public String getType() {\r
+ return type;\r
}\r
\r
- public JsonObject getPlans() {\r
- return plans;\r
+ public void setType(String type) {\r
+ this.type = type;\r
}\r
\r
- public void setPlans(JsonObject plans) {\r
- this.plans = plans;\r
+ public NodeTypeValue getValue() {\r
+ return value;\r
}\r
\r
- public List<Plan> getPlanList() {\r
- return jsonObject2PlanList(this.plans);\r
+ public void setValue(NodeTypeValue value) {\r
+ this.value = value;\r
}\r
\r
- /**\r
- * @param plans\r
- * @return\r
- */\r
- private List<Plan> jsonObject2PlanList(JsonObject plans) {\r
- List<Plan> retList = new ArrayList<Plan>();\r
- Iterator<Entry<String, JsonElement>> iterator = plans.entrySet()\r
- .iterator();\r
+ public class NodeTypeValue {\r
+ private String derivedFrom;\r
+ private JsonObject properties;\r
+ private JsonObject[] requirements;\r
+ private JsonObject capabilities;\r
+\r
+ public String getDerivedFrom() {\r
+ return derivedFrom;\r
+ }\r
+\r
+ public void setDerived_from(String derivedFrom) {\r
+ this.derivedFrom = derivedFrom;\r
+ }\r
+\r
+ public JsonObject getProperties() {\r
+ return properties;\r
+ }\r
+\r
+ public void setProperties(JsonObject properties) {\r
+ this.properties = properties;\r
+ }\r
+\r
+ public List<NodeTypeProperty> getPropertyList() {\r
+ return jsonObject2Properties(properties);\r
+ }\r
+\r
+ private List<NodeTypeProperty> jsonObject2Properties(JsonObject properties) {\r
+ List<NodeTypeProperty> propertieList = new ArrayList<NodeTypeProperty>();\r
+ Iterator<Entry<String, JsonElement>> iterator = properties.entrySet().iterator();\r
while (iterator.hasNext()) {\r
- Plan ret = new Plan();\r
- Entry<String, JsonElement> next = iterator.next();\r
- ret.setName(next.getKey());\r
- ret.setValue(new Gson().fromJson(next.getValue(),\r
- Plan.PlanValue.class));\r
- retList.add(ret);\r
+ NodeTypeProperty type = new NodeTypeProperty();\r
+ Entry<String, JsonElement> next = iterator.next();\r
+ type.setKey(next.getKey());\r
+ type.setValue(new Gson().fromJson(next.getValue(), JsonObject.class));\r
+ propertieList.add(type);\r
}\r
- return retList;\r
- }\r
+ return propertieList;\r
+ }\r
\r
- public class TopologyTemplate{\r
- private String description;\r
- private List<Input> inputs;\r
- private List<NodeTemplate> nodeTemplates;\r
- private SubstitutionMapping substitutionMappings;\r
- \r
- public String getDescription() {\r
- return description;\r
- }\r
- public void setDescription(String description) {\r
- this.description = description;\r
+ public class NodeTypeProperty {\r
+ private String key;\r
+ private JsonObject value;\r
+\r
+ public String getKey() {\r
+ return key;\r
}\r
- public List<Input> getInputs() {\r
- return inputs;\r
- }\r
- public void setInputs(List<Input> inputs) {\r
- this.inputs = inputs;\r
- }\r
- public List<NodeTemplate> getNodeTemplates() {\r
- return nodeTemplates;\r
- }\r
- public void setNodeTemplates(List<NodeTemplate> nodeTemplates) {\r
- this.nodeTemplates = nodeTemplates;\r
- }\r
- public SubstitutionMapping getSubstitutionMappings() {\r
- return substitutionMappings;\r
- }\r
- public void setSubstitutionMappings(SubstitutionMapping substitutionMappings) {\r
- this.substitutionMappings = substitutionMappings;\r
- }\r
- \r
- public class Input{\r
- private String name;\r
- private String type;\r
- private String description;\r
- private String defaultValue;\r
- private boolean required;\r
-\r
- public String getName() {\r
- return name;\r
- }\r
- public void setName(String name) {\r
- this.name = name;\r
- }\r
- public String getType() {\r
- return type;\r
- }\r
- public void setType(String type) {\r
- this.type = type;\r
- }\r
- public String getDescription() {\r
- return description;\r
- }\r
- public void setDescription(String description) {\r
- this.description = description;\r
- }\r
- public String getDefault() {\r
- return defaultValue;\r
- }\r
- public void setDefault(String defaultValue) {\r
- this.defaultValue = defaultValue;\r
- }\r
- public boolean isRequired() {\r
- return required;\r
- }\r
- public void setRequired(boolean required) {\r
- this.required = required;\r
- }\r
- }\r
- \r
- public class NodeTemplate{\r
- private String name;\r
- private String nodeType;\r
- private JsonObject properties;\r
- private JsonObject[] requirements;\r
- private JsonObject capabilities;\r
- private List<Relationship> relationships;\r
- \r
- public String getName() {\r
- return name;\r
- }\r
-\r
- public void setName(String name) {\r
- this.name = name;\r
- }\r
-\r
- public String getNodeType() {\r
- return nodeType;\r
- }\r
-\r
- public void setNodeType(String nodeType) {\r
- this.nodeType = nodeType;\r
- }\r
-\r
- public JsonObject getProperties() {\r
- return properties;\r
- }\r
-\r
- public void setProperties(JsonObject properties) {\r
- this.properties = properties;\r
- }\r
-\r
- public Map<String, Object> getPropertyList() {\r
- return jsonObject2Properties(properties);\r
- }\r
-\r
- private Map<String, Object> jsonObject2Properties(\r
- JsonObject properties) {\r
- Map<String, Object> ret = new HashMap<>();\r
- Iterator<Entry<String, JsonElement>> iterator = properties\r
- .entrySet().iterator();\r
- while (iterator.hasNext()) {\r
- Entry<String, JsonElement> next = iterator.next();\r
- ret.put(next.getKey(), next.getValue().getAsString());\r
- }\r
- return ret;\r
- }\r
-\r
- public JsonObject[] getRequirements() {\r
- return requirements;\r
- }\r
-\r
- public void setRequirements(JsonObject[] requirements) {\r
- this.requirements = requirements;\r
- }\r
-\r
- public JsonObject getCapabilities() {\r
- return capabilities;\r
- }\r
-\r
- public void setCapabilities(JsonObject capabilities) {\r
- this.capabilities = capabilities;\r
- }\r
-\r
- public List<Relationship> getRelationships() {\r
- return relationships;\r
- }\r
-\r
- public void setRelationships(List<Relationship> relationships) {\r
- this.relationships = relationships;\r
- }\r
-\r
- public NodeTemplateScalable getScalable() {\r
- if(capabilities == null){\r
- return null;\r
- }\r
- JsonElement scaleableJson = capabilities.get("scalable");\r
- if (scaleableJson == null || !scaleableJson.isJsonObject()) {\r
- return null;\r
- }\r
- JsonElement propertyJson = scaleableJson.getAsJsonObject().get("properties");\r
- if (propertyJson == null || !propertyJson.isJsonObject()) {\r
- return null;\r
- }\r
-\r
- NodeTemplateScalable scalable = new NodeTemplateScalable();\r
- scalable.setMin_instances(propertyJson.getAsJsonObject().get("min_instances")\r
- .getAsString());\r
- scalable.setMax_instances(propertyJson.getAsJsonObject().get("max_instances")\r
- .getAsString());\r
- scalable.setDefault_instances(propertyJson.getAsJsonObject()\r
- .get("default_instances").getAsString());\r
- return scalable;\r
- }\r
- \r
- public class Relationship{\r
- private String targetNodeName;\r
- private String type;\r
- private String sourceNodeName;\r
-\r
- public String getTargetNodeName() {\r
- return targetNodeName;\r
- }\r
- public void setTargetNodeName(String targetNodeName) {\r
- this.targetNodeName = targetNodeName;\r
- }\r
- public String getType() {\r
- return type;\r
- }\r
- public void setType(String type) {\r
- this.type = type;\r
- }\r
- public String getSourceNodeName() {\r
- return sourceNodeName;\r
- }\r
- public void setSourceNodeName(String sourceNodeName) {\r
- this.sourceNodeName = sourceNodeName;\r
- }\r
- }\r
- \r
- public class NodeTemplateScalable{\r
- private String min_instances;\r
- private String max_instances;\r
- private String default_instances;\r
- public String getMin_instances() {\r
- return min_instances;\r
- }\r
- public void setMin_instances(String min_instances) {\r
- this.min_instances = min_instances;\r
- }\r
- public String getMax_instances() {\r
- return max_instances;\r
- }\r
- public void setMax_instances(String max_instances) {\r
- this.max_instances = max_instances;\r
- }\r
- public String getDefault_instances() {\r
- return default_instances;\r
- }\r
- public void setDefault_instances(String default_instances) {\r
- this.default_instances = default_instances;\r
- }\r
- }\r
- }\r
-\r
- public class SubstitutionMapping{\r
- private String node_type;\r
- private JsonObject[] requirements;\r
- private JsonObject capabilities;\r
- private JsonObject properties;\r
- \r
- public String getNode_type() {\r
- return node_type;\r
- }\r
-\r
- public void setNode_type(String node_type) {\r
- this.node_type = node_type;\r
- }\r
-\r
- public JsonObject[] getRequirements() {\r
- return requirements;\r
- }\r
-\r
- public void setRequirements(JsonObject[] requirements) {\r
- this.requirements = requirements;\r
- }\r
-\r
- public List<Map<String, String[]>> getRequirementList() {\r
- return jsonObjects2Requirements(this.requirements);\r
- }\r
-\r
- private List<Map<String, String[]>> jsonObjects2Requirements(\r
- JsonObject[] requirements) {\r
- List<Map<String, String[]>> retList = new ArrayList<>();\r
- for (JsonObject requirement : requirements) {\r
- Iterator<Entry<String, JsonElement>> iterator = requirement\r
- .entrySet().iterator();\r
- while (iterator.hasNext()) {\r
- Entry<String, JsonElement> next = iterator.next();\r
- Map<String, String[]> ret = new HashMap<String, String[]>();\r
- if (next.getValue().isJsonPrimitive()\r
- || next.getValue().isJsonObject()) {\r
- ret.put(next.getKey(), new String[] { next\r
- .getValue().getAsString() });\r
- retList.add(ret);\r
- continue;\r
- }\r
-\r
- if (next.getValue().isJsonArray()) {\r
- String[] value = parseListValue((JsonArray) next.getValue());\r
- ret.put(next.getKey(), value);\r
- retList.add(ret);\r
- }\r
- }\r
- }\r
-\r
- return retList;\r
- }\r
-\r
- private String[] parseListValue(JsonArray jsonArray) {\r
- String[] value = new String[jsonArray.size()];\r
- for (int i = 0, size = jsonArray.size(); i < size; i++) {\r
- value[i] = jsonArray.get(i).getAsString();\r
- }\r
- return value;\r
- }\r
-\r
- public JsonObject getCapabilities() {\r
- return capabilities;\r
- }\r
-\r
- public void setCapabilities(JsonObject capabilities) {\r
- this.capabilities = capabilities;\r
- }\r
-\r
- public Map<String, String[]> getCapabilityList() {\r
- return jsonObject2Capabilities(this.capabilities);\r
- }\r
-\r
- private Map<String, String[]> jsonObject2Capabilities(\r
- JsonObject capabilities) {\r
- Map<String, String[]> ret = new HashMap<String, String[]>();\r
-\r
- Iterator<Entry<String, JsonElement>> iterator = capabilities\r
- .entrySet().iterator();\r
- while (iterator.hasNext()) {\r
- Entry<String, JsonElement> next = iterator.next();\r
-\r
- if (next.getValue().isJsonPrimitive()\r
- || next.getValue().isJsonObject()) {\r
- ret.put(next.getKey(), new String[] { next.getValue()\r
- .getAsString() });\r
- continue;\r
- }\r
-\r
- if (next.getValue().isJsonArray()) {\r
- String[] value = parseListValue((JsonArray) next\r
- .getValue());\r
- ret.put(next.getKey(), value);\r
- }\r
- }\r
-\r
- return ret;\r
- }\r
-\r
- public JsonObject getProperties() {\r
- return properties;\r
- }\r
- \r
- public void setProperties(JsonObject properties) {\r
- this.properties = properties;\r
- }\r
- \r
- public Map<String, Object> getPropertyList() {\r
- return jsonObject2Properties(properties);\r
- }\r
-\r
- private Map<String, Object> jsonObject2Properties(\r
- JsonObject properties) {\r
- Map<String, Object> ret = new HashMap<>();\r
- Iterator<Entry<String, JsonElement>> iterator = properties.entrySet().iterator();\r
- while (iterator.hasNext()) {\r
- Entry<String, JsonElement> next = iterator.next();\r
- ret.put(next.getKey(), next.getValue().getAsString());\r
- }\r
- return ret;\r
- }\r
- }\r
- }\r
-\r
-\r
- public class RelationshipType{\r
- private String type;\r
- private RelationshipValue value;\r
- \r
- public String getType() {\r
- return type;\r
+\r
+ public void setKey(String key) {\r
+ this.key = key;\r
}\r
\r
- public void setType(String type) {\r
- this.type = type;\r
+ /**\r
+ * get default value.\r
+ * @return default value\r
+ */\r
+ public String getDefaultValue() {\r
+ JsonElement defaultValue = value.get("default");\r
+ if (defaultValue == null || defaultValue.isJsonObject()) {\r
+ return "";\r
+ }\r
+\r
+ return defaultValue.getAsString();\r
}\r
\r
- public RelationshipValue getValue() {\r
- return value;\r
+ public JsonObject getValue() {\r
+ return value;\r
}\r
\r
- public void setValue(RelationshipValue value) {\r
- this.value = value;\r
+ public void setValue(JsonObject value) {\r
+ this.value = value;\r
}\r
+ }\r
\r
- public class RelationshipValue{\r
- private String derived_from;\r
- private String[] valid_target_types;\r
+ public JsonObject[] getRequirements() {\r
+ return requirements;\r
+ }\r
\r
- public String getDerived_from() {\r
- return derived_from;\r
- }\r
+ public void setRequirements(JsonObject[] requirements) {\r
+ this.requirements = requirements;\r
+ }\r
\r
- public void setDerived_from(String derived_from) {\r
- this.derived_from = derived_from;\r
- }\r
- public String[] getValid_target_types() {\r
- return valid_target_types;\r
- }\r
- public void setValid_target_types(String[] valid_target_types) {\r
- this.valid_target_types = valid_target_types;\r
- }\r
- }\r
+ public JsonObject getCapabilities() {\r
+ return capabilities;\r
+ }\r
+\r
+ public void setCapabilities(JsonObject capabilities) {\r
+ this.capabilities = capabilities;\r
+ }\r
}\r
+ }\r
\r
+ public class Plan {\r
+ private String name;\r
+ private PlanValue value;\r
\r
- public class NodeType {\r
- private String type;\r
- private NodeTypeValue value;\r
- \r
- public String getType() {\r
- return type;\r
- }\r
+ public String getName() {\r
+ return name;\r
+ }\r
\r
- public void setType(String type) {\r
- this.type = type;\r
+ public void setName(String name) {\r
+ this.name = name;\r
+ }\r
+\r
+ public String getDescription() {\r
+ return value.getDescription();\r
+ }\r
+\r
+ public String getReference() {\r
+ return value.getReference();\r
+ }\r
+\r
+ public String getPlanLanguage() {\r
+ return value.getPlanLanguage();\r
+ }\r
+\r
+ public List<PlanValue.PlanInput> getInputList() {\r
+ return value.getInputList();\r
+ }\r
+\r
+ public PlanValue getValue() {\r
+ return value;\r
+ }\r
+\r
+ public void setValue(PlanValue value) {\r
+ this.value = value;\r
+ }\r
+\r
+ public class PlanValue {\r
+ private String description;\r
+ private String reference;\r
+ private String planLanguage;\r
+ private JsonObject inputs;\r
+\r
+ public String getDescription() {\r
+ return description;\r
+ }\r
+\r
+ public void setDescription(String description) {\r
+ this.description = description;\r
+ }\r
+\r
+ public String getReference() {\r
+ return reference;\r
+ }\r
+\r
+ public void setReference(String reference) {\r
+ this.reference = reference;\r
+ }\r
+\r
+ public String getPlanLanguage() {\r
+ return planLanguage;\r
+ }\r
+\r
+ public void setPlanLanguage(String planLanguage) {\r
+ this.planLanguage = planLanguage;\r
+ }\r
+\r
+ public JsonObject getInputs() {\r
+ return inputs;\r
+ }\r
+\r
+ public void setInputs(JsonObject inputs) {\r
+ this.inputs = inputs;\r
+ }\r
+\r
+ public List<PlanInput> getInputList() {\r
+ return jsonObject2PlanInputList(inputs);\r
+\r
+ }\r
+\r
+ private List<PlanInput> jsonObject2PlanInputList(JsonObject inputs) {\r
+ List<PlanInput> retList = new ArrayList<PlanInput>();\r
+ Iterator<Entry<String, JsonElement>> iterator = inputs.entrySet().iterator();\r
+ while (iterator.hasNext()) {\r
+ PlanInput ret = new PlanInput();\r
+ Entry<String, JsonElement> next = iterator.next();\r
+ ret.setName(next.getKey());\r
+ ret.setValue(new Gson().fromJson(next.getValue(), PlanInput.PlanInputValue.class));\r
+ retList.add(ret);\r
}\r
+ return retList;\r
+ }\r
\r
- public NodeTypeValue getValue() {\r
- return value;\r
- }\r
-\r
- public void setValue(NodeTypeValue value) {\r
- this.value = value;\r
- }\r
-\r
- public class NodeTypeValue{\r
- private String derived_from;\r
- private JsonObject properties;\r
- private JsonObject[] requirements;\r
- private JsonObject capabilities;\r
- \r
- public String getDerived_from() {\r
- return derived_from;\r
- }\r
-\r
- public void setDerived_from(String derived_from) {\r
- this.derived_from = derived_from;\r
- }\r
-\r
- public JsonObject getProperties() {\r
- return properties;\r
- }\r
-\r
- public void setProperties(JsonObject properties) {\r
- this.properties = properties;\r
- }\r
-\r
- public List<NodeTypeProperty> getPropertyList() {\r
- return jsonObject2Properties(properties);\r
- }\r
-\r
- private List<NodeTypeProperty> jsonObject2Properties(JsonObject properties) {\r
- List<NodeTypeProperty> propertieList = new ArrayList<NodeTypeProperty>();\r
- Iterator<Entry<String, JsonElement>> iterator = properties.entrySet().iterator();\r
- while (iterator.hasNext()) {\r
- NodeTypeProperty type = new NodeTypeProperty();\r
- Entry<String, JsonElement> next = iterator.next();\r
- type.setKey(next.getKey());\r
- type.setValue(new Gson().fromJson(next.getValue(),\r
- JsonObject.class));\r
- propertieList.add(type);\r
- }\r
- return propertieList;\r
- }\r
- \r
- /**\r
- * \r
- */\r
- public class NodeTypeProperty {\r
- private String key;\r
- private JsonObject value;\r
-\r
- public String getKey() {\r
- return key;\r
- }\r
-\r
- public void setKey(String key) {\r
- this.key = key;\r
- }\r
-\r
- public String getDefaultValue() {\r
- JsonElement defaultValue = value.get("default");\r
- if (defaultValue == null || defaultValue.isJsonObject()) {\r
- return "";\r
- }\r
-\r
- return defaultValue.getAsString();\r
- }\r
-\r
- public JsonObject getValue() {\r
- return value;\r
- }\r
-\r
- public void setValue(JsonObject value) {\r
- this.value = value;\r
- }\r
- }\r
-\r
- public JsonObject[] getRequirements() {\r
- return requirements;\r
- }\r
-\r
- public void setRequirements(JsonObject[] requirements) {\r
- this.requirements = requirements;\r
- }\r
-\r
- public JsonObject getCapabilities() {\r
- return capabilities;\r
- }\r
-\r
- public void setCapabilities(JsonObject capabilities) {\r
- this.capabilities = capabilities;\r
- }\r
- }\r
- }\r
-\r
- public class Plan {\r
+ public class PlanInput {\r
private String name;\r
- private PlanValue value;\r
+ private PlanInputValue value;\r
\r
public String getName() {\r
- return name;\r
+ return name;\r
}\r
+\r
public void setName(String name) {\r
- this.name = name;\r
+ this.name = name;\r
+ }\r
+\r
+ public String getType() {\r
+ return value.getType();\r
}\r
\r
public String getDescription() {\r
- return value.getDescription();\r
+ return value.getDescription();\r
}\r
- public String getReference() {\r
- return value.getReference();\r
- }\r
- public String getPlanLanguage() {\r
- return value.getPlanLanguage();\r
+\r
+ public String getDefault() {\r
+ return value.getDefaultValue();\r
}\r
\r
- public List<PlanValue.PlanInput> getInputList() {\r
- return value.getInputList();\r
- }\r
+ public boolean isRequired() {\r
+ return value.isRequired();\r
+ }\r
\r
- public PlanValue getValue() {\r
- return value;\r
- }\r
- public void setValue(PlanValue value) {\r
- this.value = value;\r
+ public PlanInputValue getValue() {\r
+ return value;\r
}\r
\r
- public class PlanValue {\r
- private String description;\r
- private String reference;\r
- private String planLanguage;\r
- private JsonObject inputs;\r
-\r
- public String getDescription() {\r
- return description;\r
- }\r
-\r
- public void setDescription(String description) {\r
- this.description = description;\r
- }\r
-\r
- public String getReference() {\r
- return reference;\r
- }\r
-\r
- public void setReference(String reference) {\r
- this.reference = reference;\r
- }\r
-\r
- public String getPlanLanguage() {\r
- return planLanguage;\r
- }\r
-\r
- public void setPlanLanguage(String planLanguage) {\r
- this.planLanguage = planLanguage;\r
- }\r
-\r
- public JsonObject getInputs() {\r
- return inputs;\r
- }\r
-\r
- public void setInputs(JsonObject inputs) {\r
- this.inputs = inputs;\r
- }\r
-\r
- public List<PlanInput> getInputList() {\r
- return jsonObject2PlanInputList(inputs);\r
+ public void setValue(PlanInputValue value) {\r
+ this.value = value;\r
+ }\r
\r
- }\r
+ public class PlanInputValue {\r
+ private String type;\r
+ private String description;\r
+ @SerializedName("default")\r
+ private String defaultValue;\r
+ private boolean required;\r
\r
- /**\r
- * @param inputs\r
- * @return\r
- */\r
- private List<PlanInput> jsonObject2PlanInputList(JsonObject inputs) {\r
- List<PlanInput> retList = new ArrayList<PlanInput>();\r
- Iterator<Entry<String, JsonElement>> iterator = inputs\r
- .entrySet().iterator();\r
- while (iterator.hasNext()) {\r
- PlanInput ret = new PlanInput();\r
- Entry<String, JsonElement> next = iterator.next();\r
- ret.setName(next.getKey());\r
- ret.setValue(new Gson().fromJson(next.getValue(),\r
- PlanInput.PlanInputValue.class));\r
- retList.add(ret);\r
- }\r
- return retList;\r
- }\r
+ public String getType() {\r
+ return type;\r
+ }\r
\r
- public class PlanInput {\r
- private String name;\r
- private PlanInputValue value;\r
+ public void setType(String type) {\r
+ this.type = type;\r
+ }\r
\r
- public String getName() {\r
- return name;\r
- }\r
- public void setName(String name) {\r
- this.name = name;\r
- }\r
+ public String getDescription() {\r
+ return description;\r
+ }\r
+\r
+ public void setDescription(String description) {\r
+ this.description = description;\r
+ }\r
\r
- public String getType() {\r
- return value.getType();\r
- }\r
+ public String getDefaultValue() {\r
+ return defaultValue;\r
+ }\r
\r
- public String getDescription() {\r
- return value.getDescription();\r
- }\r
+ public void setDefaultValue(String defaultValue) {\r
+ this.defaultValue = defaultValue;\r
+ }\r
\r
- public String getDefault() {\r
- return value.getDefault();\r
- }\r
+ public boolean isRequired() {\r
+ return required;\r
+ }\r
\r
- public boolean isRequired() {\r
- return value.isRequired();\r
- }\r
-\r
- public PlanInputValue getValue() {\r
- return value;\r
- }\r
-\r
- public void setValue(PlanInputValue value) {\r
- this.value = value;\r
- }\r
-\r
- public class PlanInputValue {\r
- private String type;\r
- private String description;\r
- private String defaultValue;\r
- private boolean required;\r
-\r
- public String getType() {\r
- return type;\r
- }\r
-\r
- public void setType(String type) {\r
- this.type = type;\r
- }\r
-\r
- public String getDescription() {\r
- return description;\r
- }\r
-\r
- public void setDescription(String description) {\r
- this.description = description;\r
- }\r
-\r
- public String getDefault() {\r
- return defaultValue;\r
- }\r
-\r
- public void setDefault(String defaultValue) {\r
- this.defaultValue = defaultValue;\r
- }\r
-\r
- public boolean isRequired() {\r
- return required;\r
- }\r
-\r
- public void setRequired(boolean required) {\r
- this.required = required;\r
- }\r
- }\r
- }\r
+ public void setRequired(boolean required) {\r
+ this.required = required;\r
+ }\r
}\r
+ }\r
}\r
+ }\r
}\r
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
+\r
package org.openo.commontosca.catalog.model.plan.wso2;\r
\r
+import org.openo.commontosca.catalog.model.plan.wso2.entity.DeletePackageResponse;\r
+import org.openo.commontosca.catalog.model.plan.wso2.entity.StartProcessRequest;\r
+import org.openo.commontosca.catalog.model.plan.wso2.entity.StartProcessResponse;\r
+\r
import javax.ws.rs.Consumes;\r
import javax.ws.rs.DELETE;\r
import javax.ws.rs.POST;\r
import javax.ws.rs.Produces;\r
import javax.ws.rs.core.MediaType;\r
\r
-import org.glassfish.jersey.media.multipart.FormDataMultiPart;\r
-import org.openo.commontosca.catalog.model.plan.wso2.entity.DeletePackageResponse;\r
-import org.openo.commontosca.catalog.model.plan.wso2.entity.DeployPackageResponse;\r
-import org.openo.commontosca.catalog.model.plan.wso2.entity.StartProcessResponse;\r
-import org.openo.commontosca.catalog.model.plan.wso2.entity.StartProcessRequest;\r
-\r
-/**\r
- * \r
- * @author 10090474\r
- * \r
- */\r
@Path("/openoapi/wso2bpel/v1")\r
-public interface IWSO2RestService {\r
- /**\r
- * @param request\r
- * @return\r
- * @throws Exception\r
- */\r
- @Path("/package")\r
- @POST\r
- @Consumes(MediaType.APPLICATION_JSON)\r
- @Produces(MediaType.APPLICATION_JSON)\r
- DeployPackageResponse deployPackage(FormDataMultiPart request) throws Exception;\r
+public interface Iwso2RestService {\r
+ // /**\r
+ // * @param request\r
+ // * @return\r
+ // * @throws Exception\r
+ // */\r
+ // @Path("/package")\r
+ // @POST\r
+ // @Consumes(MediaType.APPLICATION_JSON)\r
+ // @Produces(MediaType.APPLICATION_JSON)\r
+ // DeployPackageResponse deployPackage(FormDataMultiPart request) throws Exception;\r
\r
- @Path("/package/{packageName}")\r
- @DELETE\r
- @Consumes(MediaType.APPLICATION_JSON)\r
- @Produces(MediaType.APPLICATION_JSON)\r
- DeletePackageResponse deletePackage(\r
- @PathParam("packageName") String packageName) throws Exception;\r
+ @Path("/package/{packageName}")\r
+ @DELETE\r
+ @Consumes(MediaType.APPLICATION_JSON)\r
+ @Produces(MediaType.APPLICATION_JSON)\r
+ DeletePackageResponse deletePackage(\r
+ @PathParam("packageName") String packageName) throws Exception;\r
\r
- @Path("process/instance")\r
- @POST\r
- @Consumes(MediaType.APPLICATION_JSON)\r
- @Produces(MediaType.APPLICATION_JSON)\r
- StartProcessResponse startProcess(StartProcessRequest request)\r
- throws Exception;\r
+ @Path("process/instance")\r
+ @POST\r
+ @Consumes(MediaType.APPLICATION_JSON)\r
+ @Produces(MediaType.APPLICATION_JSON)\r
+ StartProcessResponse startProcess(StartProcessRequest request)\r
+ throws Exception;\r
}\r
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.plan.wso2;
+
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
+public class RestResponse {
+
+ private Integer statusCode;
+
+ private String result;
+}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.plan.wso2;
+
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpHost;
+import org.apache.http.HttpRequest;
+import org.apache.http.HttpResponse;
+import org.apache.http.client.methods.HttpDelete;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.client.methods.HttpPost;
+import org.apache.http.client.methods.HttpPut;
+import org.apache.http.impl.client.CloseableHttpClient;
+import org.apache.http.impl.client.HttpClients;
+import org.apache.http.util.EntityUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import java.io.IOException;
+
+public class RestfulClient {
+ private static final String HTTP = "http";
+ private static final Logger logger = LoggerFactory.getLogger(RestfulClient.class);
+
+ enum HttpMethod {
+ GET, POST, PUT, DELETE
+ }
+
+ /**
+ * execute http.
+ * @param method http method
+ * @param ip ip
+ * @param port port
+ * @param url url
+ * @param body http body
+ * @return RestResponse
+ */
+ public static RestResponse executeHttp(HttpMethod method, String ip, int port, String url,
+ HttpEntity body) {
+ CloseableHttpClient httpclient = HttpClients.createDefault();
+ HttpResponse httpResponse = null;
+ RestResponse result = new RestResponse();
+ try {
+ // specify the host, protocol, and port
+ HttpHost target = new HttpHost(ip, port, HTTP);
+ // specify the get request
+ HttpRequest request = getRequest(method, url, body);
+ httpResponse = httpclient.execute(target, request);
+ HttpEntity entity = httpResponse.getEntity();
+ if (entity != null) {
+ result.setStatusCode(httpResponse.getStatusLine().getStatusCode());
+ result.setResult(EntityUtils.toString(entity));
+ }
+ } catch (Exception e1) {
+ logger.error("send get rest request error:", e1.getMessage());
+ } finally {
+ if (httpclient != null) {
+ try {
+ httpclient.close();
+ } catch (IOException e2) {
+ logger.error("close httpclient error:", e2.getMessage());
+ }
+ }
+ }
+ return result;
+ }
+
+ private static HttpRequest getRequest(HttpMethod method, String url, HttpEntity body) {
+ HttpRequest request = null;
+ switch (method) {
+ case GET:
+ request = new HttpGet(url);
+ break;
+ case POST:
+ request = new HttpPost(url);
+ ((HttpPost) request).setEntity(body);
+ break;
+ case PUT:
+ request = new HttpPut(url);
+ ((HttpPut) request).setEntity(body);
+ break;
+ case DELETE:
+ request = new HttpDelete(url);
+ break;
+ default:
+ break;
+ }
+ return request;
+ }
+
+ public static String get(String ip, int port, String url) {
+ return executeHttp(HttpMethod.GET, ip, port, url, null).getResult();
+ }
+
+ public static RestResponse delete(String ip, int port, String url) {
+ return executeHttp(HttpMethod.GET, ip, port, url, null);
+ }
+
+ public static RestResponse post(String ip, int port, String url, HttpEntity requestBody) {
+ return executeHttp(HttpMethod.POST, ip, port, url, requestBody);
+ }
+
+}
+++ /dev/null
-/**\r
- * Copyright 2016 [ZTE] and others.\r
- *\r
- * Licensed under the Apache License, Version 2.0 (the "License");\r
- * you may not use this file except in compliance with the License.\r
- * You may obtain a copy of the License at\r
- *\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
- *\r
- * Unless required by applicable law or agreed to in writing, software\r
- * distributed under the License is distributed on an "AS IS" BASIS,\r
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- * See the License for the specific language governing permissions and\r
- * limitations under the License.\r
- */\r
-package org.openo.commontosca.catalog.model.plan.wso2;\r
-\r
-import java.util.Map;\r
-\r
-import org.glassfish.jersey.client.ClientConfig;\r
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
-import org.openo.commontosca.catalog.model.plan.wso2.entity.DeletePackageResponse;\r
-import org.openo.commontosca.catalog.model.plan.wso2.entity.StartProcessResponse;\r
-import org.openo.commontosca.catalog.model.plan.wso2.entity.DeployPackageResponse;\r
-import org.openo.commontosca.catalog.model.plan.wso2.entity.StartProcessRequest;\r
-\r
-import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
-\r
-/**\r
- * \r
- * @author 10090474\r
- * \r
- */\r
-public class WSO2ServiceConsumer {\r
- public static final String WSO2_BASE_URL = "http://localhost:9449/";\r
-\r
- /**\r
- * \r
- * @param filePath\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public static DeployPackageResponse deployPackage(String filePath)\r
- throws CatalogResourceException {\r
-\r
- // final FormDataMultiPart formData = new FormDataMultiPart();\r
- // final BodyPart bodyPart = new FormDataBodyPart(fileDetail,\r
- // uploadedInputStream, MediaType.APPLICATION_OCTET_STREAM_TYPE);\r
- // formData.bodyPart(bodyPart);\r
- // formData.setContentDisposition(fileDetail);\r
- // formData.setMediaType(MediaType.MULTIPART_FORM_DATA_TYPE);\r
- // final Client client = ClientBuilder.newBuilder()\r
- // .register(MultiPartFeature.class).build();\r
- // final WebTarget target = client.target(getPackageURL()).path(\r
- // "/containerapi/CSARs");\r
- // final Response response = target.request().post(\r
- // Entity.entity(formData, formData.getMediaType()));\r
- // return response;\r
-\r
- return null;\r
- // try {\r
- // ClientConfig config = new ClientConfig();\r
- // IWSO2RestService yamlParseProxy = ConsumerFactory\r
- // .createConsumer(MSBUtil.getYamlParseBaseUrl(), config,\r
- // IWSO2RestService.class);\r
- // String jsonStr = yamlParseProxy.parse(request);\r
- // return new Gson().fromJson(jsonStr, ParseYamlResult.class);\r
- // } catch (Exception e) {\r
- // throw new CatalogResourceException("Call parser api failed.", e);\r
- // }\r
-\r
- }\r
-\r
-\r
- /**\r
- * @param packageName\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- DeletePackageResponse deletePackage(String packageName)\r
- throws CatalogResourceException {\r
- try {\r
- ClientConfig config = new ClientConfig();\r
- IWSO2RestService wso2Proxy = ConsumerFactory.createConsumer(\r
- WSO2_BASE_URL, config, IWSO2RestService.class);\r
- DeletePackageResponse response = wso2Proxy\r
- .deletePackage(packageName);\r
- if (response.isSuccess()) {\r
- return response;\r
- }\r
- throw new CatalogResourceException(response.getException());\r
- } catch (Exception e) {\r
- throw new CatalogResourceException(\r
- "Call Delete Package api failed.", e);\r
- }\r
- }\r
-\r
-\r
- /**\r
- * @param processId\r
- * @param params\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- StartProcessResponse startProcess(String processId,\r
- Map<String, Object> params) throws CatalogResourceException {\r
- try {\r
- ClientConfig config = new ClientConfig();\r
- IWSO2RestService wso2Proxy = ConsumerFactory.createConsumer(\r
- WSO2_BASE_URL, config, IWSO2RestService.class);\r
- StartProcessResponse response = wso2Proxy\r
- .startProcess(new StartProcessRequest(processId, params));\r
- if (response.isSuccess()) {\r
- return response;\r
- }\r
- throw new CatalogResourceException(response.getException());\r
- } catch (Exception e) {\r
- throw new CatalogResourceException(\r
- "Call Start Process api failed.", e);\r
- }\r
- }\r
-\r
-}\r
--- /dev/null
+/**\r
+ * Copyright 2016 [ZTE] and others.\r
+ *\r
+ * Licensed under the Apache License, Version 2.0 (the "License");\r
+ * you may not use this file except in compliance with the License.\r
+ * You may obtain a copy of the License at\r
+ *\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
+ *\r
+ * Unless required by applicable law or agreed to in writing, software\r
+ * distributed under the License is distributed on an "AS IS" BASIS,\r
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ * See the License for the specific language governing permissions and\r
+ * limitations under the License.\r
+ */\r
+\r
+package org.openo.commontosca.catalog.model.plan.wso2;\r
+\r
+import com.google.gson.Gson;\r
+\r
+import com.eclipsesource.jaxrs.consumer.ConsumerFactory;\r
+\r
+import org.apache.http.HttpEntity;\r
+import org.apache.http.entity.ContentType;\r
+import org.apache.http.entity.mime.MultipartEntityBuilder;\r
+import org.glassfish.jersey.client.ClientConfig;\r
+import org.openo.commontosca.catalog.common.Config;\r
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
+import org.openo.commontosca.catalog.model.plan.wso2.entity.DeletePackageResponse;\r
+import org.openo.commontosca.catalog.model.plan.wso2.entity.DeployPackageResponse;\r
+import org.openo.commontosca.catalog.model.plan.wso2.entity.StartProcessRequest;\r
+import org.openo.commontosca.catalog.model.plan.wso2.entity.StartProcessResponse;\r
+import org.slf4j.Logger;\r
+import org.slf4j.LoggerFactory;\r
+\r
+import java.io.BufferedInputStream;\r
+import java.io.File;\r
+import java.io.FileInputStream;\r
+import java.io.FileNotFoundException;\r
+import java.io.IOException;\r
+import java.io.InputStream;\r
+import java.util.Map;\r
+import java.util.zip.ZipEntry;\r
+import java.util.zip.ZipFile;\r
+import java.util.zip.ZipInputStream;\r
+\r
+\r
+\r
+public class Wso2ServiceConsumer {\r
+ public static final String WSO2_APP_URL = "/openoapi/wso2bpel/v1/package";\r
+ private static final Logger LOGGER = LoggerFactory.getLogger(Wso2ServiceConsumer.class);\r
+ \r
+ /**\r
+ * deploy package.\r
+ * @param zipFileLocation zip file location\r
+ * @param planFilePath plan file path\r
+ * @return DeployPackageResponse\r
+ * @throws CatalogResourceException e1\r
+ */\r
+ public static DeployPackageResponse deployPackage(String zipFileLocation, String planFilePath)\r
+ throws CatalogResourceException {\r
+ InputStream ins = null;\r
+ try {\r
+ ins = getInputStream(zipFileLocation, planFilePath);\r
+ RestResponse res = RestfulClient.post(Config.getConfigration().getWso2HostIp(),\r
+ Integer.parseInt(Config.getConfigration().getWso2HostPort()), WSO2_APP_URL,\r
+ buildRequest(ins, planFilePath));\r
+\r
+ if (200 == res.getStatusCode() || 201 == res.getStatusCode()) {\r
+ DeployPackageResponse response =\r
+ new Gson().fromJson(res.getResult(), DeployPackageResponse.class);\r
+ if (response.isSuccess()) {\r
+ return response;\r
+ }\r
+ }\r
+\r
+ throw new CatalogResourceException(\r
+ "Deploy Package return fail. Response = " + res.getResult());\r
+ } catch (FileNotFoundException e1) {\r
+ throw new CatalogResourceException("Deploy Package failed.", e1);\r
+ } finally {\r
+ if (ins != null) {\r
+ try {\r
+ ins.close();\r
+ } catch (IOException e1) {\r
+ LOGGER.error("inputStream close failed !");\r
+ }\r
+ }\r
+ }\r
+ }\r
+\r
+ private static HttpEntity buildRequest(InputStream inputStream, String filePath)\r
+ throws FileNotFoundException {\r
+ MultipartEntityBuilder builder = MultipartEntityBuilder.create();\r
+ builder.seContentType(ContentType.MULTIPART_FORM_DATA);\r
+ builder.addBinaryBody("file", inputStream, ContentType.APPLICATION_OCTET_STREAM,\r
+ new File(filePath).getName());\r
+ return builder.build();\r
+ }\r
+\r
+ @SuppressWarnings("resource")\r
+ private static InputStream getInputStream(String zipFileLocation, String planFilePath)\r
+ throws CatalogResourceException {\r
+ ZipInputStream zin = null;\r
+ try {\r
+ InputStream in = new BufferedInputStream(new FileInputStream(zipFileLocation));\r
+ zin = new ZipInputStream(in);\r
+ ZipEntry ze;\r
+ while ((ze = zin.getNextEntry()) != null) {\r
+ if (planFilePath.equals(ze.getName())) {\r
+ ZipFile zf = new ZipFile(zipFileLocation);\r
+ return zf.getInputStream(ze);\r
+ }\r
+ }\r
+ } catch (IOException e1) {\r
+ throw new CatalogResourceException("Get InputStream failed. planFilePath = " + planFilePath,\r
+ e1);\r
+ } finally {\r
+ closeStream(zin);\r
+ }\r
+\r
+ throw new CatalogResourceException("Get InputStream failed. planFilePath = " + planFilePath);\r
+ }\r
+\r
+ private static void closeStream(ZipInputStream zin) {\r
+\r
+ if (zin != null) {\r
+ try {\r
+ zin.closeEntry();\r
+ } catch (IOException e1) {\r
+ LOGGER.error("zip inputStream close failed !");\r
+ }\r
+ }\r
+ }\r
+\r
+ /**\r
+ * delet package.\r
+ * @param packageName package to delete according packageName\r
+ * @return DeletePackageResponse\r
+ * @throws CatalogResourceException e1\r
+ */\r
+ public static DeletePackageResponse deletePackage(String packageName)\r
+ throws CatalogResourceException {\r
+ try {\r
+ ClientConfig config = new ClientConfig();\r
+ Iwso2RestService wso2Proxy = ConsumerFactory.createConsumer(\r
+ Config.getConfigration().getWso2BaseUrl(), config, Iwso2RestService.class);\r
+ DeletePackageResponse response = wso2Proxy.deletePackage(packageName);\r
+ if (response.isSuccess()) {\r
+ return response;\r
+ }\r
+ throw new CatalogResourceException(response.getException());\r
+ } catch (Exception e1) {\r
+ throw new CatalogResourceException(\r
+ "Call Delete Package api failed. packageName = " + packageName, e1);\r
+ }\r
+ }\r
+\r
+\r
+ /**\r
+ * start process.\r
+ * @param processId process id\r
+ * @param params params\r
+ * @return StartProcessResponse\r
+ * @throws CatalogResourceException e1\r
+ */\r
+ public static StartProcessResponse startProcess(String processId, Map<String, Object> params)\r
+ throws CatalogResourceException {\r
+ try {\r
+ ClientConfig config = new ClientConfig();\r
+ Iwso2RestService wso2Proxy = ConsumerFactory.createConsumer(\r
+ Config.getConfigration().getWso2BaseUrl(), config, Iwso2RestService.class);\r
+ StartProcessResponse response =\r
+ wso2Proxy.startProcess(new StartProcessRequest(processId, params));\r
+ if (response.isSuccess()) {\r
+ return response;\r
+ }\r
+ throw new CatalogResourceException(response.getException());\r
+ } catch (Exception e1) {\r
+ throw new CatalogResourceException("Call Start Process api failed.", e1);\r
+ }\r
+ }\r
+\r
+}\r
+\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.plan.wso2.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-/**
- * @author 10090474
- *
- */
@Data
@NoArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
public class DeletePackageResponse {
- private static final int STATUS_SUCCESS = 1;
+ private static final int STATUS_SUCCESS = 1;
- private int status;
- private String message;
- private String exception;
+ private int status;
+ private String message;
+ private String exception;
- public boolean isSuccess() {
- return this.status == STATUS_SUCCESS;
- }
+ public boolean isSuccess() {
+ return this.status == STATUS_SUCCESS;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.plan.wso2.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-/**
- * @author 10090474
- *
- */
@Data
@NoArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
public class DeployPackageResponse {
- private static final int STATUS_SUCCESS = 1;
+ private static final int STATUS_SUCCESS = 1;
- private int status;
- private String message;
- private String packageName;
- private String processId;
- private String exception;
+ private int status;
+ private String message;
+ private String packageName;
+ private String processId;
+ private String exception;
- public boolean isSuccess() {
- return this.status == STATUS_SUCCESS;
- }
+ public boolean isSuccess() {
+ return this.status == STATUS_SUCCESS;
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.plan.wso2.entity;
-import java.util.Map;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import java.util.Map;
-/**
- * @author 10090474
- *
- */
@Data
@NoArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
public class StartProcessRequest {
- private String processId;
- private Map<String, Object> params;
+ private String processId;
+ private Map<String, Object> params;
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.model.plan.wso2.entity;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-/**
- * @author 10090474
- *
- */
@Data
@NoArgsConstructor
@AllArgsConstructor
@JsonIgnoreProperties(ignoreUnknown = true)
public class StartProcessResponse {
- private static final int STATUS_SUCCESS = 1;
+ private static final int STATUS_SUCCESS = 1;
- private int status;
- private String message;
- private String response;
- private String exception;
+ private int status;
+ private String message;
+ private String response;
+ private String exception;
- public boolean isSuccess() {
- return this.status == STATUS_SUCCESS;
- }
+ public boolean isSuccess() {
+ return this.status == STATUS_SUCCESS;
+ }
}
--- /dev/null
+/**
+ * Copyright 2016 [ZTE] and others.
+ *
+ * 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.
+ */
+
+package org.openo.commontosca.catalog.model.service;
+
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
+import org.openo.commontosca.catalog.db.resource.TemplateManager;
+import org.openo.commontosca.catalog.model.entity.ServiceTemplate;
+import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;
+import org.openo.commontosca.catalog.model.plan.wso2.Wso2ServiceConsumer;
+import org.openo.commontosca.catalog.model.wrapper.ServiceTemplateWrapper;
+import org.openo.commontosca.catalog.resources.CatalogBadRequestException;
+
+public class ModelService {
+
+ private static final ModelService instance = new ModelService();
+
+ public static ModelService getInstance() {
+ return instance;
+ }
+
+ /**
+ * delete service template according package id.
+ * @param packageId package id
+ * @throws CatalogBadRequestException e1
+ * @throws CatalogResourceException e2
+ */
+ public void delete(String packageId) throws CatalogBadRequestException, CatalogResourceException {
+ ServiceTemplate st = ServiceTemplateWrapper.getInstance().getServiceTemplateByCsarId(packageId);
+
+ TemplateManager.getInstance().deleteServiceTemplateById(st.getServiceTemplateId());
+ TemplateManager.getInstance().deleteServiceTemplateMapping(null, st.getServiceTemplateId());
+
+ ServiceTemplateOperation[] operations = st.getOperations();
+ if (operations != null && operations.length > 0) {
+ for (ServiceTemplateOperation op : operations) {
+ Wso2ServiceConsumer.deletePackage(op.getPackageName());
+ }
+ }
+ }
+
+}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.model.wrapper;\r
\r
-import java.util.ArrayList;\r
-import java.util.Arrays;\r
-import java.util.List;\r
+package org.openo.commontosca.catalog.model.wrapper;\r
\r
-import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;\r
-import org.openo.commontosca.catalog.resources.CatalogBadRequestException;\r
import org.openo.commontosca.catalog.common.ToolUtil;\r
import org.openo.commontosca.catalog.db.entity.NodeTemplateData;\r
import org.openo.commontosca.catalog.db.entity.PackageData;\r
import org.openo.commontosca.catalog.model.entity.InputParameter;\r
import org.openo.commontosca.catalog.model.entity.NfvTemplate;\r
import org.openo.commontosca.catalog.model.entity.NodeTemplate;\r
+import org.openo.commontosca.catalog.model.entity.Parameters;\r
import org.openo.commontosca.catalog.model.entity.QueryRawDataCondition;\r
import org.openo.commontosca.catalog.model.entity.ServiceTemplate;\r
+import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;\r
import org.openo.commontosca.catalog.model.entity.ServiceTemplateRawData;\r
import org.openo.commontosca.catalog.model.entity.SubstitutionMapping;\r
+import org.openo.commontosca.catalog.resources.CatalogBadRequestException;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-/**\r
- * \r
- * @author 10090474\r
- * \r
- */\r
+import java.util.ArrayList;\r
+import java.util.Arrays;\r
+import java.util.List;\r
+\r
+\r
public class ServiceTemplateWrapper {\r
- private static ServiceTemplateWrapper instance;\r
- private static final Logger logger = LoggerFactory.getLogger(ServiceTemplateWrapper.class);\r
-\r
- public static ServiceTemplateWrapper getInstance() {\r
- if (instance == null) {\r
- instance = new ServiceTemplateWrapper();\r
- }\r
- return instance;\r
+ private static ServiceTemplateWrapper instance;\r
+ private static final Logger logger = LoggerFactory.getLogger(ServiceTemplateWrapper.class);\r
+\r
+ /**\r
+ * get service template wrapper instance.\r
+ * @return ServiceTemplateWrapper instance\r
+ */\r
+ public static ServiceTemplateWrapper getInstance() {\r
+ if (instance == null) {\r
+ instance = new ServiceTemplateWrapper();\r
}\r
-\r
- /**\r
- * \r
- * @param serviceTemplateId\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public ServiceTemplate getServiceTemplateById(String serviceTemplateId)\r
- throws CatalogResourceException {\r
- logger.info("getServiceTemplateById. serviceTemplateId = "\r
- + serviceTemplateId);\r
-\r
- List<ServiceTemplateData> stdList = TemplateManager.getInstance()\r
- .queryServiceTemplateById(serviceTemplateId);\r
- if (stdList == null || stdList.isEmpty()) {\r
- throw new CatalogResourceException("Can't find this servcie template");\r
- }\r
- \r
- return TemplateDataHelper.convert2ServiceTemplate(stdList.get(0));\r
+ return instance;\r
+ }\r
+\r
+ /**\r
+ * get service template by id.\r
+ * @param serviceTemplateId service template id\r
+ * @return service template\r
+ * @throws CatalogResourceException e1\r
+ */\r
+ public ServiceTemplate getServiceTemplateById(String serviceTemplateId)\r
+ throws CatalogResourceException {\r
+ logger.info("getServiceTemplateById. serviceTemplateId = " + serviceTemplateId);\r
+\r
+ List<ServiceTemplateData> stdList =\r
+ TemplateManager.getInstance().queryServiceTemplateById(serviceTemplateId);\r
+ if (stdList == null || stdList.isEmpty()) {\r
+ throw new CatalogResourceException("Can't find this servcie template");\r
}\r
\r
-\r
- /**\r
- * \r
- * @param status\r
- * @param deletionPending\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public ServiceTemplate[] getServiceTemplates(String status,\r
- boolean deletionPending) throws CatalogResourceException {\r
- PackageData pd = new PackageData();\r
- pd.setUsageState(status);\r
- pd.setDeletionPending(String.valueOf(deletionPending));\r
-\r
- List<ServiceTemplateData> stdList = TemplateManager.getInstance()\r
- .queryServiceTemplateByCsarPackageInfo(pd);\r
-\r
- return TemplateDataHelper.convert2ServiceTemplates(stdList);\r
+ return TemplateDataHelper.convert2ServiceTemplate(stdList.get(0));\r
+ }\r
+\r
+\r
+ /**\r
+ * get service templates.\r
+ * @param status usage status\r
+ * @param deletionPending package's deletionPending\r
+ * @return service template list\r
+ * @throws CatalogResourceException e\r
+ */\r
+ public ServiceTemplate[] getServiceTemplates(String status, boolean deletionPending)\r
+ throws CatalogResourceException {\r
+ PackageData pd = new PackageData();\r
+ pd.setUsageState(status);\r
+ pd.setDeletionPending(String.valueOf(deletionPending));\r
+\r
+ List<ServiceTemplateData> stdList =\r
+ TemplateManager.getInstance().queryServiceTemplateByCsarPackageInfo(pd);\r
+\r
+ return TemplateDataHelper.convert2ServiceTemplates(stdList);\r
+ }\r
+\r
+\r
+ /**\r
+ * get nesting service template.\r
+ * @param nodeTypeIds nodeType id list\r
+ * @return service template list\r
+ * @throws CatalogResourceException e\r
+ */\r
+ public ServiceTemplate[] getNestingServiceTemplate(String[] nodeTypeIds)\r
+ throws CatalogResourceException {\r
+ ServiceTemplate[] sts = new ServiceTemplate[nodeTypeIds.length];\r
+ for (int i = 0; i < nodeTypeIds.length; i++) {\r
+ SubstitutionMapping stm = getSubstitutionMappingsByNodeTypeId(nodeTypeIds[i]);\r
+ if (stm == null) {\r
+ sts[i] = null;\r
+ } else {\r
+ sts[i] = getServiceTemplateById(stm.getServiceTemplateId());\r
+ }\r
}\r
\r
-\r
- /**\r
- * @param nodeTypeIds\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public ServiceTemplate[] getNestingServiceTemplate(String[] nodeTypeIds)\r
- throws CatalogResourceException {\r
- ServiceTemplate[] sts = new ServiceTemplate[nodeTypeIds.length];\r
- for (int i = 0; i < nodeTypeIds.length; i++) {\r
- SubstitutionMapping stm = getSubstitutionMappingsByNodeTypeId(nodeTypeIds[i]);\r
- if (stm == null) {\r
- sts[i] = null;\r
- } else {\r
- sts[i] = getServiceTemplateById(stm.getServiceTemplateId());\r
- }\r
- }\r
-\r
- return sts;\r
+ return sts;\r
+ }\r
+\r
+ /**\r
+ * get substitution mappings by nodeTpe id.\r
+ * @param nodeTypeId nodeType id\r
+ * @return SubstitutionMapping\r
+ * @throws CatalogResourceException e\r
+ */\r
+ private SubstitutionMapping getSubstitutionMappingsByNodeTypeId(String nodeTypeId)\r
+ throws CatalogResourceException {\r
+ List<ServiceTemplateMappingData> stmDataList =\r
+ TemplateManager.getInstance().queryServiceTemplateMapping(nodeTypeId, null);\r
+ if (stmDataList == null || stmDataList.isEmpty()) {\r
+ return null;\r
}\r
\r
- /**\r
- * @param nodeTypeId\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- private SubstitutionMapping getSubstitutionMappingsByNodeTypeId(\r
- String nodeTypeId) throws CatalogResourceException {\r
- List<ServiceTemplateMappingData> stmDataList = TemplateManager\r
- .getInstance().queryServiceTemplateMapping(nodeTypeId, null);\r
- if (stmDataList == null || stmDataList.isEmpty()) {\r
- return null;\r
- }\r
-\r
- return TemplateDataHelper.convert2SubstitutionMapping(stmDataList\r
- .get(0));\r
+ return TemplateDataHelper.convert2SubstitutionMapping(stmDataList.get(0));\r
+ }\r
+\r
+\r
+ /**\r
+ * get service template raw data.\r
+ * @param queryCondition query raw data condition\r
+ * @return ServiceTemplateRawData\r
+ * @throws CatalogResourceException e1\r
+ * @throws CatalogBadRequestException e2\r
+ */\r
+ public ServiceTemplateRawData getServiceTemplateRawData(QueryRawDataCondition queryCondition)\r
+ throws CatalogResourceException, CatalogBadRequestException {\r
+ ServiceTemplateData std = getServiceTemplateDataByCsarId(queryCondition.getCsarId());\r
+ return new ServiceTemplateRawData(std.getRowData());\r
+ }\r
+\r
+ /**\r
+ * get service template data by package id.\r
+ * @param csarId package id\r
+ * @return ServiceTemplateData\r
+ * @throws CatalogBadRequestException e1\r
+ * @throws CatalogResourceException e2\r
+ */\r
+ private ServiceTemplateData getServiceTemplateDataByCsarId(String csarId)\r
+ throws CatalogBadRequestException, CatalogResourceException {\r
+ if (ToolUtil.isTrimedEmptyString(csarId)) {\r
+ throw new CatalogBadRequestException("CsarId is null.");\r
}\r
+ PackageData pd = new PackageData();\r
+ pd.setCsarId(csarId);\r
\r
+ List<ServiceTemplateData> stdList =\r
+ TemplateManager.getInstance().queryServiceTemplateByCsarPackageInfo(pd);\r
\r
- /**\r
- * @param queryCondition\r
- * @return\r
- * @throws CatalogResourceException\r
- * @throws CatalogBadRequestException\r
- */\r
- public ServiceTemplateRawData getServiceTemplateRawData(\r
- QueryRawDataCondition queryCondition)\r
- throws CatalogResourceException, CatalogBadRequestException {\r
- if (ToolUtil.isTrimedEmptyString(queryCondition.getCsarId())) {\r
- throw new CatalogBadRequestException("CsarId is null.");\r
- }\r
- PackageData pd = new PackageData();\r
- pd.setCsarId(queryCondition.getCsarId());\r
-\r
- List<ServiceTemplateData> stdList = TemplateManager.getInstance()\r
- .queryServiceTemplateByCsarPackageInfo(pd);\r
-\r
- if (stdList == null || stdList.isEmpty()) {\r
- throw new CatalogResourceException(\r
- "Can't find this servcie template");\r
- }\r
-\r
- return new ServiceTemplateRawData(stdList.get(0).getRowData());\r
+ if (stdList == null || stdList.isEmpty()) {\r
+ throw new CatalogResourceException("Can't find this servcie template");\r
}\r
\r
- /**\r
- * \r
- * @param serviceTemplateId\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public InputParameter[] getServiceTemplateParameters(\r
- String serviceTemplateId) throws CatalogResourceException {\r
- ServiceTemplate st = getServiceTemplateById(serviceTemplateId);\r
- return st.getInputs();\r
+ return stdList.get(0);\r
+ }\r
+\r
+ /**\r
+ * get service template by package id.\r
+ * @param packageId package id\r
+ * @return service template data\r
+ * @throws CatalogBadRequestException e1\r
+ * @throws CatalogResourceException e2\r
+ */\r
+ public ServiceTemplate getServiceTemplateByCsarId(String packageId)\r
+ throws CatalogBadRequestException, CatalogResourceException {\r
+ ServiceTemplateData std = getServiceTemplateDataByCsarId(packageId);\r
+ ServiceTemplate st = TemplateDataHelper.convert2ServiceTemplate(std);\r
+ return st;\r
+ }\r
+\r
+ /**\r
+ * get service template parameters.\r
+ * @param serviceTemplateId service template id\r
+ * @return service template parameters\r
+ * @throws CatalogResourceException e\r
+ */\r
+ public Parameters getServiceTemplateParameters(String serviceTemplateId)\r
+ throws CatalogResourceException {\r
+ ServiceTemplate st = getServiceTemplateById(serviceTemplateId);\r
+ return new Parameters(st.getInputs(), st.getOutputs());\r
+ }\r
+\r
+ /**\r
+ * get template operation.\r
+ * @param serviceTemplateId service template id\r
+ * @return service template operations\r
+ */\r
+ public ServiceTemplateOperation[] getTemplateOperations(String serviceTemplateId)\r
+ throws CatalogResourceException {\r
+ ServiceTemplate st = getServiceTemplateById(serviceTemplateId);\r
+\r
+ if (st.getOperations() == null) {\r
+ return new ServiceTemplateOperation[0];\r
}\r
-\r
- /**\r
- * \r
- * @param serviceTemplateId\r
- * @return\r
- */\r
- public ServiceTemplateOperation[] getTemplateOperations(\r
- String serviceTemplateId) throws CatalogResourceException {\r
- ServiceTemplate st = getServiceTemplateById(serviceTemplateId);\r
-\r
- if (st.getOperations() == null) {\r
- return new ServiceTemplateOperation[0];\r
- }\r
- return st.getOperations();\r
+ return st.getOperations();\r
+ }\r
+\r
+ /**\r
+ * get parameters by operation name.\r
+ * @param serviceTemplateId service template id\r
+ * @param operationName operation name\r
+ * @return InputParameter list\r
+ * @throws CatalogResourceException e\r
+ */\r
+ public InputParameter[] getParametersByOperationName(String serviceTemplateId,\r
+ String operationName) throws CatalogResourceException {\r
+ if (ToolUtil.isTrimedEmptyString(operationName)) {\r
+ throw new CatalogResourceException("Operation Name is null.");\r
}\r
\r
- /**\r
- * @param serviceTemplateId\r
- * @param operationName\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public InputParameter[] getParametersByOperationName(\r
- String serviceTemplateId, String operationName)\r
- throws CatalogResourceException {\r
- if (ToolUtil.isTrimedEmptyString(operationName)) {\r
- throw new CatalogResourceException("Operation Name is null.");\r
- }\r
-\r
- ServiceTemplateOperation[] operations = getTemplateOperations(serviceTemplateId);\r
- for (int i = 0; i < operations.length; i++) {\r
- if (operationName.equals(operations[i].getName())) {\r
- return operations[i].getInputs();\r
- }\r
- }\r
-\r
- throw new CatalogResourceException("Can't find this operation.");\r
+ ServiceTemplateOperation[] operations = getTemplateOperations(serviceTemplateId);\r
+ for (int i = 0; i < operations.length; i++) {\r
+ if (operationName.equals(operations[i].getName())) {\r
+ return operations[i].getInputs();\r
+ }\r
}\r
\r
+ throw new CatalogResourceException("Can't find this operation.");\r
+ }\r
\r
- /**\r
- * @param serviceTemplateId\r
- * @param nodeTemplateId\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public NodeTemplate getNodeTemplateById(String serviceTemplateId,\r
- String nodeTemplateId) throws CatalogResourceException {\r
- List<NodeTemplateData> ntdList = TemplateManager.getInstance()\r
- .queryNodeTemplateById(serviceTemplateId, nodeTemplateId);\r
\r
- if (ntdList == null || ntdList.isEmpty()) {\r
- throw new CatalogResourceException("Can't find this node template.");\r
- }\r
+ /**\r
+ * get nodeTemplate by id.\r
+ * @param serviceTemplateId service template id\r
+ * @param nodeTemplateId node template id\r
+ * @return NodeTemplate\r
+ * @throws CatalogResourceException e1\r
+ */\r
+ public NodeTemplate getNodeTemplateById(String serviceTemplateId, String nodeTemplateId)\r
+ throws CatalogResourceException {\r
+ List<NodeTemplateData> ntdList =\r
+ TemplateManager.getInstance().queryNodeTemplateById(serviceTemplateId, nodeTemplateId);\r
\r
- return TemplateDataHelper.convert2NodeTemplate(ntdList.get(0));\r
+ if (ntdList == null || ntdList.isEmpty()) {\r
+ throw new CatalogResourceException("Can't find this node template.");\r
}\r
\r
- /**\r
- * @param serviceTemplateId\r
- * @param types\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public NodeTemplate[] getNodeTemplates(String serviceTemplateId,\r
- String[] types) throws CatalogResourceException {\r
- List<NodeTemplateData> ntdList = TemplateManager.getInstance()\r
- .queryNodeTemplateBySeriviceTemplateId(serviceTemplateId);\r
- if (ntdList == null || ntdList.isEmpty()) {\r
- return new NodeTemplate[0];\r
- }\r
-\r
- if (ToolUtil.isTrimedEmptyArray(types)) { // return all node templates\r
- return TemplateDataHelper.convert2NodeTemplates(ntdList);\r
- }\r
-\r
- List<NodeTemplate> ntList = new ArrayList<>();\r
- for (String type : types) {\r
- if (!ToolUtil.isTrimedEmptyString(type)) {\r
- List<NodeTemplateData> typedNtdList = filterNodeTemplateDataListByType(\r
- ntdList, type);\r
- ntList.addAll(Arrays\r
-.asList(TemplateDataHelper\r
- .convert2NodeTemplates(typedNtdList)));\r
- }\r
- }\r
- return ntList.toArray(new NodeTemplate[0]);\r
+ return TemplateDataHelper.convert2NodeTemplate(ntdList.get(0));\r
+ }\r
+\r
+ /**\r
+ * get node templates.\r
+ * @param serviceTemplateId service template id\r
+ * @param types type list\r
+ * @return NodeTemplate list\r
+ * @throws CatalogResourceException e\r
+ */\r
+ public NodeTemplate[] getNodeTemplates(String serviceTemplateId, String[] types)\r
+ throws CatalogResourceException {\r
+ List<NodeTemplateData> ntdList =\r
+ TemplateManager.getInstance().queryNodeTemplateBySeriviceTemplateId(serviceTemplateId);\r
+ if (ntdList == null || ntdList.isEmpty()) {\r
+ return new NodeTemplate[0];\r
}\r
\r
- /**\r
- * @param ntdList\r
- * @param type\r
- * @return\r
- */\r
- private List<NodeTemplateData> filterNodeTemplateDataListByType(\r
- List<NodeTemplateData> ntdList, String type) {\r
- List<NodeTemplateData> retList = new ArrayList<>();\r
- for (NodeTemplateData ntd : ntdList) {\r
- if (type.equals(ntd.getType())) {\r
- retList.add(ntd);\r
- }\r
- }\r
- return retList;\r
+ if (ToolUtil.isTrimedEmptyArray(types)) { // return all node templates\r
+ return TemplateDataHelper.convert2NodeTemplates(ntdList);\r
}\r
\r
-\r
- /**\r
- * @param serviceTemlateId\r
- * @return\r
- * @throws CatalogResourceException\r
- */\r
- public NfvTemplate getNfvTemplate(String serviceTemlateId)\r
- throws CatalogResourceException {\r
- NodeTemplate[] nts = getNodeTemplates(serviceTemlateId, null);\r
-\r
- List<NodeTemplate> vduNodes = new ArrayList<>();\r
- List<NodeTemplate> networkNodes = new ArrayList<>();\r
- List<NodeTemplate> vnfcNodes = new ArrayList<>();\r
- List<NodeTemplate> vnfNodes = new ArrayList<>();\r
- for (NodeTemplate nt : nts) {\r
- if (isVduNode(nt.getType())) {\r
- vduNodes.add(nt);\r
- continue;\r
- }\r
-\r
- if (isNetworkNode(nt.getType())) {\r
- networkNodes.add(nt);\r
- continue;\r
- }\r
- \r
- if (isVnfcNode(nt.getType())) {\r
- vnfcNodes.add(nt);\r
- continue;\r
- }\r
- \r
- if (isVnfNode(nt.getType())) {\r
- vnfNodes.add(nt);\r
- continue;\r
- }\r
- }\r
- \r
- return new NfvTemplate(vduNodes, networkNodes, vnfcNodes, vnfNodes);\r
+ List<NodeTemplate> ntList = new ArrayList<>();\r
+ for (String type : types) {\r
+ if (!ToolUtil.isTrimedEmptyString(type)) {\r
+ List<NodeTemplateData> typedNtdList = filterNodeTemplateDataListByType(ntdList, type);\r
+ ntList.addAll(Arrays.asList(TemplateDataHelper.convert2NodeTemplates(typedNtdList)));\r
+ }\r
}\r
-\r
- /**\r
- * @param type\r
- * @return\r
- */\r
- private boolean isVnfNode(String type) {\r
- return type.toUpperCase().indexOf(".VNF") > 0;\r
+ return ntList.toArray(new NodeTemplate[0]);\r
+ }\r
+\r
+ /**\r
+ * filter node template data list by type.\r
+ * @param ntdList nodeTemplate list\r
+ * @param type node type\r
+ * @return node template data list\r
+ */\r
+ private List<NodeTemplateData> filterNodeTemplateDataListByType(List<NodeTemplateData> ntdList,\r
+ String type) {\r
+ List<NodeTemplateData> retList = new ArrayList<>();\r
+ for (NodeTemplateData ntd : ntdList) {\r
+ if (type.equals(ntd.getType())) {\r
+ retList.add(ntd);\r
+ }\r
}\r
-\r
- /**\r
- * @param type\r
- * @return\r
- */\r
- private boolean isVnfcNode(String type) {\r
- return type.toUpperCase().indexOf(".VNFC") > 0;\r
+ return retList;\r
+ }\r
+\r
+\r
+ /**\r
+ * get nfv template.\r
+ * @param serviceTemlateId service template id\r
+ * @return NfvTemplate\r
+ * @throws CatalogResourceException e\r
+ */\r
+ public NfvTemplate getNfvTemplate(String serviceTemlateId) throws CatalogResourceException {\r
+ NodeTemplate[] nts = getNodeTemplates(serviceTemlateId, null);\r
+\r
+ List<NodeTemplate> vduNodes = new ArrayList<>();\r
+ List<NodeTemplate> networkNodes = new ArrayList<>();\r
+ List<NodeTemplate> vnfcNodes = new ArrayList<>();\r
+ List<NodeTemplate> vnfNodes = new ArrayList<>();\r
+ for (NodeTemplate nt : nts) {\r
+ if (isVduNode(nt.getType())) {\r
+ vduNodes.add(nt);\r
+ continue;\r
+ }\r
+\r
+ if (isNetworkNode(nt.getType())) {\r
+ networkNodes.add(nt);\r
+ continue;\r
+ }\r
+\r
+ if (isVnfcNode(nt.getType())) {\r
+ vnfcNodes.add(nt);\r
+ continue;\r
+ }\r
+\r
+ if (isVnfNode(nt.getType())) {\r
+ vnfNodes.add(nt);\r
+ continue;\r
+ }\r
}\r
\r
- /**\r
- * @param type\r
- * @return\r
- */\r
- private boolean isNetworkNode(String type) {\r
- return type.toUpperCase().indexOf(".VL") > 0\r
- || type.toUpperCase().indexOf(".VIRTUALLINK") > 0;\r
- }\r
+ return new NfvTemplate(vduNodes, networkNodes, vnfcNodes, vnfNodes);\r
+ }\r
\r
- /**\r
- * @param type\r
- * @return\r
- */\r
- private boolean isVduNode(String type) {\r
- return type.toUpperCase().indexOf(".VDU") > 0;\r
- }\r
+ private boolean isVnfNode(String type) {\r
+ return type.toUpperCase().indexOf(".VNF") > 0;\r
+ }\r
+\r
+ private boolean isVnfcNode(String type) {\r
+ return type.toUpperCase().indexOf(".VNFC") > 0;\r
+ }\r
+\r
+ private boolean isNetworkNode(String type) {\r
+ return type.toUpperCase().indexOf(".VL") > 0 || type.toUpperCase().indexOf(".VIRTUALLINK") > 0;\r
+ }\r
+\r
+ private boolean isVduNode(String type) {\r
+ return type.toUpperCase().indexOf(".VDU") > 0;\r
+ }\r
\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.resources;
import org.openo.commontosca.catalog.db.exception.ErrorCodeException;
-/**
- *
- */
public class CatalogBadRequestException extends ErrorCodeException {
- private static final long serialVersionUID = 5699508780537383310L;
+ private static final long serialVersionUID = 5699508780537383310L;
- public CatalogBadRequestException(int errcode) {
- super(errcode, "");
- }
+ public CatalogBadRequestException(int errcode) {
+ super(errcode, "");
+ }
- public CatalogBadRequestException(int errcode, Throwable cause) {
- super(cause, errcode);
- }
+ public CatalogBadRequestException(int errcode, Throwable cause) {
+ super(cause, errcode);
+ }
- public CatalogBadRequestException(int errcode, String message, Throwable cause) {
- super(cause, errcode, message);
- }
+ public CatalogBadRequestException(int errcode, String message, Throwable cause) {
+ super(cause, errcode, message);
+ }
- public CatalogBadRequestException() {
- super(9999999, null);
- }
+ public CatalogBadRequestException() {
+ super(9999999, null);
+ }
- public CatalogBadRequestException(String message) {
- super(9999999, message);
- }
+ public CatalogBadRequestException(String message) {
+ super(9999999, message);
+ }
- public CatalogBadRequestException(Throwable cause) {
- super(cause, 9999999);
- }
+ public CatalogBadRequestException(Throwable cause) {
+ super(cause, 9999999);
+ }
- public CatalogBadRequestException(String message, Throwable cause) {
- super(cause, 9999999, message);
- }
+ public CatalogBadRequestException(String message, Throwable cause) {
+ super(cause, 9999999, message);
+ }
- public CatalogBadRequestException(Throwable source, int errID, String debugMessage,
- String[] arguments) {
- super(source, errID, debugMessage, arguments);
- }
+ public CatalogBadRequestException(Throwable source, int errId, String debugMessage,
+ String[] arguments) {
+ super(source, errId, debugMessage, arguments);
+ }
- public CatalogBadRequestException(Throwable source, int category, int code,
- String debugMessage, String[] arguments) {
- super(source, category, code, debugMessage, arguments);
- }
+ public CatalogBadRequestException(Throwable source, int category, int code, String debugMessage,
+ String[] arguments) {
+ super(source, category, code, debugMessage, arguments);
+ }
- public int getErrcode() {
- return super.getErrorCode();
- }
+ public int getErrcode() {
+ return super.getErrorCode();
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.resources;
+import com.codahale.metrics.annotation.Timed;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import java.io.InputStream;
+import org.eclipse.jetty.http.HttpStatus;
+import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
+import org.glassfish.jersey.media.multipart.FormDataParam;
+import org.openo.commontosca.catalog.entity.response.CsarFileUriResponse;
+import org.openo.commontosca.catalog.entity.response.PackageMeta;
+import org.openo.commontosca.catalog.entity.response.UploadPackageResponse;
+import org.openo.commontosca.catalog.wrapper.PackageWrapper;
+import java.io.InputStream;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
import javax.ws.rs.GET;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import org.eclipse.jetty.http.HttpStatus;
-import org.glassfish.jersey.media.multipart.FormDataContentDisposition;
-import org.glassfish.jersey.media.multipart.FormDataParam;
-import org.openo.commontosca.catalog.entity.response.UploadPackageResponse;
-import org.openo.commontosca.catalog.wrapper.PackageWrapper;
-import org.openo.commontosca.catalog.entity.response.CsarFileUriResponse;
-import org.openo.commontosca.catalog.entity.response.PackageMeta;
-
-import com.codahale.metrics.annotation.Timed;
-
/**
* csar package service.
*
@Api(tags = {"Package Resource"})
public class PackageResource {
- @Path("/csars")
- @GET
- @ApiOperation(value = "get csar package list by condition", response = PackageMeta.class,
- responseContainer = "List")
- @Produces(MediaType.APPLICATION_JSON)
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "resource grant error", response = String.class)})
- @Timed
- public Response queryPackageListByCond(
- @ApiParam(value = "csar name") @QueryParam("name") String name,
- @ApiParam(value = "csar provider") @QueryParam("provider") String provider,
- @ApiParam(value = "csar version") @QueryParam("version") String version,
- @ApiParam(value = "delay to delete") @QueryParam("deletionPending") String deletionPending,
- @ApiParam(value = "csar type") @QueryParam("type") String type) {
- return PackageWrapper.getInstance().queryPackageListByCond(name, provider, version,
- deletionPending, type);
- }
-
-
- /**
- * query CSAR package infos
- *
- * @param csarName The CSAR name. it will return all the CSARs if the csarName is null.
- * @param deletionPending
- * @return
- */
- @Path("/csars/{csarId}")
- @GET
- @ApiOperation(value = "get csar package list", response = PackageMeta.class,
- responseContainer = "List")
- @Produces(MediaType.APPLICATION_JSON)
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "resource grant error", response = String.class)})
- @Timed
- public Response queryPackageById(@ApiParam(value = "csar id") @PathParam("csarId") String csarId) {
- return PackageWrapper.getInstance().queryPackageById(csarId);
- }
-
- /**
- * upload CSAR package with stream
- *
- * @param uploadedInputStream
- * @param fileDetail
- * @return
- * @throws Exception
- */
- // @Path("/csars/ftp")
- // @POST
- // @ApiOperation(value = "upload csar package", response = UploadPackageResponse.class)
- // @Consumes(MediaType.APPLICATION_JSON)
- // @Produces(MediaType.APPLICATION_JSON)
- // @ApiResponses(value = {
- // @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response =
- // String.class),
- // @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, message =
- // "Unprocessable MicroServiceInfo Entity ", response = String.class),
- // @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
- // response = String.class)})
- // @Timed
- // public Response uploadPackageFromFtp(UploadPackageFromFtpRequest request) throws Exception {
- // return PackageWrapper.getInstance().uploadPackageFromFtp(request);
- // }
-
- /**
- * upload CSAR package from ftp
- *
- * @param uploadedInputStream
- * @param fileDetail
- * @return
- * @throws Exception
- */
- @Path("/csars")
- @POST
- @ApiOperation(value = "upload csar package", response = UploadPackageResponse.class)
- @Consumes(MediaType.MULTIPART_FORM_DATA)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "resource grant error", response = String.class)})
- @Timed
- public Response uploadPackage(
- @ApiParam(value = "file inputstream", required = true) @FormDataParam("file") InputStream uploadedInputStream,
- @ApiParam(value = "file detail", required = false) @FormDataParam("file") FormDataContentDisposition fileDetail,
- @ApiParam(value = "http header") @Context HttpHeaders head) throws Exception {
- return PackageWrapper.getInstance().uploadPackage(uploadedInputStream, fileDetail, head);
- }
-
- /**
- * delete CSAR package
- *
- * @param csarName
- * @return
- */
- @Path("/csars/{csarId}")
- @DELETE
- @ApiOperation(value = "delete a package")
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "resource grant error", response = String.class)})
- @Timed
- public Response delPackage(@ApiParam(value = "csar Id") @PathParam("csarId") String csarId) {
- return PackageWrapper.getInstance().delPackage(csarId);
- }
-
- /**
- * delete CSAR package by VNF/NS instance template id
- */
- // @Path("/csars")
- // @DELETE
- // @ApiOperation(value = "delete a package by serviceTemplateId")
- // @ApiResponses(value = {
- // @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response =
- // String.class),
- // @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, message =
- // "Unprocessable MicroServiceInfo Entity ", response = String.class),
- // @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
- // response = String.class)})
- // @Timed
- // public Response delPackageByServiceTemplateId(
- // @ApiParam(value = "serviceTemplateId") @QueryParam("serviceTemplateId") String
- // serviceTemplateId) {
- // return PackageWrapper.getInstance().delPackageByServiceTemplateId(serviceTemplateId);
- // }
-
- /**
- * update the status of CSAR
- *
- * @param csarName
- * @param status active/inactive
- * @return
- */
- @Path("/csars/{csarId}")
- @PUT
- @ApiOperation(value = "update csar package status")
- @Produces(MediaType.APPLICATION_JSON)
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "resource grant error", response = String.class)})
- @Timed
- public Response updatePackageStatus(
- @ApiParam(value = "csar Id", required = true) @PathParam("csarId") String csarId,
- @ApiParam(value = "csar operational status", required = false) @QueryParam("operationalState") String operationalState,
- @ApiParam(value = "csar usage status", required = false) @QueryParam("usageState") String usageState,
- @ApiParam(value = "csar onboard status", required = false) @QueryParam("onBoardState") String onBoardState,
- @ApiParam(value = "csar process status", required = false) @QueryParam("processState") String processState,
- @ApiParam(value = "csar deletionPending status", required = false) @QueryParam("deletionPending") String deletionPending) {
- return PackageWrapper.getInstance().updatePackageStatus(csarId, operationalState,
- usageState, onBoardState, processState, deletionPending);
- }
-
- @Path("/csars/{csarId}/files")
- @GET
- @ApiOperation(value = "get csar file uri by csarId", response = CsarFileUriResponse.class)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "resource grant error", response = String.class)})
- @Timed
- public Response getCsarFileUri(
- @ApiParam(value = "csar Id", required = true) @PathParam("csarId") String csarId,
- @ApiParam(value = "csar file path", required = true) @QueryParam("relativePath") String relativePath) {
- return PackageWrapper.getInstance().getCsarFileUri(csarId, relativePath);
- }
-
- // @Path("/csars/{csarId}/plans")
- // @GET
- // @ApiOperation(value = "get plans of package by csarId", response = FileLink.class,
- // responseContainer = "List")
- // @Produces(MediaType.APPLICATION_JSON)
- // @ApiResponses(value = {
- // @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response =
- // String.class),
- // @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, message =
- // "Unprocessable MicroServiceInfo Entity ", response = String.class),
- // @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
- // response = String.class)})
- // @Timed
- // public Response getCsarPlanUri(
- // @ApiParam(value = "csar Id", required = true) @PathParam("csarId") String csarId
- // ) {
- // return PackageWrapper.getInstance().getCsarPlansUri(csarId);
- // }
+ @Path("/csars")
+ @GET
+ @ApiOperation(value = "get csar package list by condition", response = PackageMeta.class,
+ responseContainer = "List")
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
+ response = String.class)})
+ @Timed
+ public Response queryPackageListByCond(
+ @ApiParam(value = "csar name") @QueryParam("name") String name, @ApiParam(
+ value = "csar provider") @QueryParam("provider") String provider, @ApiParam(
+ value = "csar version") @QueryParam("version") String version, @ApiParam(
+ value = "delay to delete") @QueryParam("deletionPending") String deletionPending,
+ @ApiParam(value = "csar type") @QueryParam("type") String type) {
+ return PackageWrapper.getInstance().queryPackageListByCond(name, provider, version,
+ deletionPending, type);
+ }
+
+
+ @Path("/csars/{csarId}")
+ @GET
+ @ApiOperation(value = "get csar package list", response = PackageMeta.class,
+ responseContainer = "List")
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
+ response = String.class)})
+ @Timed
+ public Response queryPackageById(
+ @ApiParam(value = "csar id") @PathParam("csarId") String csarId) {
+ return PackageWrapper.getInstance().queryPackageById(csarId);
+ }
+
+ // @Path("/csars/ftp")
+ // @POST
+ // @ApiOperation(value = "upload csar package", response = UploadPackageResponse.class)
+ // @Consumes(MediaType.APPLICATION_JSON)
+ // @Produces(MediaType.APPLICATION_JSON)
+ // @ApiResponses(value = {
+ // @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response =
+ // String.class),
+ // @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, message =
+ // "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ // @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
+ // response = String.class)})
+ // @Timed
+ // public Response uploadPackageFromFtp(UploadPackageFromFtpRequest request) throws Exception {
+ // return PackageWrapper.getInstance().uploadPackageFromFtp(request);
+ // }
+
+ @Path("/csars")
+ @POST
+ @ApiOperation(value = "upload csar package", response = UploadPackageResponse.class)
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
+ response = String.class)})
+ @Timed
+ public Response uploadPackage(
+ @ApiParam(value = "file inputstream",
+ required = true) @FormDataParam("file") InputStream uploadedInputStream,
+ @ApiParam(value = "file detail",
+ required = false) @FormDataParam("file") FormDataContentDisposition fileDetail,
+ @ApiParam(value = "http header") @Context HttpHeaders head) throws Exception {
+ return PackageWrapper.getInstance().uploadPackage(uploadedInputStream, fileDetail, head);
+ }
+
+ @Path("/csars/{csarId}")
+ @DELETE
+ @ApiOperation(value = "delete a package")
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
+ response = String.class)})
+ @Timed
+ public Response delPackage(@ApiParam(value = "csar Id") @PathParam("csarId") String csarId) {
+ return PackageWrapper.getInstance().delPackage(csarId);
+ }
+
+ // @Path("/csars")
+ // @DELETE
+ // @ApiOperation(value = "delete a package by serviceTemplateId")
+ // @ApiResponses(value = {
+ // @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response =
+ // String.class),
+ // @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, message =
+ // "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ // @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
+ // response = String.class)})
+ // @Timed
+ // public Response delPackageByServiceTemplateId(
+ // @ApiParam(value = "serviceTemplateId") @QueryParam("serviceTemplateId") String
+ // serviceTemplateId) {
+ // return PackageWrapper.getInstance().delPackageByServiceTemplateId(serviceTemplateId);
+ // }
+
+ @Path("/csars/{csarId}")
+ @PUT
+ @ApiOperation(value = "update csar package status")
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
+ response = String.class)})
+ @Timed
+ public Response updatePackageStatus(
+ @ApiParam(value = "csar Id", required = true) @PathParam("csarId") String csarId,
+ @ApiParam(value = "csar operational status",
+ required = false) @QueryParam("operationalState") String operationalState,
+ @ApiParam(value = "csar usage status",
+ required = false) @QueryParam("usageState") String usageState,
+ @ApiParam(value = "csar onboard status",
+ required = false) @QueryParam("onBoardState") String onBoardState,
+ @ApiParam(value = "csar process status",
+ required = false) @QueryParam("processState") String processState,
+ @ApiParam(value = "csar deletionPending status",
+ required = false) @QueryParam("deletionPending") String deletionPending) {
+ return PackageWrapper.getInstance().updatePackageStatus(csarId, operationalState, usageState,
+ onBoardState, processState, deletionPending);
+ }
+
+ @Path("/csars/{csarId}/files")
+ @GET
+ @ApiOperation(value = "get csar file uri by csarId", response = CsarFileUriResponse.class)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
+ response = String.class)})
+ @Timed
+ public Response getCsarFileUri(
+ @ApiParam(value = "csar Id", required = true) @PathParam("csarId") String csarId,
+ @ApiParam(value = "csar file path",
+ required = true) @QueryParam("relativePath") String relativePath) {
+ return PackageWrapper.getInstance().getCsarFileUri(csarId, relativePath);
+ }
+
+ // @Path("/csars/{csarId}/plans")
+ // @GET
+ // @ApiOperation(value = "get plans of package by csarId", response = FileLink.class,
+ // responseContainer = "List")
+ // @Produces(MediaType.APPLICATION_JSON)
+ // @ApiResponses(value = {
+ // @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found", response =
+ // String.class),
+ // @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, message =
+ // "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ // @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "resource grant error",
+ // response = String.class)})
+ // @Timed
+ // public Response getCsarPlanUri(
+ // @ApiParam(value = "csar Id", required = true) @PathParam("csarId") String csarId
+ // ) {
+ // return PackageWrapper.getInstance().getCsarPlansUri(csarId);
+ // }
}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.resources;\r
\r
-import javax.ws.rs.BadRequestException;\r
-import javax.ws.rs.InternalServerErrorException;\r
-import javax.ws.rs.core.Response;\r
+package org.openo.commontosca.catalog.resources;\r
\r
import org.openo.commontosca.catalog.common.CommonErrorResponse;\r
import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
\r
+import javax.ws.rs.BadRequestException;\r
+import javax.ws.rs.InternalServerErrorException;\r
+import javax.ws.rs.core.Response;\r
\r
public class RestUtils {\r
- /**\r
- * @param e\r
- * @return\r
- */\r
- public static InternalServerErrorException newInternalServerErrorException(\r
- CatalogResourceException e) {\r
- return new InternalServerErrorException(Response\r
- .status(Response.Status.INTERNAL_SERVER_ERROR)\r
- .entity(new CommonErrorResponse(e.getErrcode() + "", e.getMessage())).build(), e);\r
- }\r
+ public static InternalServerErrorException newInternalServerErrorException(\r
+ CatalogResourceException e1) {\r
+ return new InternalServerErrorException(Response.status(Response.Status.INTERNAL_SERVER_ERROR)\r
+ .entity(new CommonErrorResponse(e1.getErrcode() + "", e1.getMessage())).build(), e1);\r
+ }\r
\r
- /**\r
- * @param e\r
- * @return\r
- */\r
- public static BadRequestException newBadRequestException(CatalogBadRequestException e) {\r
- return new BadRequestException(Response.status(Response.Status.BAD_REQUEST)\r
- .entity(new CommonErrorResponse(e.getErrcode() + "", e.getMessage())).build(), e);\r
- }\r
+ public static BadRequestException newBadRequestException(CatalogBadRequestException e1) {\r
+ return new BadRequestException(Response.status(Response.Status.BAD_REQUEST)\r
+ .entity(new CommonErrorResponse(e1.getErrcode() + "", e1.getMessage())).build(), e1);\r
+ }\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.resources;
+import com.codahale.metrics.annotation.Timed;
+
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import io.swagger.annotations.ApiParam;
import io.swagger.annotations.ApiResponse;
import io.swagger.annotations.ApiResponses;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.QueryParam;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
-
import org.eclipse.jetty.http.HttpStatus;
import org.openo.commontosca.catalog.common.CommonErrorResponse;
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
-import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;
-import org.openo.commontosca.catalog.model.wrapper.ServiceTemplateWrapper;
import org.openo.commontosca.catalog.common.ToolUtil;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.model.entity.InputParameter;
import org.openo.commontosca.catalog.model.entity.NodeTemplate;
+import org.openo.commontosca.catalog.model.entity.Parameters;
import org.openo.commontosca.catalog.model.entity.QueryRawDataCondition;
import org.openo.commontosca.catalog.model.entity.ServiceTemplate;
+import org.openo.commontosca.catalog.model.entity.ServiceTemplateOperation;
import org.openo.commontosca.catalog.model.entity.ServiceTemplateRawData;
import org.openo.commontosca.catalog.model.parser.ToscaYamlModelParser;
+import org.openo.commontosca.catalog.model.service.ModelService;
+import org.openo.commontosca.catalog.model.wrapper.ServiceTemplateWrapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.codahale.metrics.annotation.Timed;
+import javax.ws.rs.Consumes;
+import javax.ws.rs.GET;
+import javax.ws.rs.POST;
+import javax.ws.rs.Path;
+import javax.ws.rs.PathParam;
+import javax.ws.rs.Produces;
+import javax.ws.rs.QueryParam;
+import javax.ws.rs.core.MediaType;
+import javax.ws.rs.core.Response;
/**
- * @author 10090474
+ * model template service.
*
*/
@Path("/servicetemplates")
@Api(tags = {"Model Resource"})
public class TemplateResource {
- private static final Logger logger = LoggerFactory.getLogger(TemplateResource.class);
-
- /**
- * @param servicetemplateid
- * @return
- */
- @Path("/{servicetemplateid}")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Query service template by service template id",
- response = ServiceTemplate.class)
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response getServiceTemplateById(
- @ApiParam(value = "service template id") @PathParam("servicetemplateid") String servicetemplateid) {
- try {
- ServiceTemplate st =
- ServiceTemplateWrapper.getInstance().getServiceTemplateById(servicetemplateid);
- return Response.status(Response.Status.OK).entity(st).build();
- } catch (CatalogResourceException e) {
- logger.error("getServiceTemplateById failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- }
- }
-
- /**
- * @param status
- * @param deletionPending
- * @return
- */
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Query service template by filter conditions",
- response = ServiceTemplate.class, responseContainer = "List")
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response getServiceTemplates(
- @ApiParam(value = "template status") @QueryParam("status") String status,
- @ApiParam(value = "delay to delete") @QueryParam("deletionPending") boolean deletionPending) {
- try {
- ServiceTemplate[] sts =
- ServiceTemplateWrapper.getInstance().getServiceTemplates(status,
- deletionPending);
- return Response.status(Response.Status.OK).entity(sts).build();
- } catch (CatalogResourceException e) {
- logger.error("getServiceTemplates failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- }
+ private static final Logger logger = LoggerFactory.getLogger(TemplateResource.class);
+ /**
+ * Query service template by service template id.
+ * @param servicetemplateid service template id
+ * @return Response
+ */
+ @Path("/{servicetemplateid}")
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Query service template by service template id",
+ response = ServiceTemplate.class)
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response getServiceTemplateById(@ApiParam(
+ value = "service template id") @PathParam("servicetemplateid") String servicetemplateid) {
+ try {
+ ServiceTemplate st =
+ ServiceTemplateWrapper.getInstance().getServiceTemplateById(servicetemplateid);
+ return Response.status(Response.Status.OK).entity(st).build();
+ } catch (CatalogResourceException e1) {
+ logger.error("getServiceTemplateById failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
}
+ }
- /**
- * @param nodeTypeIds
- * @return
- */
- @Path("/nesting")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Query nesting service template of a node type",
- response = ServiceTemplate.class, responseContainer = "List")
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response getNestingServiceTemplate(
- @ApiParam(value = "Node Type Id", required = true) @QueryParam("nodeTypeIds") String nodeTypeIds) {
- try {
- if (ToolUtil.isTrimedEmptyString(nodeTypeIds)) {
- throw new CatalogBadRequestException("nodeTypeIds is null.");
- }
- String[] tmpNodeTypeIds = nodeTypeIds.split(",");
- ServiceTemplate[] sts =
- ServiceTemplateWrapper.getInstance().getNestingServiceTemplate(
- ToolUtil.TrimedStringArray(tmpNodeTypeIds));
- return Response.status(Response.Status.OK).entity(sts).build();
- } catch (CatalogResourceException e) {
- logger.error("getNestingServiceTemplate failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- } catch (CatalogBadRequestException e) {
- logger.error("getNestingServiceTemplate failed.", e);
- throw RestUtils.newBadRequestException(e);
- }
+
+ /**
+ * Query service template by filter conditions.
+ * @param status template status
+ * @param deletionPending delay to delete
+ * @return Response
+ */
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Query service template by filter conditions",
+ response = ServiceTemplate.class, responseContainer = "List")
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response getServiceTemplates(
+ @ApiParam(value = "template status") @QueryParam("status") String status,
+ @ApiParam(value = "delay to delete") @QueryParam("deletionPending") boolean deletionPending) {
+ try {
+ ServiceTemplate[] sts =
+ ServiceTemplateWrapper.getInstance().getServiceTemplates(status, deletionPending);
+ return Response.status(Response.Status.OK).entity(sts).build();
+ } catch (CatalogResourceException e1) {
+ logger.error("getServiceTemplates failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
}
- /**
- * @param nodeTypeId
- * @return
- */
- @Path("/queryingrawdata")
- @POST
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Query raw data of a service template by csar id",
- response = ServiceTemplateRawData.class)
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response getServiceTemplateRawData(
- @ApiParam(value = "Query Service Template Raw Data Condition", required = true) QueryRawDataCondition queryCondition) {
- try {
- ServiceTemplateRawData stRowData =
- ServiceTemplateWrapper.getInstance().getServiceTemplateRawData(queryCondition);
- return Response.status(Response.Status.OK).entity(stRowData).build();
- } catch (CatalogResourceException e) {
- logger.error("getServiceTemplateRawData failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- } catch (CatalogBadRequestException e) {
- logger.error("getServiceTemplateRawData failed.", e);
- throw RestUtils.newBadRequestException(e);
- }
+ }
+
+ /**
+ * Query nesting service template of a node type.
+ * @param nodeTypeIds node type ids
+ * @return Response
+ */
+ @Path("/nesting")
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Query nesting service template of a node type",
+ response = ServiceTemplate.class, responseContainer = "List")
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response getNestingServiceTemplate(@ApiParam(value = "Node Type Id",
+ required = true) @QueryParam("nodeTypeIds") String nodeTypeIds) {
+ try {
+ if (ToolUtil.isTrimedEmptyString(nodeTypeIds)) {
+ throw new CatalogBadRequestException("nodeTypeIds is null.");
+ }
+ String[] tmpNodeTypeIds = nodeTypeIds.split(",");
+ ServiceTemplate[] sts = ServiceTemplateWrapper.getInstance()
+ .getNestingServiceTemplate(ToolUtil.trimedStringArray(tmpNodeTypeIds));
+ return Response.status(Response.Status.OK).entity(sts).build();
+ } catch (CatalogResourceException e1) {
+ logger.error("getNestingServiceTemplate failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
+ } catch (CatalogBadRequestException e2) {
+ logger.error("getNestingServiceTemplate failed.", e2);
+ throw RestUtils.newBadRequestException(e2);
}
+ }
+ /**
+ * Query raw data of a service template by csar id.
+ * @param queryCondition query condition
+ * @return Response
+ */
+ @Path("/queryingrawdata")
+ @POST
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Query raw data of a service template by csar id",
+ response = ServiceTemplateRawData.class)
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response getServiceTemplateRawData(
+ @ApiParam(value = "Query Service Template Raw Data Condition",
+ required = true) QueryRawDataCondition queryCondition) {
+ try {
+ ServiceTemplateRawData stRowData =
+ ServiceTemplateWrapper.getInstance().getServiceTemplateRawData(queryCondition);
+ return Response.status(Response.Status.OK).entity(stRowData).build();
+ } catch (CatalogResourceException e1) {
+ logger.error("getServiceTemplateRawData failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
+ } catch (CatalogBadRequestException e2) {
+ logger.error("getServiceTemplateRawData failed.", e2);
+ throw RestUtils.newBadRequestException(e2);
+ }
+ }
- /**
- * @param serviceTemplateId
- * @return
- */
- @Path("/{serviceTemplateId}/operations")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Query operation list of service template",
- response = ServiceTemplateOperation.class, responseContainer = "List")
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response getServiceTemplateOperations(@ApiParam(value = "Service Template Id",
- required = true) @PathParam("serviceTemplateId") String serviceTemplateId) {
- try {
- ServiceTemplateOperation[] operations =
- ServiceTemplateWrapper.getInstance().getTemplateOperations(serviceTemplateId);
- return Response.status(Response.Status.OK).entity(operations).build();
- } catch (CatalogResourceException e) {
- logger.error("getServiceTemplateOperations failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- }
+ /**
+ * Query operation list of service template.
+ * @param serviceTemplateId service template id
+ * @return Response
+ */
+ @Path("/{serviceTemplateId}/operations")
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Query operation list of service template",
+ response = ServiceTemplateOperation.class, responseContainer = "List")
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response getServiceTemplateOperations(@ApiParam(value = "Service Template Id",
+ required = true) @PathParam("serviceTemplateId") String serviceTemplateId) {
+ try {
+ ServiceTemplateOperation[] operations =
+ ServiceTemplateWrapper.getInstance().getTemplateOperations(serviceTemplateId);
+ return Response.status(Response.Status.OK).entity(operations).build();
+ } catch (CatalogResourceException e1) {
+ logger.error("getServiceTemplateOperations failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
}
- /**
- * @param serviceTemplateId
- * @param operationName
- * @return
- */
- @Path("/{serviceTemplateId}/operations/{operationName}/parameters")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Query input parameters of a specified operation",
- response = InputParameter.class, responseContainer = "List")
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response getParametersByOperationName(
- @ApiParam(value = "Service Template Id", required = true) @PathParam("serviceTemplateId") String serviceTemplateId,
- @ApiParam(value = "Operation Name", required = true) @PathParam("operationName") String operationName) {
- try {
- InputParameter[] inputs =
- ServiceTemplateWrapper.getInstance().getParametersByOperationName(
- serviceTemplateId, operationName);
- return Response.status(Response.Status.OK).entity(inputs).build();
- } catch (CatalogResourceException e) {
- logger.error("getParametersByOperationId failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- }
+ }
+ /**
+ * Query input parameters of a specified operation.
+ * @param serviceTemplateId service template id
+ * @param operationName operation name
+ * @return Response
+ */
+ @Path("/{serviceTemplateId}/operations/{operationName}/parameters")
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Query input parameters of a specified operation",
+ response = InputParameter.class, responseContainer = "List")
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response getParametersByOperationName(
+ @ApiParam(value = "Service Template Id",
+ required = true) @PathParam("serviceTemplateId") String serviceTemplateId,
+ @ApiParam(value = "Operation Name",
+ required = true) @PathParam("operationName") String operationName) {
+ try {
+ InputParameter[] inputs = ServiceTemplateWrapper.getInstance()
+ .getParametersByOperationName(serviceTemplateId, operationName);
+ return Response.status(Response.Status.OK).entity(inputs).build();
+ } catch (CatalogResourceException e1) {
+ logger.error("getParametersByOperationId failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
}
- /**
- * @param servicetemplateid
- * @return
- */
- @Path("/{servicetemplateid}/parameters")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Query input parameters of service template",
- response = InputParameter.class, responseContainer = "List")
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response getServiceTemplateParameters(@ApiParam(value = "service template id",
- required = true) @PathParam("servicetemplateid") String servicetemplateid) {
- try {
- InputParameter[] inputs =
- ServiceTemplateWrapper.getInstance().getServiceTemplateParameters(
- servicetemplateid);
- return Response.status(Response.Status.OK).entity(inputs).build();
- } catch (CatalogResourceException e) {
- logger.error("getServiceTemplateParameters failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- }
+ }
+ /**
+ * Query input parameters of service template.
+ * @param servicetemplateid service template id
+ * @return Response
+ */
+ @Path("/{servicetemplateid}/parameters")
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Query input parameters of service template", response = Parameters.class)
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response getServiceTemplateParameters(@ApiParam(value = "service template id",
+ required = true) @PathParam("servicetemplateid") String servicetemplateid) {
+ try {
+ Parameters parameters =
+ ServiceTemplateWrapper.getInstance().getServiceTemplateParameters(servicetemplateid);
+ return Response.status(Response.Status.OK).entity(parameters).build();
+ } catch (CatalogResourceException e1) {
+ logger.error("getServiceTemplateParameters failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
}
- /**
- * @param serviceTemplateId
- * @param types
- * @return
- */
- @Path("/{serviceTemplateId}/nodetemplates")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Query node template list of a specified service template",
- response = NodeTemplate.class, responseContainer = "List")
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response getNodeTemplatesByType(
- @ApiParam(value = "Service Template Id", required = true) @PathParam("serviceTemplateId") String serviceTemplateId,
- @ApiParam(value = "The type of node template") @QueryParam("types") String types) {
- try {
- String[] tmpTypes = getSplitedTypes(types);
- NodeTemplate[] nts =
- ServiceTemplateWrapper.getInstance().getNodeTemplates(serviceTemplateId,
- ToolUtil.TrimedStringArray(tmpTypes));
- return Response.status(Response.Status.OK).entity(nts).build();
- } catch (CatalogResourceException e) {
- logger.error("getNodeTemplateList failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- }
+ }
+ /**
+ * Query node template list of a specified service template.
+ * @param serviceTemplateId service template id
+ * @param types node type
+ * @return Response
+ */
+ @Path("/{serviceTemplateId}/nodetemplates")
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Query node template list of a specified service template",
+ response = NodeTemplate.class, responseContainer = "List")
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response getNodeTemplatesByType(
+ @ApiParam(value = "Service Template Id",
+ required = true) @PathParam("serviceTemplateId") String serviceTemplateId,
+ @ApiParam(value = "The type of node template") @QueryParam("types") String types) {
+ try {
+ String[] tmpTypes = getSplitedTypes(types);
+ NodeTemplate[] nts = ServiceTemplateWrapper.getInstance().getNodeTemplates(serviceTemplateId,
+ ToolUtil.trimedStringArray(tmpTypes));
+ return Response.status(Response.Status.OK).entity(nts).build();
+ } catch (CatalogResourceException e1) {
+ logger.error("getNodeTemplateList failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
}
+ }
- private String[] getSplitedTypes(String types) {
- if (ToolUtil.isTrimedEmptyString(types)) {
- return new String[0];
- }
- return types.split(",");
+ private String[] getSplitedTypes(String types) {
+ if (ToolUtil.isTrimedEmptyString(types)) {
+ return new String[0];
}
- /**
- * @param serviceTemplateId
- * @param nodeTemplateId
- * @return
- */
- @Path("/{serviceTemplateId}/nodetemplates/{nodeTemplateId}")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "Query node template by node template id", response = NodeTemplate.class)
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response getNodeTemplateById(
- @ApiParam(value = "Service Template Id", required = true) @PathParam("serviceTemplateId") String serviceTemplateId,
- @ApiParam(value = "Node Template Id", required = true) @PathParam("nodeTemplateId") String nodeTemplateId) {
- try {
- NodeTemplate nt =
- ServiceTemplateWrapper.getInstance().getNodeTemplateById(serviceTemplateId,
- nodeTemplateId);
- return Response.status(Response.Status.OK).entity(nt).build();
- } catch (CatalogResourceException e) {
- logger.error("getNodeTemplateById failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- }
+ return types.split(",");
+ }
+ /**
+ * Query node template by node template id.
+ * @param serviceTemplateId service template id
+ * @param nodeTemplateId node template id
+ * @return Response
+ */
+ @Path("/{serviceTemplateId}/nodetemplates/{nodeTemplateId}")
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "Query node template by node template id", response = NodeTemplate.class)
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response getNodeTemplateById(
+ @ApiParam(value = "Service Template Id",
+ required = true) @PathParam("serviceTemplateId") String serviceTemplateId,
+ @ApiParam(value = "Node Template Id",
+ required = true) @PathParam("nodeTemplateId") String nodeTemplateId) {
+ try {
+ NodeTemplate nt = ServiceTemplateWrapper.getInstance().getNodeTemplateById(serviceTemplateId,
+ nodeTemplateId);
+ return Response.status(Response.Status.OK).entity(nt).build();
+ } catch (CatalogResourceException e1) {
+ logger.error("getNodeTemplateById failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
}
- // /**
- // * @param servicetemplateid
- // * @return
- // */
- // @Path("/{servicetemplateid}/nfvtemplate")
- // @POST
- // @Consumes(MediaType.APPLICATION_JSON)
- // @Produces(MediaType.APPLICATION_JSON)
- // @ApiOperation(value =
- // "Query node template detail of a specified service template", response =
- // NfvTemplate.class)
- // @ApiResponses(value = {
- // @ApiResponse(code = HttpStatus.NOT_FOUND_404, message =
- // "microservice not found", response = String.class),
- // @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, message =
- // "Unprocessable MicroServiceInfo Entity ", response = String.class),
- // @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message =
- // "server internal error", response = CommonErrorResponse.class) })
- // @Timed
- // public Response getNfvTemplate(
- // @ApiParam(value = "service template id", required = true)
- // @PathParam("servicetemplateid") String servicetemplateid) {
- // try {
- // NfvTemplate nfvTemplate = ServiceTemplateWrapper.getInstance()
- // .getNfvTemplate(servicetemplateid);
- // return Response.status(Response.Status.OK).entity(nfvTemplate)
- // .build();
- // } catch (CatalogResourceException e) {
- // logger.error("getNfvTemplate failed.", e);
- // throw RestUtils.newInternalServerErrorException(e);
- // }
- //
- // }
-
- /**
- *
- * @return
- */
- @Path("/test")
- @GET
- @Consumes(MediaType.APPLICATION_JSON)
- @Produces(MediaType.APPLICATION_JSON)
- @ApiOperation(value = "test", response = String.class, responseContainer = "List")
- @ApiResponses(value = {
- @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
- response = String.class),
- @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
- message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
- @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500,
- message = "server internal error", response = CommonErrorResponse.class)})
- @Timed
- public Response test() {
- try {
- ToscaYamlModelParser parser = new ToscaYamlModelParser();
- parser.parse("pk11111", "C:\\Users\\10090474\\Desktop\\3\\NS_core\\NS_core.zip");
- String[] strs = {"111", "222", null, null, "555"};
- Response.status(Response.Status.OK).entity(strs).build();
- throw new CatalogResourceException("test failed.");
- } catch (CatalogResourceException e) {
- logger.error("test failed.", e);
- throw RestUtils.newInternalServerErrorException(e);
- }
+ }
+
+ // /**
+ // * @param servicetemplateid
+ // * @return
+ // */
+ // @Path("/{servicetemplateid}/nfvtemplate")
+ // @POST
+ // @Consumes(MediaType.APPLICATION_JSON)
+ // @Produces(MediaType.APPLICATION_JSON)
+ // @ApiOperation(value =
+ // "Query node template detail of a specified service template", response =
+ // NfvTemplate.class)
+ // @ApiResponses(value = {
+ // @ApiResponse(code = HttpStatus.NOT_FOUND_404, message =
+ // "microservice not found", response = String.class),
+ // @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415, message =
+ // "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ // @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message =
+ // "server internal error", response = CommonErrorResponse.class) })
+ // @Timed
+ // public Response getNfvTemplate(
+ // @ApiParam(value = "service template id", required = true)
+ // @PathParam("servicetemplateid") String servicetemplateid) {
+ // try {
+ // NfvTemplate nfvTemplate = ServiceTemplateWrapper.getInstance()
+ // .getNfvTemplate(servicetemplateid);
+ // return Response.status(Response.Status.OK).entity(nfvTemplate)
+ // .build();
+ // } catch (CatalogResourceException e) {
+ // logger.error("getNfvTemplate failed.", e);
+ // throw RestUtils.newInternalServerErrorException(e);
+ // }
+ //
+ // }
+
+ /**
+ * test function.
+ * @return Response
+ */
+ @Path("/test")
+ @GET
+ @Consumes(MediaType.APPLICATION_JSON)
+ @Produces(MediaType.APPLICATION_JSON)
+ @ApiOperation(value = "test", response = String.class, responseContainer = "List")
+ @ApiResponses(value = {
+ @ApiResponse(code = HttpStatus.NOT_FOUND_404, message = "microservice not found",
+ response = String.class),
+ @ApiResponse(code = HttpStatus.UNSUPPORTED_MEDIA_TYPE_415,
+ message = "Unprocessable MicroServiceInfo Entity ", response = String.class),
+ @ApiResponse(code = HttpStatus.INTERNAL_SERVER_ERROR_500, message = "server internal error",
+ response = CommonErrorResponse.class)})
+ @Timed
+ public Response test() {
+ try {
+ ToscaYamlModelParser parser = new ToscaYamlModelParser();
+ parser.parse("pk11111", "C:\\Users\\10090474\\Desktop\\1\\bm\\bm.zip");
+ String[] strs = {"111", "222", null, null, "555"};
+ Response.status(Response.Status.OK).entity(strs).build();
+
+ ModelService.getInstance().delete("pk11111");
+ throw new CatalogResourceException("test failed.");
+ } catch (CatalogResourceException e1) {
+ logger.error("test failed.", e1);
+ throw RestUtils.newInternalServerErrorException(e1);
+ } catch (CatalogBadRequestException e2) {
+ logger.error("test failed.", e2);
+ throw RestUtils.newBadRequestException(e2);
}
+ }
}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.wrapper;\r
-\r
-import java.io.BufferedInputStream;\r
-import java.io.File;\r
-import java.io.FileInputStream;\r
-import java.io.InputStream;\r
-import java.text.SimpleDateFormat;\r
-import java.util.ArrayList;\r
-import java.util.Date;\r
\r
-import javax.ws.rs.core.HttpHeaders;\r
-import javax.ws.rs.core.Response;\r
-import javax.ws.rs.core.Response.Status;\r
+package org.openo.commontosca.catalog.wrapper;\r
\r
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;\r
import org.openo.commontosca.catalog.common.CommonConstant;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
-/**\r
- * @author 10189609\r
- * \r
- */\r
+import java.io.BufferedInputStream;\r
+import java.io.File;\r
+import java.io.FileInputStream;\r
+import java.io.InputStream;\r
+import java.text.SimpleDateFormat;\r
+import java.util.ArrayList;\r
+import java.util.Date;\r
+\r
+import javax.ws.rs.core.HttpHeaders;\r
+import javax.ws.rs.core.Response;\r
+import javax.ws.rs.core.Response.Status;\r
+\r
public class PackageWrapper {\r
- private static PackageWrapper packageWrapper;\r
- private static final Logger LOG = LoggerFactory.getLogger(PackageWrapper.class);\r
+ private static PackageWrapper packageWrapper;\r
+ private static final Logger LOG = LoggerFactory.getLogger(PackageWrapper.class);\r
\r
- public static PackageWrapper getInstance() {\r
- if (packageWrapper == null) {\r
- packageWrapper = new PackageWrapper();\r
- }\r
- return packageWrapper;\r
+ /**\r
+ * get PackageWrapper instance.\r
+ * @return package wrapper instance\r
+ */\r
+ public static PackageWrapper getInstance() {\r
+ if (packageWrapper == null) {\r
+ packageWrapper = new PackageWrapper();\r
}\r
+ return packageWrapper;\r
+ }\r
\r
- public Response queryPackageById(String csarId) {\r
- ArrayList<PackageData> dbResult = new ArrayList<PackageData>();\r
- ArrayList<PackageMeta> result = new ArrayList<PackageMeta>();\r
- dbResult = PackageWrapperUtil.getPackageInfoById(csarId);\r
- if (dbResult.size() != 0) {\r
- result = PackageWrapperUtil.packageDataList2PackageMetaList(dbResult);\r
- return Response.ok(result).build();\r
- } else {\r
- String errorMsg = "get package info by Id error !";\r
- return RestUtil.getRestException(errorMsg);\r
- }\r
+ /**\r
+ * query package by id.\r
+ * @param csarId package id\r
+ * @return Response\r
+ */\r
+ public Response queryPackageById(String csarId) {\r
+ ArrayList<PackageData> dbResult = new ArrayList<PackageData>();\r
+ ArrayList<PackageMeta> result = new ArrayList<PackageMeta>();\r
+ dbResult = PackageWrapperUtil.getPackageInfoById(csarId);\r
+ if (dbResult.size() != 0) {\r
+ result = PackageWrapperUtil.packageDataList2PackageMetaList(dbResult);\r
+ return Response.ok(result).build();\r
+ } else {\r
+ String errorMsg = "get package info by Id error !";\r
+ return RestUtil.getRestException(errorMsg);\r
}\r
+ }\r
\r
- public Response uploadPackage(InputStream uploadedInputStream,\r
- FormDataContentDisposition fileDetail, HttpHeaders head) throws Exception {\r
- PackageBasicInfo basicInfo = new PackageBasicInfo();\r
- String tempDirName = null;\r
- int fileSize = 0;\r
- String fileName = "";\r
- UploadPackageResponse result = new UploadPackageResponse();\r
- PackageMeta packageMeta = new PackageMeta();\r
- if (uploadedInputStream == null) {\r
- LOG.info("the uploadStream is null");\r
- return Response.serverError().build();\r
- }\r
- if (fileDetail == null) {\r
- LOG.info("the fileDetail is null");\r
- return Response.serverError().build();\r
- }\r
+ /**\r
+ * upload package.\r
+ * @param uploadedInputStream inputStream\r
+ * @param fileDetail package detail\r
+ * @param head http header\r
+ * @return Response\r
+ * @throws Exception e\r
+ */\r
+ public Response uploadPackage(InputStream uploadedInputStream,\r
+ FormDataContentDisposition fileDetail, HttpHeaders head) throws Exception {\r
+ PackageBasicInfo basicInfo = new PackageBasicInfo();\r
+ String tempDirName = null;\r
+ int fileSize = 0;\r
+ String fileName = "";\r
+ UploadPackageResponse result = new UploadPackageResponse();\r
+ PackageMeta packageMeta = new PackageMeta();\r
+ if (uploadedInputStream == null) {\r
+ LOG.info("the uploadStream is null");\r
+ return Response.serverError().build();\r
+ }\r
+ if (fileDetail == null) {\r
+ LOG.info("the fileDetail is null");\r
+ return Response.serverError().build();\r
+ }\r
\r
- try {\r
- String contentRange = null;\r
- fileName = ToolUtil.processFileName(fileDetail.getFileName());\r
- tempDirName = ToolUtil.getTempDir(CommonConstant.CATALOG_CSAR_DIR_NAME, fileName);\r
- if (head != null) {\r
- contentRange = head.getHeaderString(CommonConstant.HTTP_HEADER_CONTENT_RANGE);\r
- }\r
- LOG.debug("store package chunk file, fileName:" + fileName + ",contentRange:"\r
- + contentRange);\r
- if (ToolUtil.isEmptyString(contentRange)) {\r
- fileSize = uploadedInputStream.available();\r
- contentRange = "0-" + fileSize + "/" + fileSize;\r
- }\r
- Boolean isEnd = PackageWrapperUtil.isUploadEnd(contentRange, fileName);\r
- String fileLocation =\r
- ToolUtil.storeChunkFileInLocal(tempDirName, fileName, uploadedInputStream);\r
- LOG.info("the fileLocation when upload package is :" + fileLocation);\r
- uploadedInputStream.close();\r
+ try {\r
+ String contentRange = null;\r
+ fileName = ToolUtil.processFileName(fileDetail.getFileName());\r
+ tempDirName = ToolUtil.getTempDir(CommonConstant.CATALOG_CSAR_DIR_NAME, fileName);\r
+ if (head != null) {\r
+ contentRange = head.getHeaderString(CommonConstant.HTTP_HEADER_CONTENT_RANGE);\r
+ }\r
+ LOG.debug("store package chunk file, fileName:" + fileName + ",contentRange:" + contentRange);\r
+ if (ToolUtil.isEmptyString(contentRange)) {\r
+ fileSize = uploadedInputStream.available();\r
+ contentRange = "0-" + fileSize + "/" + fileSize;\r
+ }\r
+ String fileLocation =\r
+ ToolUtil.storeChunkFileInLocal(tempDirName, fileName, uploadedInputStream);\r
+ LOG.info("the fileLocation when upload package is :" + fileLocation);\r
+ uploadedInputStream.close();\r
\r
- basicInfo = PackageWrapperUtil.getPacageBasicInfo(fileLocation);\r
- String path =\r
- basicInfo.getType().toString() + File.separator + basicInfo.getProvider()\r
- + File.separator + fileName.replace(".csar", "") + File.separator\r
- + basicInfo.getVersion();\r
- LOG.info("dest path is : " + path);\r
- packageMeta = PackageWrapperUtil.getPackageMeta(fileName, fileLocation, basicInfo);\r
- String dowloadUri = File.separator + path + File.separator;\r
- String destPath = File.separator + path;\r
- packageMeta.setDownloadUri(dowloadUri);\r
- LOG.info("packageMeta = " + ToolUtil.objectToString(packageMeta));\r
- if (isEnd) {\r
- boolean uploadResult =\r
- FileManagerFactory.createFileManager().upload(tempDirName, destPath);\r
- if (uploadResult == true) {\r
- // 调袁虎的接口，将fileLocation 和 packageId传给他，由他去解析包，并向数据库存储数据\r
- // String parseResult =\r
- // ModelParserFactory.getInstance().parse(packageMeta.getCsarId(),\r
- // fileLocation , EnumPackageFormat.valueOf(packageMeta.getFormat()));\r
- PackageData packageData = PackageWrapperUtil.getPackageData(packageMeta);\r
- PackageManager.getInstance().addPackage(packageData);\r
- }\r
- LOG.info("upload package file end, fileName:" + fileName);\r
- }\r
- result.setCsarId(packageMeta.getCsarId());\r
- return Response.ok(result).build();\r
- } catch (Exception e) {\r
- LOG.error("upload package fail.", e);\r
- String csarId = packageMeta.getCsarId();\r
- if (csarId != null) {\r
- PackageManager.getInstance().deletePackage(csarId);\r
- }\r
- return RestUtil.getRestException(e.getMessage());\r
- } finally {\r
- if (tempDirName != null) {\r
- ToolUtil.deleteDir(new File(tempDirName));\r
- }\r
+ basicInfo = PackageWrapperUtil.getPacageBasicInfo(fileLocation);\r
+ String path =\r
+ basicInfo.getType().toString() + File.separator + basicInfo.getProvider()\r
+ + File.separator + fileName.replace(".csar", "") + File.separator\r
+ + basicInfo.getVersion();\r
+ LOG.info("dest path is : " + path);\r
+ packageMeta = PackageWrapperUtil.getPackageMeta(fileName, fileLocation, basicInfo);\r
+ String dowloadUri = File.separator + path + File.separator;\r
+ String destPath = File.separator + path;\r
+ packageMeta.setDownloadUri(dowloadUri);\r
+ LOG.info("packageMeta = " + ToolUtil.objectToString(packageMeta));\r
+ Boolean isEnd = PackageWrapperUtil.isUploadEnd(contentRange, fileName);\r
+ if (isEnd) {\r
+ boolean uploadResult = FileManagerFactory.createFileManager().upload(tempDirName, destPath);\r
+ if (uploadResult == true) {\r
+ // 调袁虎的接口，将fileLocation 和 packageId传给他，由他去解析包，并向数据库存储数据\r
+ // String parseResult =\r
+ // ModelParserFactory.getInstance().parse(packageMeta.getCsarId(),\r
+ // fileLocation , EnumPackageFormat.valueOf(packageMeta.getFormat()));\r
+ PackageData packageData = PackageWrapperUtil.getPackageData(packageMeta);\r
+ PackageManager.getInstance().addPackage(packageData);\r
}\r
+ LOG.info("upload package file end, fileName:" + fileName);\r
+ }\r
+ result.setCsarId(packageMeta.getCsarId());\r
+ return Response.ok(result).build();\r
+ } catch (Exception e1) {\r
+ LOG.error("upload package fail.", e1);\r
+ String csarId = packageMeta.getCsarId();\r
+ if (csarId != null) {\r
+ PackageManager.getInstance().deletePackage(csarId);\r
+ }\r
+ return RestUtil.getRestException(e1.getMessage());\r
+ } finally {\r
+ if (tempDirName != null) {\r
+ ToolUtil.deleteDir(new File(tempDirName));\r
+ }\r
}\r
+ }\r
\r
- public Response delPackage(String csarId) {\r
- LOG.info("delete package info.csarId:" + csarId);\r
- if (ToolUtil.isEmptyString(csarId)) {\r
- LOG.error("delete package fail, csarid is null");\r
- return Response.serverError().build();\r
- }\r
- try {\r
- delCsarThread thread = new delCsarThread(csarId, false);\r
- new Thread(thread).start();\r
- return Response.noContent().build();\r
- } catch (Exception e) {\r
- LOG.error("delete fail.", e);\r
- return RestUtil.getRestException(e.getMessage());\r
- }\r
+ /**\r
+ * delete package by package id.\r
+ * @param csarId package id\r
+ * @return Response\r
+ */\r
+ public Response delPackage(String csarId) {\r
+ LOG.info("delete package info.csarId:" + csarId);\r
+ if (ToolUtil.isEmptyString(csarId)) {\r
+ LOG.error("delete package fail, csarid is null");\r
+ return Response.serverError().build();\r
}\r
+ try {\r
+ DelCsarThread thread = new DelCsarThread(csarId, false);\r
+ new Thread(thread).start();\r
+ return Response.noContent().build();\r
+ } catch (Exception e1) {\r
+ LOG.error("delete fail.", e1);\r
+ return RestUtil.getRestException(e1.getMessage());\r
+ }\r
+ }\r
\r
- // public Response delPackageByServiceTemplateId(String serviceTemplateId) {\r
- // LOG.info("delete package info.serviceTemplateId:" + serviceTemplateId);\r
- // if (ToolUtil.isEmptyString(serviceTemplateId)) {\r
- // LOG.error("delete package fail, serviceTemplateId is null");\r
- // return Response.serverError().build();\r
- // }\r
- // ArrayList<PackageData> result = new ArrayList<PackageData>();\r
- // try {\r
- // result = PackageManager.getInstance().queryPackageByServiceTemplateId(serviceTemplateId);\r
- //\r
- // } catch (CatalogResourceException e) {\r
- // LOG.error("query package by csarId from db error ! " + e.getMessage());\r
- // return RestUtil.getRestException(e.getMessage());\r
- // }\r
- // if (result.size() <= 0) {\r
- // LOG.warn("not exist package by serviceTemplateId");\r
- // return Response.status(Status.NOT_FOUND).build();\r
- // }\r
- // if ("true".equals(result.get(0).getDeletionPending())) {\r
- // LOG.info("start delete package.csarId:" + result.get(0).getCsarId());\r
- // delCsarThread thread = new delCsarThread(result.get(0).getCsarId(), true);\r
- // new Thread(thread).start();\r
- // }\r
- // return Response.noContent().build();\r
- // }\r
-\r
- class delCsarThread implements Runnable {\r
- private String csarid;\r
- private boolean isInstanceTemplate = false;\r
+ // public Response delPackageByServiceTemplateId(String serviceTemplateId) {\r
+ // LOG.info("delete package info.serviceTemplateId:" + serviceTemplateId);\r
+ // if (ToolUtil.isEmptyString(serviceTemplateId)) {\r
+ // LOG.error("delete package fail, serviceTemplateId is null");\r
+ // return Response.serverError().build();\r
+ // }\r
+ // ArrayList<PackageData> result = new ArrayList<PackageData>();\r
+ // try {\r
+ // result = PackageManager.getInstance().queryPackageByServiceTemplateId(serviceTemplateId);\r
+ //\r
+ // } catch (CatalogResourceException e) {\r
+ // LOG.error("query package by csarId from db error ! " + e.getMessage());\r
+ // return RestUtil.getRestException(e.getMessage());\r
+ // }\r
+ // if (result.size() <= 0) {\r
+ // LOG.warn("not exist package by serviceTemplateId");\r
+ // return Response.status(Status.NOT_FOUND).build();\r
+ // }\r
+ // if ("true".equals(result.get(0).getDeletionPending())) {\r
+ // LOG.info("start delete package.csarId:" + result.get(0).getCsarId());\r
+ // delCsarThread thread = new delCsarThread(result.get(0).getCsarId(), true);\r
+ // new Thread(thread).start();\r
+ // }\r
+ // return Response.noContent().build();\r
+ // }\r
\r
- public delCsarThread(String csarid, boolean isInstanceTemplate) {\r
- this.csarid = csarid;\r
- this.isInstanceTemplate = isInstanceTemplate;\r
- }\r
+ class DelCsarThread implements Runnable {\r
+ private String csarid;\r
+ private boolean isInstanceTemplate = false;\r
\r
- @Override\r
- public void run() {\r
- try {\r
- if (!ToolUtil.isEmptyString(csarid)) {\r
- delCsarDATA(csarid);\r
- }\r
- } catch (Exception e) {\r
- LOG.error("del instance csar fail.", e);\r
- updatePackageStatus(csarid, null, null, null,\r
- CommonConstant.PACKAGE_STATUS_DELETE_FAIL, null);\r
- // publishDelFinishCometdMessage(csarid, "false");\r
- }\r
- }\r
+ public DelCsarThread(String csarid, boolean isInstanceTemplate) {\r
+ this.csarid = csarid;\r
+ this.isInstanceTemplate = isInstanceTemplate;\r
+ }\r
\r
- private void delCsarDATA(String csarId) {\r
- updatePackageStatus(csarid, null, null, null, CommonConstant.PACKAGE_STATUS_DELETING,\r
- null);\r
- String packagePath = PackageWrapperUtil.getPackagePath(csarId);\r
- if (packagePath == null) {\r
- LOG.error("package path is null! ");\r
- return;\r
- }\r
- FileManagerFactory.createFileManager().delete(packagePath);\r
- try {\r
- PackageManager.getInstance().deletePackage(csarId);\r
- } catch (CatalogResourceException e) {\r
- LOG.error("delete package by csarId from db error ! " + e.getMessage());\r
- }\r
- // delete template data from db\r
- PackageData packageData = new PackageData();\r
- packageData.setCsarId(csarId);\r
- try {\r
- TemplateManager.getInstance().deleteServiceTemplateByCsarPackageInfo(packageData);\r
- } catch (CatalogResourceException e) {\r
- LOG.error("delete template data from db error! csarId = " + csarId);\r
- }\r
- // publishDelFinishCometdMessage(csarid, "true");\r
+ @Override\r
+ public void run() {\r
+ try {\r
+ if (!ToolUtil.isEmptyString(csarid)) {\r
+ delCsarData(csarid);\r
}\r
-\r
- // private void publishDelFinishCometdMessage(String csarid, String csarDelStatus) {\r
- // if (isInstanceTemplate) {\r
- // LOG.info("delete instance Template finish. csarid:{}", csarid);\r
- // return;\r
- // }\r
- // try {\r
- // Map<String, Object> cometdMessage = new HashMap<String, Object>();\r
- // cometdMessage.put("csarid", csarid);\r
- // cometdMessage.put("status", csarDelStatus);\r
- // CometdService.getInstance().publish(CommonConstant.COMETD_CHANNEL_PACKAGE_DELETE,\r
- // cometdMessage);\r
- // } catch (CometdException e) {\r
- // LOG.error("publish delfinish cometdmsg fail.", e);\r
- // }\r
- // }\r
+ } catch (Exception e1) {\r
+ LOG.error("del instance csar fail.", e1);\r
+ updatePackageStatus(csarid, null, null, null, CommonConstant.PACKAGE_STATUS_DELETE_FAIL,\r
+ null);\r
+ // publishDelFinishCometdMessage(csarid, "false");\r
+ }\r
}\r
\r
- public Response updatePackageStatus(String csarId, String operationalState, String usageState,\r
- String onBoardState, String processState, String deletionPending) {\r
- LOG.info("update package status info.csarId:" + csarId + " operationalState:"\r
- + operationalState);\r
- if (ToolUtil.isEmptyString(csarId)) {\r
- LOG.error("update csar status fail, csarid is null");\r
- return Response.serverError().build();\r
- }\r
- try {\r
- // UpdatePackageResponse result = new UpdatePackageResponse();\r
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");\r
- String currentTime = sdf1.format(new Date());\r
- PackageData packageInfo = new PackageData();\r
- if (operationalState != null) {\r
- packageInfo.setOperationalState(operationalState);\r
- }\r
- if (usageState != null) {\r
- packageInfo.setUsageState(usageState);\r
- }\r
- if (onBoardState != null) {\r
- packageInfo.setOnBoardState(onBoardState);\r
- }\r
- if (processState != null) {\r
- packageInfo.setProcessState(processState);\r
- }\r
- if (deletionPending != null) {\r
- packageInfo.setDeletionPending(deletionPending);\r
- }\r
- packageInfo.setModifyTime(currentTime);\r
- PackageManager.getInstance().updatePackage(packageInfo, csarId);\r
- // ArrayList<PackageData> pacackgeList = PackageWrapperUtil.getPackageInfoById(csarId);\r
- // String finalUsageState = pacackgeList.get(0).getUsageState();\r
- // result.setUsageState(finalUsageState);\r
- return Response.ok().build();\r
- } catch (CatalogResourceException e) {\r
- LOG.error("update package status by csarId from db error ! " + e.getMessage());\r
- return RestUtil.getRestException(e.getMessage());\r
- }\r
+ private void delCsarData(String csarId) {\r
+ updatePackageStatus(csarid, null, null, null, CommonConstant.PACKAGE_STATUS_DELETING, null);\r
+ String packagePath = PackageWrapperUtil.getPackagePath(csarId);\r
+ if (packagePath == null) {\r
+ LOG.error("package path is null! ");\r
+ return;\r
+ }\r
+ FileManagerFactory.createFileManager().delete(packagePath);\r
+ try {\r
+ PackageManager.getInstance().deletePackage(csarId);\r
+ } catch (CatalogResourceException e1) {\r
+ LOG.error("delete package by csarId from db error ! " + e1.getMessage());\r
+ }\r
+ // delete template data from db\r
+ PackageData packageData = new PackageData();\r
+ packageData.setCsarId(csarId);\r
+ try {\r
+ TemplateManager.getInstance().deleteServiceTemplateByCsarPackageInfo(packageData);\r
+ } catch (CatalogResourceException e2) {\r
+ LOG.error("delete template data from db error! csarId = " + csarId);\r
+ }\r
+ // publishDelFinishCometdMessage(csarid, "true");\r
}\r
\r
- public Response downloadCsarPackagesById(String csarId) {\r
- ArrayList<PackageData> packageList = PackageWrapperUtil.getPackageInfoById(csarId);\r
- String packageName = null;\r
- if (null != packageList && packageList.size() > 0) {\r
- packageName = packageList.get(0).getName();\r
- }\r
- String path = ToolUtil.getCatalogueCsarPath() + File.separator + packageName;\r
- File csarFile = new File(path);\r
- if (!csarFile.exists()) {\r
- return Response.status(Status.NOT_FOUND).build();\r
- }\r
+ // private void publishDelFinishCometdMessage(String csarid, String csarDelStatus) {\r
+ // if (isInstanceTemplate) {\r
+ // LOG.info("delete instance Template finish. csarid:{}", csarid);\r
+ // return;\r
+ // }\r
+ // try {\r
+ // Map<String, Object> cometdMessage = new HashMap<String, Object>();\r
+ // cometdMessage.put("csarid", csarid);\r
+ // cometdMessage.put("status", csarDelStatus);\r
+ // CometdService.getInstance().publish(CommonConstant.COMETD_CHANNEL_PACKAGE_DELETE,\r
+ // cometdMessage);\r
+ // } catch (CometdException e) {\r
+ // LOG.error("publish delfinish cometdmsg fail.", e);\r
+ // }\r
+ // }\r
+ }\r
\r
- try {\r
- InputStream fis = new BufferedInputStream(new FileInputStream(path));\r
- return Response\r
- .ok(fis)\r
- .header("Content-Disposition",\r
- "attachment; filename=\"" + csarFile.getName() + "\"").build();\r
- } catch (Exception e) {\r
- LOG.error("download vnf package fail.", e);\r
- return RestUtil.getRestException(e.getMessage());\r
- }\r
+ /**\r
+ * update package status.\r
+ * @param csarId package id\r
+ * @param operationalState package operational state\r
+ * @param usageState package usage state\r
+ * @param onBoardState package onboard state\r
+ * @param processState package process state\r
+ * @param deletionPending package deletionPending status\r
+ * @return Response\r
+ */\r
+ public Response updatePackageStatus(String csarId, String operationalState, String usageState,\r
+ String onBoardState, String processState, String deletionPending) {\r
+ LOG.info("update package status info.csarId:" + csarId + " operationalState:"\r
+ + operationalState);\r
+ if (ToolUtil.isEmptyString(csarId)) {\r
+ LOG.error("update csar status fail, csarid is null");\r
+ return Response.serverError().build();\r
+ }\r
+ try {\r
+ // UpdatePackageResponse result = new UpdatePackageResponse();\r
+ PackageData packageInfo = new PackageData();\r
+ if (operationalState != null) {\r
+ packageInfo.setOperationalState(operationalState);\r
+ }\r
+ if (usageState != null) {\r
+ packageInfo.setUsageState(usageState);\r
+ }\r
+ if (onBoardState != null) {\r
+ packageInfo.setOnBoardState(onBoardState);\r
+ }\r
+ if (processState != null) {\r
+ packageInfo.setProcessState(processState);\r
+ }\r
+ if (deletionPending != null) {\r
+ packageInfo.setDeletionPending(deletionPending);\r
+ }\r
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");\r
+ String currentTime = sdf1.format(new Date());\r
+ packageInfo.setModifyTime(currentTime);\r
+ PackageManager.getInstance().updatePackage(packageInfo, csarId);\r
+ // ArrayList<PackageData> pacackgeList = PackageWrapperUtil.getPackageInfoById(csarId);\r
+ // String finalUsageState = pacackgeList.get(0).getUsageState();\r
+ // result.setUsageState(finalUsageState);\r
+ return Response.ok().build();\r
+ } catch (CatalogResourceException e1) {\r
+ LOG.error("update package status by csarId from db error ! " + e1.getMessage());\r
+ return RestUtil.getRestException(e1.getMessage());\r
}\r
+ }\r
\r
- public Response queryPackageListByCond(String name, String provider, String version,\r
- String deletionPending, String type) {\r
- ArrayList<PackageData> dbresult = new ArrayList<PackageData>();\r
- ArrayList<PackageMeta> result = new ArrayList<PackageMeta>();\r
- LOG.info("query package info.name:" + name + " provider:" + provider + " version" + version\r
- + " deletionPending" + deletionPending + " type:" + type);\r
- try {\r
- dbresult =\r
- PackageManager.getInstance().queryPackage(name, provider, version,\r
- deletionPending, type);\r
- result = PackageWrapperUtil.packageDataList2PackageMetaList(dbresult);\r
- return Response.ok(result).build();\r
- } catch (CatalogResourceException e) {\r
- LOG.error("query package by csarId from db error ! " + e.getMessage());\r
- return RestUtil.getRestException(e.getMessage());\r
- }\r
+ /**\r
+ * download package by package id.\r
+ * @param csarId package id\r
+ * @return Response\r
+ */\r
+ public Response downloadCsarPackagesById(String csarId) {\r
+ ArrayList<PackageData> packageList = PackageWrapperUtil.getPackageInfoById(csarId);\r
+ String packageName = null;\r
+ if (null != packageList && packageList.size() > 0) {\r
+ packageName = packageList.get(0).getName();\r
+ }\r
+ String path = ToolUtil.getCatalogueCsarPath() + File.separator + packageName;\r
+ File csarFile = new File(path);\r
+ if (!csarFile.exists()) {\r
+ return Response.status(Status.NOT_FOUND).build();\r
}\r
\r
- public Response getCsarFileUri(String csarId, String relativePath) {\r
- try {\r
- CsarFileUriResponse result = getCsarFileDownloadUri(csarId, relativePath);\r
- return Response.ok(result).build();\r
- } catch (CatalogResourceException e) {\r
- LOG.error("Query CSAR package by ID failed ! csarId = " + csarId);\r
- }\r
+ try {\r
+ InputStream fis = new BufferedInputStream(new FileInputStream(path));\r
+ return Response.ok(fis)\r
+ .header("Content-Disposition", "attachment; filename=\"" + csarFile.getName() + "\"")\r
+ .build();\r
+ } catch (Exception e1) {\r
+ LOG.error("download vnf package fail.", e1);\r
+ return RestUtil.getRestException(e1.getMessage());\r
+ }\r
+ }\r
\r
- return Response.serverError().build();\r
+ /**\r
+ * query package list by condition.\r
+ * @param name package name\r
+ * @param provider package provider\r
+ * @param version package version\r
+ * @param deletionPending package deletionPending\r
+ * @param type package type\r
+ * @return Response\r
+ */\r
+ public Response queryPackageListByCond(String name, String provider, String version,\r
+ String deletionPending, String type) {\r
+ ArrayList<PackageData> dbresult = new ArrayList<PackageData>();\r
+ ArrayList<PackageMeta> result = new ArrayList<PackageMeta>();\r
+ LOG.info("query package info.name:" + name + " provider:" + provider + " version" + version\r
+ + " deletionPending" + deletionPending + " type:" + type);\r
+ try {\r
+ dbresult =\r
+ PackageManager.getInstance().queryPackage(name, provider, version, deletionPending, type);\r
+ result = PackageWrapperUtil.packageDataList2PackageMetaList(dbresult);\r
+ return Response.ok(result).build();\r
+ } catch (CatalogResourceException e1) {\r
+ LOG.error("query package by csarId from db error ! " + e1.getMessage());\r
+ return RestUtil.getRestException(e1.getMessage());\r
}\r
+ }\r
\r
- public CsarFileUriResponse getCsarFileDownloadUri(String csarId, String relativePath)\r
- throws CatalogResourceException {\r
- CsarFileUriResponse result = new CsarFileUriResponse();\r
- String downloadUrl = null;\r
- String downloadUri = null;\r
- String localPath = null;\r
- ArrayList<PackageData> packageList =\r
- PackageManager.getInstance().queryPackageByCsarId(csarId);\r
- if (packageList != null && packageList.size() != 0) {\r
- String packageName = packageList.get(0).getName();\r
- String relativeUri = packageList.get(0).getDownloadUri() + packageName;\r
- downloadUri = relativeUri + relativePath;\r
- downloadUrl = PackageWrapperUtil.getUrl(downloadUri);\r
- String httpUri = HttpServerPathConfig.getHttpServerPath() + downloadUri;\r
- localPath = PackageWrapperUtil.getLocalPath(httpUri);\r
- }\r
- result.setDownloadUri(downloadUrl);\r
- result.setLocalPath(localPath);\r
- return result;\r
+ /**\r
+ * get package file uri.\r
+ * @param csarId package id\r
+ * @param relativePath file relative path\r
+ * @return Response\r
+ */\r
+ public Response getCsarFileUri(String csarId, String relativePath) {\r
+ try {\r
+ CsarFileUriResponse result = getCsarFileDownloadUri(csarId, relativePath);\r
+ return Response.ok(result).build();\r
+ } catch (CatalogResourceException e1) {\r
+ LOG.error("Query CSAR package by ID failed ! csarId = " + csarId);\r
}\r
\r
- /**\r
- * @param ftpUrl\r
- * @param packageName\r
- * @return\r
- */\r
- public Response uploadPackageFromFtp(UploadPackageFromFtpRequest request) {\r
- PackageBasicInfo basicInfo = new PackageBasicInfo();\r
- String tempDirName = null;\r
- String fileName = "";\r
- UploadPackageResponse result = new UploadPackageResponse();\r
- basicInfo.setProvider("zte");\r
- basicInfo.setType(EnumType.NSAR);\r
- basicInfo.setVersion("v1.0");\r
- PackageMeta packageMeta = new PackageMeta();\r
+ return Response.serverError().build();\r
+ }\r
\r
- try {\r
- String ftpUrl = request.getFtpUrl();\r
- String packageName = PackageWrapperUtil.getPackageName(ftpUrl);\r
- fileName = ToolUtil.processFileName(packageName);\r
- tempDirName = ToolUtil.getTempDir(CommonConstant.CATALOG_CSAR_DIR_NAME, fileName);\r
- PackageWrapperUtil.downPackageFromFtp(ftpUrl, tempDirName);\r
- String path =\r
- basicInfo.getType().toString() + File.separator + basicInfo.getProvider()\r
- + File.separator + fileName.replace(".csar", "") + File.separator\r
- + basicInfo.getVersion();\r
- LOG.info("dest path is : " + path);\r
- packageMeta = PackageWrapperUtil.getPackageMeta(fileName, tempDirName, basicInfo);\r
- String dowloadUri = File.separator + path + File.separator + fileName;\r
- packageMeta.setDownloadUri(dowloadUri);\r
- LOG.info("packageMeta = " + ToolUtil.objectToString(packageMeta));\r
- String destPath = File.separator + path;\r
- boolean uploadResult =\r
- FileManagerFactory.createFileManager().upload(tempDirName, destPath);\r
- if (uploadResult == true) {\r
- String newZipPath = tempDirName + fileName.replace(".csar", ".zip");\r
- ZipCompressor zc = new ZipCompressor(newZipPath);\r
- String metadataPath = tempDirName + File.separator + CommonConstant.TOSCA_METADATA;\r
- String definitions = tempDirName + File.separator + CommonConstant.DEFINITIONS;\r
- zc.compress(metadataPath, definitions);\r
- // 调袁虎的接口，将fileLocation 和 packageId传给他，由他去解析包，并向数据库存储数据\r
- String parseResult =\r
- ModelParserFactory.getInstance().parse(packageMeta.getCsarId(), newZipPath,\r
- EnumPackageFormat.valueOf(packageMeta.getFormat()));\r
- PackageData packageData = PackageWrapperUtil.getPackageData(packageMeta);\r
- PackageManager.getInstance().addPackage(packageData);\r
- }\r
- LOG.info("upload package file end, fileName:" + fileName);\r
- result.setCsarId(packageMeta.getCsarId());\r
- return Response.ok(result).build();\r
- } catch (Exception e) {\r
- LOG.error("upload package fail.", e);\r
- String csarId = packageMeta.getCsarId();\r
- if (csarId != null) {\r
- try {\r
- PackageManager.getInstance().deletePackage(csarId);\r
- } catch (CatalogResourceException e1) {\r
- LOG.error("delete package failed !");\r
- }\r
- }\r
- return RestUtil.getRestException(e.getMessage());\r
- } finally {\r
- if (tempDirName != null) {\r
- ToolUtil.deleteDir(new File(tempDirName));\r
- }\r
- }\r
+ /**\r
+ * get package file download uri.\r
+ * @param csarId package id\r
+ * @param relativePath package file relative path\r
+ * @return CsarFileUriResponse\r
+ * @throws CatalogResourceException\r
+ */\r
+ public CsarFileUriResponse getCsarFileDownloadUri(String csarId, String relativePath)\r
+ throws CatalogResourceException {\r
+ CsarFileUriResponse result = new CsarFileUriResponse();\r
+ String downloadUrl = null;\r
+ String downloadUri = null;\r
+ String localPath = null;\r
+ ArrayList<PackageData> packageList = PackageManager.getInstance().queryPackageByCsarId(csarId);\r
+ if (packageList != null && packageList.size() != 0) {\r
+ String packageName = packageList.get(0).getName();\r
+ String relativeUri = packageList.get(0).getDownloadUri() + packageName;\r
+ downloadUri = relativeUri + relativePath;\r
+ downloadUrl = PackageWrapperUtil.getUrl(downloadUri);\r
+ String httpUri = HttpServerPathConfig.getHttpServerPath() + downloadUri;\r
+ localPath = PackageWrapperUtil.getLocalPath(httpUri);\r
}\r
+ result.setDownloadUri(downloadUrl);\r
+ result.setLocalPath(localPath);\r
+ return result;\r
+ }\r
\r
- public Response getCsarPlansUri(String csarId) {\r
- ArrayList<FileLink> fileLinks = new ArrayList<FileLink>();\r
- LOG.info("start query plans of package.csarId:" + csarId);\r
- ArrayList<PackageData> packageList = new ArrayList<PackageData>();\r
+ /**\r
+ * upload package from ftp.\r
+ * @param request package basic information\r
+ * @return Response\r
+ */\r
+ public Response uploadPackageFromFtp(UploadPackageFromFtpRequest request) {\r
+ PackageBasicInfo basicInfo = new PackageBasicInfo();\r
+ String tempDirName = null;\r
+ String fileName = "";\r
+ UploadPackageResponse result = new UploadPackageResponse();\r
+ basicInfo.setProvider("zte");\r
+ basicInfo.setType(EnumType.NSAR);\r
+ basicInfo.setVersion("v1.0");\r
+ PackageMeta packageMeta = new PackageMeta();\r
+\r
+ try {\r
+ String ftpUrl = request.getFtpUrl();\r
+ String packageName = PackageWrapperUtil.getPackageName(ftpUrl);\r
+ fileName = ToolUtil.processFileName(packageName);\r
+ tempDirName = ToolUtil.getTempDir(CommonConstant.CATALOG_CSAR_DIR_NAME, fileName);\r
+ PackageWrapperUtil.downPackageFromFtp(ftpUrl, tempDirName);\r
+ String path =\r
+ basicInfo.getType().toString() + File.separator + basicInfo.getProvider()\r
+ + File.separator + fileName.replace(".csar", "") + File.separator\r
+ + basicInfo.getVersion();\r
+ LOG.info("dest path is : " + path);\r
+ packageMeta = PackageWrapperUtil.getPackageMeta(fileName, tempDirName, basicInfo);\r
+ String dowloadUri = File.separator + path + File.separator + fileName;\r
+ packageMeta.setDownloadUri(dowloadUri);\r
+ LOG.info("packageMeta = " + ToolUtil.objectToString(packageMeta));\r
+ String destPath = File.separator + path;\r
+ boolean uploadResult = FileManagerFactory.createFileManager().upload(tempDirName, destPath);\r
+ if (uploadResult == true) {\r
+ String newZipPath = tempDirName + fileName.replace(".csar", ".zip");\r
+ ZipCompressor zc = new ZipCompressor(newZipPath);\r
+ String metadataPath = tempDirName + File.separator + CommonConstant.TOSCA_METADATA;\r
+ String definitions = tempDirName + File.separator + CommonConstant.DEFINITIONS;\r
+ zc.compress(metadataPath, definitions);\r
+ // 调袁虎的接口，将fileLocation 和 packageId传给他，由他去解析包，并向数据库存储数据\r
+// String parseResult =\r
+ ModelParserFactory.getInstance().parse(packageMeta.getCsarId(), newZipPath,\r
+ EnumPackageFormat.valueOf(packageMeta.getFormat()));\r
+ PackageData packageData = PackageWrapperUtil.getPackageData(packageMeta);\r
+ PackageManager.getInstance().addPackage(packageData);\r
+ }\r
+ LOG.info("upload package file end, fileName:" + fileName);\r
+ result.setCsarId(packageMeta.getCsarId());\r
+ return Response.ok(result).build();\r
+ } catch (Exception e1) {\r
+ LOG.error("upload package fail.", e1);\r
+ String csarId = packageMeta.getCsarId();\r
+ if (csarId != null) {\r
try {\r
- packageList = PackageManager.getInstance().queryPackageByCsarId(csarId);\r
- if (packageList != null && packageList.size() != 0) {\r
- String downloadUri = packageList.get(0).getDownloadUri();\r
- fileLinks = FileManagerFactory.createFileManager().queryWorkFlow(downloadUri);\r
- }\r
- return Response.ok(fileLinks).build();\r
- } catch (CatalogResourceException e) {\r
- LOG.error("Query plans of package by ID failed ! csarId = " + csarId);\r
- return RestUtil.getRestException(e.getMessage());\r
+ PackageManager.getInstance().deletePackage(csarId);\r
+ } catch (CatalogResourceException e2) {\r
+ LOG.error("delete package failed !");\r
}\r
- // return Response.serverError().build();\r
+ }\r
+ return RestUtil.getRestException(e1.getMessage());\r
+ } finally {\r
+ if (tempDirName != null) {\r
+ ToolUtil.deleteDir(new File(tempDirName));\r
+ }\r
+ }\r
+ }\r
+\r
+ /**\r
+ * get csar plan uri.\r
+ * @param csarId package id\r
+ * @return Response\r
+ */\r
+ public Response getCsarPlansUri(String csarId) {\r
+ ArrayList<FileLink> fileLinks = new ArrayList<FileLink>();\r
+ LOG.info("start query plans of package.csarId:" + csarId);\r
+ ArrayList<PackageData> packageList = new ArrayList<PackageData>();\r
+ try {\r
+ packageList = PackageManager.getInstance().queryPackageByCsarId(csarId);\r
+ if (packageList != null && packageList.size() != 0) {\r
+ String downloadUri = packageList.get(0).getDownloadUri();\r
+ fileLinks = FileManagerFactory.createFileManager().queryWorkFlow(downloadUri);\r
+ }\r
+ return Response.ok(fileLinks).build();\r
+ } catch (CatalogResourceException e1) {\r
+ LOG.error("Query plans of package by ID failed ! csarId = " + csarId);\r
+ return RestUtil.getRestException(e1.getMessage());\r
}\r
+ // return Response.serverError().build();\r
+ }\r
}\r
import org.openo.commontosca.catalog.entity.request.PackageBasicInfo;\r
import org.openo.commontosca.catalog.ftp.Ftp;\r
import org.openo.commontosca.catalog.model.entity.ServiceTemplate;\r
+import org.openo.commontosca.catalog.model.externalservice.entity.lifecycle.InstanceEntity;\r
import org.openo.commontosca.catalog.model.externalservice.lifecycle.LifeCycleServiceConsumer;\r
import org.openo.commontosca.catalog.common.ToolUtil;\r
import org.openo.commontosca.catalog.db.entity.PackageData;\r
-import org.openo.commontosca.catalog.entity.CSARPackage;\r
+import org.openo.commontosca.catalog.entity.CsarPackage;\r
import org.openo.commontosca.catalog.entity.EnumOnboardState;\r
import org.openo.commontosca.catalog.entity.EnumOperationalState;\r
import org.openo.commontosca.catalog.entity.EnumUsageState;\r
import org.openo.commontosca.catalog.entity.response.PackageMeta;\r
import org.openo.commontosca.catalog.ftp.FtpUtil;\r
-import org.openo.commontosca.catalog.model.externalservice.entity.lifecycleEnity.InstanceEntity;\r
import org.slf4j.Logger;\r
import org.slf4j.LoggerFactory;\r
\r
* \r
*/\r
public class PackageWrapperUtil {\r
- private static final Logger LOG = LoggerFactory.getLogger(PackageWrapperUtil.class);\r
+ private static final Logger LOG = LoggerFactory.getLogger(PackageWrapperUtil.class);\r
\r
\r
- public static List<CSARPackage> formJson2Packages(String packageJson) {\r
- List<CSARPackage> packageList =\r
- new Gson().fromJson(packageJson, new TypeToken<List<CSARPackage>>() {}.getType());\r
- if (null == packageList || packageList.size() == 0) {\r
- throw new NotFoundException("Package do not exist");\r
- }\r
- return packageList;\r
+ public static List<CsarPackage> formJson2Packages(String packageJson) {\r
+ List<CsarPackage> packageList =\r
+ new Gson().fromJson(packageJson, new TypeToken<List<CsarPackage>>() {}.getType());\r
+ if (null == packageList || packageList.size() == 0) {\r
+ throw new NotFoundException("Package do not exist");\r
}\r
+ return packageList;\r
+ }\r
\r
- public static long getPacakgeSize(String fileLocation) {\r
- File file = new File(fileLocation);\r
- return file.length();\r
- }\r
+ public static long getPacakgeSize(String fileLocation) {\r
+ File file = new File(fileLocation);\r
+ return file.length();\r
+ }\r
\r
- public static PackageData getPackageData(PackageMeta meta) {\r
- PackageData packageData = new PackageData();\r
- packageData.setCreateTime(meta.getCreateTime());\r
- packageData.setDeletionPending(String.valueOf(meta.isDeletionPending()));\r
- packageData.setDownloadUri(meta.getDownloadUri());\r
- packageData.setFormat(meta.getFormat());\r
- packageData.setModifyTime(meta.getModifyTime());\r
- packageData.setName(meta.getName());\r
- packageData.setCsarId(meta.getCsarId());\r
- packageData.setOperationalState(meta.getOperationalState().toString());\r
- packageData.setProvider(meta.getProvider());\r
- String fileSize = meta.getSize();\r
- packageData.setSize(fileSize);\r
- packageData.setType(meta.getType());\r
- packageData.setUsageState(meta.getUsageState().toString());\r
- packageData.setVersion(meta.getVersion());\r
- packageData.setOnBoardState(meta.getOnBoardState());\r
- packageData.setProcessState(meta.getProcessState().toString());\r
- return packageData;\r
- }\r
+ public static PackageData getPackageData(PackageMeta meta) {\r
+ PackageData packageData = new PackageData();\r
+ packageData.setCreateTime(meta.getCreateTime());\r
+ packageData.setDeletionPending(String.valueOf(meta.isDeletionPending()));\r
+ packageData.setDownloadUri(meta.getDownloadUri());\r
+ packageData.setFormat(meta.getFormat());\r
+ packageData.setModifyTime(meta.getModifyTime());\r
+ packageData.setName(meta.getName());\r
+ packageData.setCsarId(meta.getCsarId());\r
+ packageData.setOperationalState(meta.getOperationalState().toString());\r
+ packageData.setProvider(meta.getProvider());\r
+ String fileSize = meta.getSize();\r
+ packageData.setSize(fileSize);\r
+ packageData.setType(meta.getType());\r
+ packageData.setUsageState(meta.getUsageState().toString());\r
+ packageData.setVersion(meta.getVersion());\r
+ packageData.setOnBoardState(meta.getOnBoardState());\r
+ packageData.setProcessState(meta.getProcessState().toString());\r
+ return packageData;\r
+ }\r
\r
- public static boolean isUploadEnd(String contentRange, String csarName) {\r
- String range = contentRange;\r
- range = range.replace("bytes", "").trim();\r
- range = range.substring(0, range.indexOf("/"));\r
- String size =\r
- contentRange.substring(contentRange.indexOf("/") + 1, contentRange.length()).trim();\r
- int fileSize = Integer.parseInt(size);\r
- String[] ranges = range.split("-");\r
- int startPosition = Integer.parseInt(ranges[0]);\r
- if (startPosition == 0) {\r
- // delPackageBySync(csarName);\r
- }\r
- // index start from 0\r
- int endPosition = Integer.parseInt(ranges[1]) + 1;\r
- if (endPosition >= fileSize) {\r
- return true;\r
- }\r
- return false;\r
+ public static boolean isUploadEnd(String contentRange, String csarName) {\r
+ String range = contentRange;\r
+ range = range.replace("bytes", "").trim();\r
+ range = range.substring(0, range.indexOf("/"));\r
+ String size =\r
+ contentRange.substring(contentRange.indexOf("/") + 1, contentRange.length()).trim();\r
+ int fileSize = Integer.parseInt(size);\r
+ String[] ranges = range.split("-");\r
+ int startPosition = Integer.parseInt(ranges[0]);\r
+ if (startPosition == 0) {\r
+ // delPackageBySync(csarName);\r
}\r
-\r
- public static ArrayList<PackageData> getPackageInfoById(String csarId) {\r
- ArrayList<PackageData> result = new ArrayList<PackageData>();\r
- try {\r
- result = PackageManager.getInstance().queryPackageByCsarId(csarId);\r
- } catch (CatalogResourceException e) {\r
- LOG.error("query package by csarId from db error ! " + e.getMessage());\r
- }\r
- return result;\r
+ // index start from 0\r
+ int endPosition = Integer.parseInt(ranges[1]) + 1;\r
+ if (endPosition >= fileSize) {\r
+ return true;\r
}\r
+ return false;\r
+ }\r
\r
- public static PackageMeta getPackageMeta(String fileName, String fileLocation,\r
- PackageBasicInfo basic) {\r
- PackageMeta packageMeta = new PackageMeta();\r
- long size = getPacakgeSize(fileLocation);\r
- packageMeta.setFormat(basic.getFormat());\r
- String packageId = ToolUtil.generateId();\r
- packageMeta.setName(fileName.replace(CommonConstant.CSAR_SUFFIX, ""));\r
- packageMeta.setCsarId(packageId);\r
- packageMeta.setType(basic.getType().toString());\r
- packageMeta.setVersion(basic.getVersion());\r
- packageMeta.setProvider(basic.getProvider());\r
- packageMeta.setDeletionPending(false);\r
- String sizeStr = ToolUtil.formatFileSize(size);\r
- packageMeta.setSize(sizeStr);\r
- SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");\r
- String currentTime = sdf1.format(new Date());\r
- packageMeta.setCreateTime(currentTime);\r
- packageMeta.setModifyTime(currentTime);\r
- packageMeta.setOperationalState(EnumOperationalState.Disabled);\r
- packageMeta.setUsageState(EnumUsageState.NotInUse);\r
- packageMeta.setOnBoardState(EnumOnboardState.nonOnBoarded.getValue());\r
- packageMeta.setProcessState(EnumProcessState.normal);\r
- return packageMeta;\r
+ public static ArrayList<PackageData> getPackageInfoById(String csarId) {\r
+ ArrayList<PackageData> result = new ArrayList<PackageData>();\r
+ try {\r
+ result = PackageManager.getInstance().queryPackageByCsarId(csarId);\r
+ } catch (CatalogResourceException e) {\r
+ LOG.error("query package by csarId from db error ! " + e.getMessage());\r
}\r
+ return result;\r
+ }\r
\r
- public static String getPackagePath(String csarId) {\r
- ArrayList<PackageData> packageList = new ArrayList<PackageData>();\r
- String downloadUri = null;\r
- try {\r
- packageList = PackageManager.getInstance().queryPackageByCsarId(csarId);\r
- downloadUri = packageList.get(0).getDownloadUri();\r
- } catch (CatalogResourceException e) {\r
- LOG.error("Query CSAR package by ID failed ! csarId = " + csarId);\r
- }\r
- return downloadUri;\r
+ public static PackageMeta getPackageMeta(String fileName, String fileLocation,\r
+ PackageBasicInfo basic) {\r
+ PackageMeta packageMeta = new PackageMeta();\r
+ long size = getPacakgeSize(fileLocation);\r
+ packageMeta.setFormat(basic.getFormat());\r
+ String packageId = ToolUtil.generateId();\r
+ packageMeta.setName(fileName.replace(CommonConstant.CSAR_SUFFIX, ""));\r
+ packageMeta.setCsarId(packageId);\r
+ packageMeta.setType(basic.getType().toString());\r
+ packageMeta.setVersion(basic.getVersion());\r
+ packageMeta.setProvider(basic.getProvider());\r
+ packageMeta.setDeletionPending(false);\r
+ String sizeStr = ToolUtil.getFormatFileSize(size);\r
+ packageMeta.setSize(sizeStr);\r
+ SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");\r
+ String currentTime = sdf1.format(new Date());\r
+ packageMeta.setCreateTime(currentTime);\r
+ packageMeta.setModifyTime(currentTime);\r
+ packageMeta.setOperationalState(EnumOperationalState.Disabled);\r
+ packageMeta.setUsageState(EnumUsageState.NotInUse);\r
+ packageMeta.setOnBoardState(EnumOnboardState.nonOnBoarded.getValue());\r
+ packageMeta.setProcessState(EnumProcessState.normal);\r
+ return packageMeta;\r
+ }\r
+\r
+ public static String getPackagePath(String csarId) {\r
+ ArrayList<PackageData> packageList = new ArrayList<PackageData>();\r
+ String downloadUri = null;\r
+ try {\r
+ packageList = PackageManager.getInstance().queryPackageByCsarId(csarId);\r
+ downloadUri = packageList.get(0).getDownloadUri();\r
+ } catch (CatalogResourceException e) {\r
+ LOG.error("Query CSAR package by ID failed ! csarId = " + csarId);\r
}\r
+ return downloadUri;\r
+ }\r
\r
\r
- public static HashSet<String> instanceConvertToHashSet(ArrayList<InstanceEntity> instancelist) {\r
- HashSet<String> result = new HashSet<String>();\r
- if (instancelist != null) {\r
- for (InstanceEntity instance : instancelist) {\r
- result.add(instance.getServiceTemplateId());\r
- }\r
- }\r
- return result;\r
+ public static HashSet<String> instanceConvertToHashSet(ArrayList<InstanceEntity> instancelist) {\r
+ HashSet<String> result = new HashSet<String>();\r
+ if (instancelist != null) {\r
+ for (InstanceEntity instance : instancelist) {\r
+ result.add(instance.getServiceTemplateId());\r
+ }\r
}\r
+ return result;\r
+ }\r
\r
- public static boolean isExistInstanceCSAR(String csarId) throws CometdException {\r
- // 查询各O（GSO、NFVO、SDNO）的资源实例数据库，查询指定csarId对应的服务模版\r
- ArrayList<ServiceTemplate> templateList = queryAvailableTemplatesByCsar(csarId);\r
- // 调生命周期的接口查询所有实例，查询实例中是否包含指定csarId对应的服务模析ID\r
- HashSet<String> templateSet =\r
- instanceConvertToHashSet(LifeCycleServiceConsumer.getInstances());\r
- if (templateList != null && templateList.size() > 0 && templateSet.size() > 0) {\r
- for (ServiceTemplate temp : templateList) {\r
- if (templateSet.contains(temp.getServiceTemplateId())) {\r
- return true;\r
- }\r
- }\r
+ public static boolean isExistInstanceCSAR(String csarId) throws CometdException {\r
+ // 查询各O（GSO、NFVO、SDNO）的资源实例数据库，查询指定csarId对应的服务模版\r
+ ArrayList<ServiceTemplate> templateList = queryAvailableTemplatesByCsar(csarId);\r
+ // 调生命周期的接口查询所有实例，查询实例中是否包含指定csarId对应的服务模析ID\r
+ HashSet<String> templateSet = instanceConvertToHashSet(LifeCycleServiceConsumer.getInstances());\r
+ if (templateList != null && templateList.size() > 0 && templateSet.size() > 0) {\r
+ for (ServiceTemplate temp : templateList) {\r
+ if (templateSet.contains(temp.getServiceTemplateId())) {\r
+ return true;\r
}\r
- return false;\r
+ }\r
}\r
+ return false;\r
+ }\r
\r
- public static ArrayList<ServiceTemplate> queryAvailableTemplatesByCsar(String csarId) {\r
- return null;\r
- // ArrayList<ServiceTemplate> resultlist = new ArrayList<ServiceTemplate>();\r
- // String filter = LDAPUtil.getObjectClassFilter(LDAPConstant.OBJECTCLASS_CSAR);\r
- // String result =\r
- // LDAPDataFactory.getInstance().queryData(EnumLDAPData.SERVICETEMPLATE, null, false,\r
- // filter);\r
- // Type type = new TypeToken<ArrayList<ServiceTemplate>>() {}.getType();\r
- // ArrayList<ServiceTemplate> templateList = new Gson().fromJson(result, type);\r
- // for (ServiceTemplate temp : templateList) {\r
- // if (temp.getCsarid().equals(csarId)) {\r
- // resultlist.add(temp);\r
- // }\r
- // }\r
- // return resultlist;\r
- }\r
-\r
- // public static void publishDeletionPendingStatusCometdMessage(String csarid) {\r
- // try {\r
- // Map<String, Object> cometdMessage = new HashMap<String, Object>();\r
- // cometdMessage.put("csarid", csarid);\r
- // cometdMessage.put("status", "deletionPending");\r
- // CometdService.getInstance().publish(CommonConstant.COMETD_CHANNEL_PACKAGE_DELETE,\r
- // cometdMessage);\r
- // } catch (CometdException e) {\r
- // LOG.error("publish delfinish cometdmsg fail.", e);\r
+ public static ArrayList<ServiceTemplate> queryAvailableTemplatesByCsar(String csarId) {\r
+ return null;\r
+ // ArrayList<ServiceTemplate> resultlist = new ArrayList<ServiceTemplate>();\r
+ // String filter = LDAPUtil.getObjectClassFilter(LDAPConstant.OBJECTCLASS_CSAR);\r
+ // String result =\r
+ // LDAPDataFactory.getInstance().queryData(EnumLDAPData.SERVICETEMPLATE, null, false,\r
+ // filter);\r
+ // Type type = new TypeToken<ArrayList<ServiceTemplate>>() {}.getType();\r
+ // ArrayList<ServiceTemplate> templateList = new Gson().fromJson(result, type);\r
+ // for (ServiceTemplate temp : templateList) {\r
+ // if (temp.getCsarid().equals(csarId)) {\r
+ // resultlist.add(temp);\r
// }\r
// }\r
+ // return resultlist;\r
+ }\r
\r
- /**\r
- * @param ftpUrl\r
- * @return\r
- */\r
- public static Ftp getFtpDetail(String ftpUrl) {\r
- Ftp ftp = new Ftp();\r
- int index1 = ftpUrl.indexOf("ftp://");\r
- int index2 = ftpUrl.indexOf("@");\r
- String userPassSubString = ftpUrl.substring(index1, index2);\r
- int index3 = userPassSubString.indexOf(":");\r
- String userName = userPassSubString.substring(0, index3);\r
- String pass = userPassSubString.substring(index3 + 1);\r
- String subString1 = ftpUrl.substring(index2 + 1);\r
- int index4 = subString1.indexOf("/");\r
- String ipPortSubString = subString1.substring(0, index4);\r
- int index5 = ipPortSubString.indexOf(":");\r
- String ip = ipPortSubString.substring(0, index5);\r
- String port = ipPortSubString.substring(index5 + 1);\r
- int index6 = ftpUrl.lastIndexOf("/");\r
- String path = ftpUrl.substring(0, index6);\r
- ftp.setIpAddr(ip);\r
- ftp.setPath(path);\r
- ftp.setPort(Integer.valueOf(port));\r
- ftp.setPwd(pass);\r
- ftp.setUserName(userName);\r
- return ftp;\r
- }\r
+ // public static void publishDeletionPendingStatusCometdMessage(String csarid) {\r
+ // try {\r
+ // Map<String, Object> cometdMessage = new HashMap<String, Object>();\r
+ // cometdMessage.put("csarid", csarid);\r
+ // cometdMessage.put("status", "deletionPending");\r
+ // CometdService.getInstance().publish(CommonConstant.COMETD_CHANNEL_PACKAGE_DELETE,\r
+ // cometdMessage);\r
+ // } catch (CometdException e) {\r
+ // LOG.error("publish delfinish cometdmsg fail.", e);\r
+ // }\r
+ // }\r
\r
- /**\r
- * @param ftpUrl\r
- * @return\r
- */\r
- // public static String getFtpDir(String ftpUrl) {\r
- // // TODO Auto-generated method stub\r
- // return null;\r
- // }\r
+ /**\r
+ * @param ftpUrl\r
+ * @return\r
+ */\r
+ public static Ftp getFtpDetail(String ftpUrl) {\r
+ Ftp ftp = new Ftp();\r
+ int index1 = ftpUrl.indexOf("ftp://");\r
+ int index2 = ftpUrl.indexOf("@");\r
+ String userPassSubString = ftpUrl.substring(index1, index2);\r
+ int index3 = userPassSubString.indexOf(":");\r
+ String userName = userPassSubString.substring(0, index3);\r
+ String pass = userPassSubString.substring(index3 + 1);\r
+ String subString1 = ftpUrl.substring(index2 + 1);\r
+ int index4 = subString1.indexOf("/");\r
+ String ipPortSubString = subString1.substring(0, index4);\r
+ int index5 = ipPortSubString.indexOf(":");\r
+ String ip = ipPortSubString.substring(0, index5);\r
+ String port = ipPortSubString.substring(index5 + 1);\r
+ int index6 = ftpUrl.lastIndexOf("/");\r
+ String path = ftpUrl.substring(0, index6);\r
+ ftp.setIpAddr(ip);\r
+ ftp.setPath(path);\r
+ ftp.setPort(Integer.valueOf(port));\r
+ ftp.setPwd(pass);\r
+ ftp.setUserName(userName);\r
+ return ftp;\r
+ }\r
\r
- /**\r
- * @param ftpUrl\r
- * @return\r
- */\r
- public static String getPackageName(String ftpUrl) {\r
- int index = ftpUrl.lastIndexOf("/");\r
- String packageName = ftpUrl.substring(index);\r
- return packageName;\r
- }\r
+ /**\r
+ * @param ftpUrl\r
+ * @return\r
+ */\r
+ // public static String getFtpDir(String ftpUrl) {\r
+ // // TODO Auto-generated method stub\r
+ // return null;\r
+ // }\r
\r
- public static void downPackageFromFtp(String ftpUrl, String tempDirName) {\r
- Ftp ftp = new Ftp();\r
- ftp = PackageWrapperUtil.getFtpDetail(ftpUrl);\r
- String remoteBaseDir = ftp.getPath();\r
- try {\r
- FtpUtil.startDown(ftp, tempDirName, remoteBaseDir);\r
- } catch (Exception e) {\r
- LOG.error("Down package from ftp failed !");\r
- }\r
- }\r
+ /**\r
+ * @param ftpUrl\r
+ * @return\r
+ */\r
+ public static String getPackageName(String ftpUrl) {\r
+ int index = ftpUrl.lastIndexOf("/");\r
+ String packageName = ftpUrl.substring(index);\r
+ return packageName;\r
+ }\r
\r
- /**\r
- * @param dbResult\r
- * @return\r
- */\r
- public static ArrayList<PackageMeta> packageDataList2PackageMetaList(\r
- ArrayList<PackageData> dbResult) {\r
- ArrayList<PackageMeta> metas = new ArrayList<PackageMeta>();\r
- PackageMeta meta = new PackageMeta();\r
- for (int i = 0; i < dbResult.size(); i++) {\r
- PackageData data = dbResult.get(i);\r
- meta = packageData2PackageMeta(data);\r
- metas.add(meta);\r
- }\r
- return metas;\r
- }\r
- \r
- public static EnumOnboardState getEnumByValue(String value) {\r
- if(value == "non-onBoarded") {\r
- return EnumOnboardState.nonOnBoarded;\r
- } else {\r
- return EnumOnboardState.onBoarded;\r
- }\r
+ public static void downPackageFromFtp(String ftpUrl, String tempDirName) {\r
+ Ftp ftp = new Ftp();\r
+ ftp = PackageWrapperUtil.getFtpDetail(ftpUrl);\r
+ String remoteBaseDir = ftp.getPath();\r
+ try {\r
+ FtpUtil.startDown(ftp, tempDirName, remoteBaseDir);\r
+ } catch (Exception e) {\r
+ LOG.error("Down package from ftp failed !");\r
}\r
+ }\r
\r
- private static PackageMeta packageData2PackageMeta(PackageData packageData) {\r
- PackageMeta meta = new PackageMeta();\r
- meta.setCsarId(packageData.getCsarId());\r
- meta.setCreateTime(packageData.getCreateTime());\r
- meta.setDeletionPending(Boolean.getBoolean(packageData.getDeletionPending()));\r
- String packageUri =\r
- packageData.getDownloadUri() + packageData.getName() + CommonConstant.CSAR_SUFFIX;\r
- String packageUrl = getUrl(packageUri);\r
- meta.setDownloadUri(packageUrl);\r
- meta.setFormat(packageData.getFormat());\r
- meta.setModifyTime(packageData.getModifyTime());\r
- meta.setName(packageData.getName());\r
- meta.setOperationalState(EnumOperationalState.valueOf(packageData.getOperationalState()));\r
- meta.setProvider(packageData.getProvider());\r
- meta.setSize(packageData.getSize());\r
- meta.setType(packageData.getType());\r
- meta.setUsageState(EnumUsageState.valueOf(packageData.getUsageState()));\r
- meta.setVersion(packageData.getVersion());\r
- meta.setOnBoardState(packageData.getOnBoardState());\r
- meta.setProcessState(EnumProcessState.valueOf(packageData.getProcessState()));\r
- return meta;\r
+ /**\r
+ * @param dbResult\r
+ * @return\r
+ */\r
+ public static ArrayList<PackageMeta> packageDataList2PackageMetaList(\r
+ ArrayList<PackageData> dbResult) {\r
+ ArrayList<PackageMeta> metas = new ArrayList<PackageMeta>();\r
+ PackageMeta meta = new PackageMeta();\r
+ for (int i = 0; i < dbResult.size(); i++) {\r
+ PackageData data = dbResult.get(i);\r
+ meta = packageData2PackageMeta(data);\r
+ metas.add(meta);\r
}\r
+ return metas;\r
+ }\r
\r
- public static String getUrl(String uri) {\r
- String url = null;\r
- if ((MsbAddrConfig.getMsbAddress().endsWith("/")) && uri.startsWith("/")) {\r
- url = MsbAddrConfig.getMsbAddress() + uri.substring(1);\r
- }\r
- url = MsbAddrConfig.getMsbAddress() + uri;\r
- String urlresult = url.replace("\\", "/");\r
- return urlresult;\r
+ public static EnumOnboardState getEnumByValue(String value) {\r
+ if (value == "non-onBoarded") {\r
+ return EnumOnboardState.nonOnBoarded;\r
+ } else {\r
+ return EnumOnboardState.onBoarded;\r
}\r
+ }\r
\r
- public static String getLocalPath(String uri) {\r
- File srcDir = new File(uri);\r
- String localPath = srcDir.getAbsolutePath();\r
- return localPath.replace("\\", "/");\r
+ private static PackageMeta packageData2PackageMeta(PackageData packageData) {\r
+ PackageMeta meta = new PackageMeta();\r
+ meta.setCsarId(packageData.getCsarId());\r
+ meta.setCreateTime(packageData.getCreateTime());\r
+ meta.setDeletionPending(Boolean.getBoolean(packageData.getDeletionPending()));\r
+ String packageUri =\r
+ packageData.getDownloadUri() + packageData.getName() + CommonConstant.CSAR_SUFFIX;\r
+ String packageUrl = getUrl(packageUri);\r
+ meta.setDownloadUri(packageUrl);\r
+ meta.setFormat(packageData.getFormat());\r
+ meta.setModifyTime(packageData.getModifyTime());\r
+ meta.setName(packageData.getName());\r
+ meta.setOperationalState(EnumOperationalState.valueOf(packageData.getOperationalState()));\r
+ meta.setProvider(packageData.getProvider());\r
+ meta.setSize(packageData.getSize());\r
+ meta.setType(packageData.getType());\r
+ meta.setUsageState(EnumUsageState.valueOf(packageData.getUsageState()));\r
+ meta.setVersion(packageData.getVersion());\r
+ meta.setOnBoardState(packageData.getOnBoardState());\r
+ meta.setProcessState(EnumProcessState.valueOf(packageData.getProcessState()));\r
+ return meta;\r
+ }\r
+\r
+ public static String getUrl(String uri) {\r
+ String url = null;\r
+ if ((MsbAddrConfig.getMsbAddress().endsWith("/")) && uri.startsWith("/")) {\r
+ url = MsbAddrConfig.getMsbAddress() + uri.substring(1);\r
}\r
+ url = MsbAddrConfig.getMsbAddress() + uri;\r
+ String urlresult = url.replace("\\", "/");\r
+ return urlresult;\r
+ }\r
\r
- /**\r
- * @param fileLocation\r
- * @return\r
- */\r
- public static PackageBasicInfo getPacageBasicInfo(String fileLocation) {\r
- PackageBasicInfo basicInfo = new PackageBasicInfo();\r
- String unzipDir = ToolUtil.getUnzipDir(fileLocation);\r
- boolean isXmlCsar = false;\r
- try {\r
- String tempfolder = unzipDir;\r
- ArrayList<String> unzipFiles = FileUtil.unzip(fileLocation, tempfolder);\r
- if (unzipFiles.isEmpty()) {\r
- isXmlCsar = true;\r
- }\r
- for (String unzipFile : unzipFiles) {\r
- if (unzipFile.endsWith(CommonConstant.CSAR_META)) {\r
- basicInfo = readCsarMeta(unzipFile);\r
- }\r
- if (ToolUtil.isYamlFile(new File(unzipFile))) {\r
- isXmlCsar = false;\r
- }\r
- }\r
- } catch (IOException e) {\r
- LOG.error("judge package type error !");\r
+ public static String getLocalPath(String uri) {\r
+ File srcDir = new File(uri);\r
+ String localPath = srcDir.getAbsolutePath();\r
+ return localPath.replace("\\", "/");\r
+ }\r
+\r
+ /**\r
+ * @param fileLocation\r
+ * @return\r
+ */\r
+ public static PackageBasicInfo getPacageBasicInfo(String fileLocation) {\r
+ PackageBasicInfo basicInfo = new PackageBasicInfo();\r
+ String unzipDir = ToolUtil.getUnzipDir(fileLocation);\r
+ boolean isXmlCsar = false;\r
+ try {\r
+ String tempfolder = unzipDir;\r
+ ArrayList<String> unzipFiles = FileUtil.unzip(fileLocation, tempfolder);\r
+ if (unzipFiles.isEmpty()) {\r
+ isXmlCsar = true;\r
+ }\r
+ for (String unzipFile : unzipFiles) {\r
+ if (unzipFile.endsWith(CommonConstant.CSAR_META)) {\r
+ basicInfo = readCsarMeta(unzipFile);\r
}\r
- if (isXmlCsar) {\r
- basicInfo.setFormat(CommonConstant.PACKAGE_XML_FORMAT);\r
- } else {\r
- basicInfo.setFormat(CommonConstant.PACKAGE_YAML_FORMAT);\r
+ if (ToolUtil.isYamlFile(new File(unzipFile))) {\r
+ isXmlCsar = false;\r
}\r
- return basicInfo;\r
+ }\r
+ } catch (IOException e) {\r
+ LOG.error("judge package type error !");\r
+ }\r
+ if (isXmlCsar) {\r
+ basicInfo.setFormat(CommonConstant.PACKAGE_XML_FORMAT);\r
+ } else {\r
+ basicInfo.setFormat(CommonConstant.PACKAGE_YAML_FORMAT);\r
}\r
+ return basicInfo;\r
+ }\r
\r
- /**\r
- * @param unzipFile\r
- * @return\r
- */\r
- private static PackageBasicInfo readCsarMeta(String unzipFile) {\r
- PackageBasicInfo basicInfo = new PackageBasicInfo();\r
- File file = new File(unzipFile);\r
- BufferedReader reader = null;\r
+ /**\r
+ * @param unzipFile\r
+ * @return\r
+ */\r
+ private static PackageBasicInfo readCsarMeta(String unzipFile) {\r
+ PackageBasicInfo basicInfo = new PackageBasicInfo();\r
+ File file = new File(unzipFile);\r
+ BufferedReader reader = null;\r
+ try {\r
+ reader = new BufferedReader(new FileReader(file));\r
+ String tempString = null;\r
+ while ((tempString = reader.readLine()) != null) {\r
+ if (tempString.startsWith(CommonConstant.CSAR_TYPE_META)) {\r
+ int count = tempString.indexOf(":") + 1;\r
+ basicInfo.setType(EnumType.valueOf(tempString.substring(count)));\r
+ }\r
+ if (tempString.startsWith(CommonConstant.CSAR_PROVIDER_META)) {\r
+ int count = tempString.indexOf(":") + 1;\r
+ basicInfo.setProvider(tempString.substring(count));\r
+ }\r
+ if (tempString.startsWith(CommonConstant.CSAR_VERSION_META)) {\r
+ int count = tempString.indexOf(":") + 1;\r
+ basicInfo.setVersion(tempString.substring(count));\r
+ }\r
+ }\r
+ reader.close();\r
+ } catch (IOException e) {\r
+ e.printStackTrace();\r
+ } finally {\r
+ if (reader != null) {\r
try {\r
- reader = new BufferedReader(new FileReader(file));\r
- String tempString = null;\r
- while ((tempString = reader.readLine()) != null) {\r
- if (tempString.startsWith(CommonConstant.CSAR_TYPE_META)) {\r
- int count = tempString.indexOf(":") + 1;\r
- basicInfo.setType(EnumType.valueOf(tempString.substring(count)));\r
- }\r
- if (tempString.startsWith(CommonConstant.CSAR_PROVIDER_META)) {\r
- int count = tempString.indexOf(":") + 1;\r
- basicInfo.setProvider(tempString.substring(count));\r
- }\r
- if (tempString.startsWith(CommonConstant.CSAR_VERSION_META)) {\r
- int count = tempString.indexOf(":") + 1;\r
- basicInfo.setVersion(tempString.substring(count));\r
- }\r
- }\r
- reader.close();\r
- } catch (IOException e) {\r
- e.printStackTrace();\r
- } finally {\r
- if (reader != null) {\r
- try {\r
- reader.close();\r
- } catch (IOException e1) {\r
- }\r
- }\r
+ reader.close();\r
+ } catch (IOException e1) {\r
}\r
- return basicInfo;\r
+ }\r
}\r
+ return basicInfo;\r
+ }\r
}\r
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.resource;
-import java.util.ArrayList;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.dao.DaoManager;
import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
import org.openo.commontosca.catalog.db.entity.PackageData;
import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
import org.openo.commontosca.catalog.db.entity.TemplateData;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.util.H2DbServer;
import org.openo.commontosca.catalog.db.util.HibernateSession;
+import java.util.ArrayList;
+
public class IntegrationManager {
- private static PackageManager packageManager;
- private static TemplateManager templateManager;
-
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- H2DbServer.startUp();
- DaoManager.getInstance().setSessionFactory(HibernateSession.init());
- packageManager = PackageManager.getInstance();
- templateManager = TemplateManager.getInstance();
- }
+ private static PackageManager packageManager;
+ private static TemplateManager templateManager;
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- try {
- HibernateSession.destory();
- DaoManager.getInstance().setDaoNull();
- H2DbServer.shutDown();
- } catch (Exception e) {
- Assert.fail("Exception" + e.getMessage());
- }
- }
+ /**
+ * startup H2DB session before class.
+ * @throws Exception e
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ H2DbServer.startUp();
+ DaoManager.getInstance().setSessionFactory(HibernateSession.init());
+ packageManager = PackageManager.getInstance();
+ templateManager = TemplateManager.getInstance();
+ }
- @Before
- public void setUp() {
- initPackageInfo();
- initTemplateInfo();
+ /**
+ * destory H2DB session after class.
+ * @throws Exception e
+ */
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ try {
+ HibernateSession.destory();
+ DaoManager.getInstance().setDaoNull();
+ H2DbServer.shutDown();
+ } catch (Exception e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- public void initPackageInfo() {
- PackageData data = new PackageData();
- data.setCsarId("10001");
- data.setName("AG");
- data.setVersion("v1.0");
- data.setProvider("ZTE");
- try {
- packageManager.addPackage(data);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- }
+ @Before
+ public void setUp() {
+ initPackageInfo();
+ initTemplateInfo();
+ }
- public void deletePackageInfo() {
- try {
- packageManager.deletePackage("10001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ /**
+ * init package information.
+ */
+ public void initPackageInfo() {
+ PackageData data = new PackageData();
+ data.setCsarId("10001");
+ data.setName("AG");
+ data.setVersion("v1.0");
+ data.setProvider("ZTE");
+ try {
+ packageManager.addPackage(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- public void initTemplateInfo() {
- ServiceTemplateData serviceData = new ServiceTemplateData();
- TemplateData data = new TemplateData();
- ArrayList<NodeTemplateData> nodelist = new ArrayList<NodeTemplateData>();
- serviceData.setCsarId("10001");
- serviceData.setServiceTemplateId("20001");
- serviceData.setVendor("ZTE");
- serviceData.setVersion("v1.0");
- NodeTemplateData nodeData = new NodeTemplateData();
- nodeData.setName("node");
- nodeData.setNodeTemplateId("30001");
- nodeData.setServiceTemplateId("20001");
- nodelist.add(nodeData);
- data.setServiceTemplate(serviceData);
- data.setNodeTemplates(nodelist);
- try {
- templateManager.addServiceTemplate(data);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ /**
+ * delete package information.
+ */
+ public void deletePackageInfo() {
+ try {
+ packageManager.deletePackage("10001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- public void deleteTemplate() {
- try {
- templateManager.deleteServiceTemplateById("20001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ /**
+ * init template information.
+ */
+ public void initTemplateInfo() {
+ ServiceTemplateData serviceData = new ServiceTemplateData();
+ serviceData.setCsarId("10001");
+ serviceData.setServiceTemplateId("20001");
+ serviceData.setVendor("ZTE");
+ serviceData.setVersion("v1.0");
+ NodeTemplateData nodeData = new NodeTemplateData();
+ nodeData.setName("node");
+ nodeData.setNodeTemplateId("30001");
+ nodeData.setServiceTemplateId("20001");
+ ArrayList<NodeTemplateData> nodelist = new ArrayList<NodeTemplateData>();
+ nodelist.add(nodeData);
+ TemplateData data = new TemplateData();
+ data.setServiceTemplate(serviceData);
+ data.setNodeTemplates(nodelist);
+ try {
+ templateManager.addServiceTemplate(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- @After
- public void tearDown() {
- deleteTemplate();
- deletePackageInfo();
+ /**
+ * delete template.
+ */
+ public void deleteTemplate() {
+ try {
+ templateManager.deleteServiceTemplateById("20001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- @Test
- public void testDeletePackageByServiceTemplateId() {
- try {
- packageManager.deletePackageByServiceTemplateId("20001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = packageManager.queryPackageByServiceTemplateId("20001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() == 0);
+ @After
+ public void tearDown() {
+ deleteTemplate();
+ deletePackageInfo();
+ }
+
+ @Test
+ public void testDeletePackageByServiceTemplateId() {
+ try {
+ packageManager.deletePackageByServiceTemplateId("20001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
+ }
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = packageManager.queryPackageByServiceTemplateId("20001");
+ } catch (CatalogResourceException e2) {
+ Assert.fail("Exception" + e2.getMessage());
}
+ Assert.assertTrue(list.size() == 0);
+ }
- @Test
- public void testQueryPackageByServiceTemplateId() {
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = packageManager.queryPackageByServiceTemplateId("20001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ @Test
+ public void testQueryPackageByServiceTemplateId() {
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = packageManager.queryPackageByServiceTemplateId("20001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ }
- @Test
- public void testDeleteServiceTemplateByCsarPackageInfo() {
- PackageData data = new PackageData();
- data.setCsarId("10001");
- ArrayList<ServiceTemplateData> list = new ArrayList<ServiceTemplateData>();
- try {
- templateManager.deleteServiceTemplateByCsarPackageInfo(data);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- try {
- list = templateManager.queryServiceTemplateByCsarPackageInfo(data);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() == 0);
+ @Test
+ public void testDeleteServiceTemplateByCsarPackageInfo() {
+ PackageData data = new PackageData();
+ data.setCsarId("10001");
+ ArrayList<ServiceTemplateData> list = new ArrayList<ServiceTemplateData>();
+ try {
+ templateManager.deleteServiceTemplateByCsarPackageInfo(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
+ }
+ try {
+ list = templateManager.queryServiceTemplateByCsarPackageInfo(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() == 0);
+ }
- @Test
- public void testQueryServiceTemplateByCsarPackageInfo() {
- PackageData data = new PackageData();
- data.setCsarId("10001");
- ArrayList<ServiceTemplateData> list = new ArrayList<ServiceTemplateData>();
- try {
- list = templateManager.queryServiceTemplateByCsarPackageInfo(data);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ @Test
+ public void testQueryServiceTemplateByCsarPackageInfo() {
+ PackageData data = new PackageData();
+ data.setCsarId("10001");
+ ArrayList<ServiceTemplateData> list = new ArrayList<ServiceTemplateData>();
+ try {
+ list = templateManager.queryServiceTemplateByCsarPackageInfo(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.resource;
import static org.junit.Assert.assertTrue;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.openo.commontosca.catalog.db.common.Parameters;
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.dao.DaoManager;
import org.openo.commontosca.catalog.db.entity.PackageData;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.util.H2DbServer;
import org.openo.commontosca.catalog.db.util.HibernateSession;
-public class PackageManagerTest {
- private static PackageManager manager;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- H2DbServer.startUp();
- DaoManager.getInstance().setSessionFactory(HibernateSession.init());
- manager = PackageManager.getInstance();
- }
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- try {
- HibernateSession.destory();
- DaoManager.getInstance().setPackageDao(null);
- H2DbServer.shutDown();
- } catch (Exception e) {
- Assert.fail("Exception" + e.getMessage());
- }
+public class PackageManagerTest {
+ private static PackageManager manager;
+
+ /**
+ * startup db session before class.
+ * @throws Exception e
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ H2DbServer.startUp();
+ DaoManager.getInstance().setSessionFactory(HibernateSession.init());
+ manager = PackageManager.getInstance();
+ }
+
+ /**
+ * destory db session after class.
+ * @throws Exception e
+ */
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ try {
+ HibernateSession.destory();
+ DaoManager.getInstance().setPackageDao(null);
+ H2DbServer.shutDown();
+ } catch (Exception e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
-
- @Before
- public void setUp() {
- PackageData data = new PackageData();
- data.setCsarId("10001");
- data.setName("AG");
- data.setVersion("v1.0");
- data.setProvider("ZTE");
- try {
- manager.addPackage(data);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ }
+
+ /**
+ * create data before test.
+ */
+ @Before
+ public void setUp() {
+ PackageData data = new PackageData();
+ data.setCsarId("10001");
+ data.setName("AG");
+ data.setVersion("v1.0");
+ data.setProvider("ZTE");
+ try {
+ manager.addPackage(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
-
- @After
- public void tearDown() {
- try {
- manager.deletePackage("10001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ }
+
+ /**
+ * delete data after test.
+ */
+ @After
+ public void tearDown() {
+ try {
+ manager.deletePackage("10001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
-
- @Test
- public void testAddPackageRepeat() {
- PackageData data = new PackageData();
- data.setCsarId("10001");
- data.setName("AG");
- data.setVersion("v1.0");
- data.setProvider("ZTE");
- try {
- manager.addPackage(data);
- Assert.fail("no exception");
- } catch (CatalogResourceException e) {
- Assert.assertTrue(true);
- }
-
+ }
+
+ @Test
+ public void testAddPackageRepeat() {
+ PackageData data = new PackageData();
+ data.setCsarId("10001");
+ data.setName("AG");
+ data.setVersion("v1.0");
+ data.setProvider("ZTE");
+ try {
+ manager.addPackage(data);
+ Assert.fail("no exception");
+ } catch (CatalogResourceException e1) {
+ Assert.assertTrue(true);
}
- @Test
- public void testQueryPackageByCsarId_exist() {
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = manager.queryPackageByCsarId("10001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
- }
+ }
- @Test
- public void testQueryPackageByCsarId_not_exist() {
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = manager.queryPackageByCsarId("10002");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() == 0);
+ @Test
+ public void testQueryPackageByCsarId_exist() {
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = manager.queryPackageByCsarId("10001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ }
+
+ @Test
+ public void testQueryPackageByCsarId_not_exist() {
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = manager.queryPackageByCsarId("10002");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
+ }
+ Assert.assertTrue(list.size() == 0);
+ }
- @Test
- public void testQueryPackage_exist() {
-
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = manager.queryPackage("AG", "ZTE", "v1.0", null, null);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ @Test
+ public void testQueryPackage_exist() {
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = manager.queryPackage("AG", "ZTE", "v1.0", null, null);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
- @Test
- public void testQueryPackage_not_exist() {
+ }
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = manager.queryPackage("AG", "ZTE", "v2.0", null, null);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() == 0);
+ @Test
+ public void testQueryPackage_not_exist() {
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = manager.queryPackage("AG", "ZTE", "v2.0", null, null);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
-
- @Test
- public void testUpdatePackage() {
- PackageData data = new PackageData();
- data.setSize("20M");
- try {
- manager.updatePackage(data, "10001");
- } catch (CatalogResourceException e1) {
- Assert.fail("Exception" + e1.getMessage());
- }
- Map<String, String> queryParam = new HashMap<String, String>();
- queryParam.put(Parameters.csarId.name(), "10001");
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = manager.queryPackageByCsarId("10001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- assertTrue(list.size() > 0 && list.get(0).getSize().equals("20M"));
+ Assert.assertTrue(list.size() == 0);
+
+ }
+
+ @Test
+ public void testUpdatePackage() {
+ PackageData data = new PackageData();
+ data.setSize("20M");
+ try {
+ manager.updatePackage(data, "10001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
+ }
+ Map<String, String> queryParam = new HashMap<String, String>();
+ queryParam.put(Parameters.csarId.name(), "10001");
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = manager.queryPackageByCsarId("10001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ assertTrue(list.size() > 0 && list.get(0).getSize().equals("20M"));
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.resource;
-import java.util.ArrayList;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.dao.DaoManager;
import org.openo.commontosca.catalog.db.entity.NodeTemplateData;
import org.openo.commontosca.catalog.db.entity.ServiceTemplateData;
import org.openo.commontosca.catalog.db.entity.TemplateData;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.util.H2DbServer;
import org.openo.commontosca.catalog.db.util.HibernateSession;
+import java.util.ArrayList;
+
public class TemplateManagerTest {
- private static TemplateManager manager;
+ private static TemplateManager manager;
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- H2DbServer.startUp();
- DaoManager.getInstance().setSessionFactory(HibernateSession.init());
- manager = TemplateManager.getInstance();
- }
+ /**
+ * startup db session before class.
+ * @throws Exception e
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ H2DbServer.startUp();
+ DaoManager.getInstance().setSessionFactory(HibernateSession.init());
+ manager = TemplateManager.getInstance();
+ }
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- try {
- HibernateSession.destory();
- DaoManager.getInstance().setTemplateDao(null);
- DaoManager.getInstance().setServiceTemplateDao(null);
- DaoManager.getInstance().setNodeTemplateDao(null);
- H2DbServer.shutDown();
- } catch (Exception e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ /**
+ * destory db session after class.
+ * @throws Exception e
+ */
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ try {
+ HibernateSession.destory();
+ DaoManager.getInstance().setTemplateDao(null);
+ DaoManager.getInstance().setServiceTemplateDao(null);
+ DaoManager.getInstance().setNodeTemplateDao(null);
+ H2DbServer.shutDown();
+ } catch (Exception e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- @Before
- public void setUp() {
- ServiceTemplateData serviceData = new ServiceTemplateData();
- TemplateData data = new TemplateData();
- ArrayList<NodeTemplateData> nodelist = new ArrayList<NodeTemplateData>();
- serviceData.setCsarId("10001");
- serviceData.setServiceTemplateId("20001");
- serviceData.setRowData("EEEEEEWERWEREWRERWEREW");
- serviceData.setOperations("SDFSDFDSERWERWE");
- serviceData.setVendor("ZTE");
- serviceData.setVersion("v1.0");
- NodeTemplateData nodeData = new NodeTemplateData();
- nodeData.setName("node");
- nodeData.setNodeTemplateId("30001");
- nodeData.setServiceTemplateId("20001");
- nodelist.add(nodeData);
- data.setServiceTemplate(serviceData);
- data.setNodeTemplates(nodelist);
- try {
- manager.addServiceTemplate(data);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ /**
+ * create data before test.
+ */
+ @Before
+ public void setUp() {
+ ServiceTemplateData serviceData = new ServiceTemplateData();
+ serviceData.setCsarId("10001");
+ serviceData.setServiceTemplateId("20001");
+ serviceData.setRowData("EEEEEEWERWEREWRERWEREW");
+ serviceData.setOperations("SDFSDFDSERWERWE");
+ serviceData.setVendor("ZTE");
+ serviceData.setVersion("v1.0");
+ NodeTemplateData nodeData = new NodeTemplateData();
+ nodeData.setName("node");
+ nodeData.setNodeTemplateId("30001");
+ nodeData.setServiceTemplateId("20001");
+ ArrayList<NodeTemplateData> nodelist = new ArrayList<NodeTemplateData>();
+ nodelist.add(nodeData);
+ TemplateData data = new TemplateData();
+ data.setServiceTemplate(serviceData);
+ data.setNodeTemplates(nodelist);
+ try {
+ manager.addServiceTemplate(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- @After
- public void tearDown() {
- try {
- manager.deleteServiceTemplateById("20001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ /**
+ * delete data after test.
+ */
+ @After
+ public void tearDown() {
+ try {
+ manager.deleteServiceTemplateById("20001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- @Test
- public void testAddServiceTemplateRepeat() {
- ServiceTemplateData serviceData = new ServiceTemplateData();
- TemplateData data = new TemplateData();
- data.setServiceTemplate(serviceData);
- ArrayList<NodeTemplateData> nodelist = new ArrayList<NodeTemplateData>();
- serviceData.setCsarId("10001");
- serviceData.setServiceTemplateId("20001");
- serviceData.setVendor("ZTE");
- serviceData.setVersion("v1.0");
- NodeTemplateData nodeData = new NodeTemplateData();
- nodeData.setName("node");
- nodeData.setServiceTemplateId("20001");
- nodelist.add(nodeData);
- data.setNodeTemplates(nodelist);
- try {
- manager.addServiceTemplate(data);
- Assert.fail("no exception");
- } catch (CatalogResourceException e) {
- Assert.assertTrue(true);
- }
+ @Test
+ public void testAddServiceTemplateRepeat() {
+ ServiceTemplateData serviceData = new ServiceTemplateData();
+ TemplateData data = new TemplateData();
+ data.setServiceTemplate(serviceData);
+ serviceData.setCsarId("10001");
+ serviceData.setServiceTemplateId("20001");
+ serviceData.setVendor("ZTE");
+ serviceData.setVersion("v1.0");
+ NodeTemplateData nodeData = new NodeTemplateData();
+ nodeData.setName("node");
+ nodeData.setServiceTemplateId("20001");
+ ArrayList<NodeTemplateData> nodelist = new ArrayList<NodeTemplateData>();
+ nodelist.add(nodeData);
+ data.setNodeTemplates(nodelist);
+ try {
+ manager.addServiceTemplate(data);
+ Assert.fail("no exception");
+ } catch (CatalogResourceException e1) {
+ Assert.assertTrue(true);
}
+ }
- @Test
- public void testQueryServiceTemplateById() {
- ArrayList<ServiceTemplateData> list = new ArrayList<ServiceTemplateData>();
- try {
- list = manager.queryServiceTemplateById("20001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ @Test
+ public void testQueryServiceTemplateById() {
+ ArrayList<ServiceTemplateData> list = new ArrayList<ServiceTemplateData>();
+ try {
+ list = manager.queryServiceTemplateById("20001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ }
- @Test
- public void testQueryServiceTemplate() {
-
- ArrayList<ServiceTemplateData> list = new ArrayList<ServiceTemplateData>();
- try {
- list = manager.queryServiceTemplate(null, "v1.0", "ZTE");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ @Test
+ public void testQueryServiceTemplate() {
+ ArrayList<ServiceTemplateData> list = new ArrayList<ServiceTemplateData>();
+ try {
+ list = manager.queryServiceTemplate(null, "v1.0", "ZTE");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+
+ }
- @Test
- public void testQueryNodeTemplateBySeriviceTemplateId() {
- ArrayList<NodeTemplateData> list = new ArrayList<NodeTemplateData>();
- try {
- list = manager.queryNodeTemplateBySeriviceTemplateId("20001");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ @Test
+ public void testQueryNodeTemplateBySeriviceTemplateId() {
+ ArrayList<NodeTemplateData> list = new ArrayList<NodeTemplateData>();
+ try {
+ list = manager.queryNodeTemplateBySeriviceTemplateId("20001");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ }
- @Test
- public void testQueryNodeTemplateById() {
- ArrayList<NodeTemplateData> list = new ArrayList<NodeTemplateData>();
- try {
- list = manager.queryNodeTemplateById("20001", null);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ @Test
+ public void testQueryNodeTemplateById() {
+ ArrayList<NodeTemplateData> list = new ArrayList<NodeTemplateData>();
+ try {
+ list = manager.queryNodeTemplateById("20001", null);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.resource;
-import java.util.ArrayList;
+package org.openo.commontosca.catalog.db.resource;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.dao.DaoManager;
import org.openo.commontosca.catalog.db.entity.ServiceTemplateMappingData;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.util.H2DbServer;
import org.openo.commontosca.catalog.db.util.HibernateSession;
-public class TemplateMappingManagerTest {
- private static TemplateManager manager;
+import java.util.ArrayList;
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- H2DbServer.startUp();
- DaoManager.getInstance().setSessionFactory(HibernateSession.init());
- manager = TemplateManager.getInstance();
- }
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- try {
- HibernateSession.destory();
- DaoManager.getInstance().setTemplateDao(null);
- H2DbServer.shutDown();
- } catch (Exception e) {
- Assert.fail("Exception" + e.getMessage());
- }
+public class TemplateMappingManagerTest {
+ private static TemplateManager manager;
+
+ /**
+ * startup db session before class.
+ * @throws Exception e
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ H2DbServer.startUp();
+ DaoManager.getInstance().setSessionFactory(HibernateSession.init());
+ manager = TemplateManager.getInstance();
+ }
+
+ /**
+ * destory db session after class.
+ * @throws Exception e
+ */
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ try {
+ HibernateSession.destory();
+ DaoManager.getInstance().setTemplateDao(null);
+ H2DbServer.shutDown();
+ } catch (Exception e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
-
- @Before
- public void setUp() {
- ServiceTemplateMappingData serviceMappingData = new ServiceTemplateMappingData();
- serviceMappingData.setCapabilities("wsectdSDFSDFDSXCVFertregdDFGDFG");
- serviceMappingData.setRequirements("REWREWRWE#$#");
- serviceMappingData.setNodeType("NS");
- serviceMappingData.setServiceTemplateId("10020");
- serviceMappingData.setMappingId("10000");
- try {
- manager.addServiceTemplateMapping(serviceMappingData);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ }
+
+ /**
+ * create data before test.
+ */
+ @Before
+ public void setUp() {
+ ServiceTemplateMappingData serviceMappingData = new ServiceTemplateMappingData();
+ serviceMappingData.setCapabilities("wsectdSDFSDFDSXCVFertregdDFGDFG");
+ serviceMappingData.setRequirements("REWREWRWE#$#");
+ serviceMappingData.setNodeType("NS");
+ serviceMappingData.setServiceTemplateId("10020");
+ serviceMappingData.setMappingId("10000");
+ try {
+ manager.addServiceTemplateMapping(serviceMappingData);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
-
- @After
- public void tearDown() {
- try {
- manager.deleteServiceTemplateMappingById("10000");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ }
+
+ /**
+ * delete data after test.
+ */
+ @After
+ public void tearDown() {
+ try {
+ manager.deleteServiceTemplateMappingById("10000");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
-
- @Test
- public void testAddServiceTemplateRepeat() {
- ServiceTemplateMappingData serviceMappingData = new ServiceTemplateMappingData();
- serviceMappingData.setCapabilities("wsectdSDFSDFDSXCVFertregdDFGDFG");
- serviceMappingData.setRequirements("REWREWRWE#$#");
- serviceMappingData.setNodeType("NS");
- serviceMappingData.setServiceTemplateId("10020");
- serviceMappingData.setMappingId("10000");
- try {
- manager.addServiceTemplateMapping(serviceMappingData);
- Assert.fail("no exception");
- } catch (CatalogResourceException e) {
- Assert.assertTrue(true);
- }
+ }
+
+ @Test
+ public void testAddServiceTemplateRepeat() {
+ ServiceTemplateMappingData serviceMappingData = new ServiceTemplateMappingData();
+ serviceMappingData.setCapabilities("wsectdSDFSDFDSXCVFertregdDFGDFG");
+ serviceMappingData.setRequirements("REWREWRWE#$#");
+ serviceMappingData.setNodeType("NS");
+ serviceMappingData.setServiceTemplateId("10020");
+ serviceMappingData.setMappingId("10000");
+ try {
+ manager.addServiceTemplateMapping(serviceMappingData);
+ Assert.fail("no exception");
+ } catch (CatalogResourceException e1) {
+ Assert.assertTrue(true);
}
-
- @Test
- public void testServiceTemplateMappingById() {
- ArrayList<ServiceTemplateMappingData> list = new ArrayList<ServiceTemplateMappingData>();
- try {
- list = manager.queryServiceTemplateMappingById("10000");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ }
+
+ @Test
+ public void testServiceTemplateMappingById() {
+ ArrayList<ServiceTemplateMappingData> list = new ArrayList<ServiceTemplateMappingData>();
+ try {
+ list = manager.queryServiceTemplateMappingById("10000");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ }
+
+ @Test
+ public void testQueryServiceTemplateMapping() {
- @Test
- public void testQueryServiceTemplateMapping() {
-
- ArrayList<ServiceTemplateMappingData> list = new ArrayList<ServiceTemplateMappingData>();
- try {
- list = manager.queryServiceTemplateMapping("NS", "10020");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
- try {
- list = manager.queryServiceTemplateMapping("NS", "");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
- try {
- list = manager.queryServiceTemplateMapping("", "10020");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ ArrayList<ServiceTemplateMappingData> list = new ArrayList<ServiceTemplateMappingData>();
+ try {
+ list = manager.queryServiceTemplateMapping("NS", "10020");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ try {
+ list = manager.queryServiceTemplateMapping("NS", "");
+ } catch (CatalogResourceException e2) {
+ Assert.fail("Exception" + e2.getMessage());
+ }
+ Assert.assertTrue(list.size() > 0);
+ try {
+ list = manager.queryServiceTemplateMapping("", "10020");
+ } catch (CatalogResourceException e3) {
+ Assert.fail("Exception" + e3.getMessage());
+ }
+ Assert.assertTrue(list.size() > 0);
+ }
- @Test
- public void testDeleteServiceTemplateMapping() {
-
- ArrayList<ServiceTemplateMappingData> list = new ArrayList<ServiceTemplateMappingData>();
- try {
- manager.deleteServiceTemplateMapping("NS", "10020");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- try {
- list = manager.queryServiceTemplateMapping("NS", "10020");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() == 0);
+ @Test
+ public void testDeleteServiceTemplateMapping() {
+
+ ArrayList<ServiceTemplateMappingData> list = new ArrayList<ServiceTemplateMappingData>();
+ try {
+ manager.deleteServiceTemplateMapping("NS", "10020");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
+ }
+ try {
+ list = manager.queryServiceTemplateMapping("NS", "10020");
+ } catch (CatalogResourceException e2) {
+ Assert.fail("Exception" + e2.getMessage());
}
+ Assert.assertTrue(list.size() == 0);
+ }
- @Test
- public void testQueryAllServiceTemplateMapping() {
+ @Test
+ public void testQueryAllServiceTemplateMapping() {
- ArrayList<ServiceTemplateMappingData> list = new ArrayList<ServiceTemplateMappingData>();
- try {
- list = manager.queryServiceTemplateMapping("", "");
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ ArrayList<ServiceTemplateMappingData> list = new ArrayList<ServiceTemplateMappingData>();
+ try {
+ list = manager.queryServiceTemplateMapping("", "");
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.resource.dao;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Test;
import org.openo.commontosca.catalog.db.common.Parameters;
import org.openo.commontosca.catalog.db.dao.PackageDao;
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
-import org.openo.commontosca.catalog.db.util.HqlFactory;
import org.openo.commontosca.catalog.db.entity.PackageData;
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;
import org.openo.commontosca.catalog.db.util.H2DbServer;
import org.openo.commontosca.catalog.db.util.HibernateSession;
+import org.openo.commontosca.catalog.db.util.HqlFactory;
+
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
public class PackageDaoTest {
- private static PackageDao packageDao;
+ private static PackageDao packageDao;
- @BeforeClass
- public static void setUpBeforeClass() throws Exception {
- H2DbServer.startUp();
- packageDao = new PackageDao(HibernateSession.init());
+ /**
+ * setup db session before class.
+ * @throws Exception e
+ */
+ @BeforeClass
+ public static void setUpBeforeClass() throws Exception {
+ H2DbServer.startUp();
+ packageDao = new PackageDao(HibernateSession.init());
- }
+ }
- @AfterClass
- public static void tearDownAfterClass() throws Exception {
- try {
- HibernateSession.destory();
- H2DbServer.shutDown();
- } catch (Exception e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ /**
+ * shutdown db session before class.
+ * @throws Exception e
+ */
+ @AfterClass
+ public static void tearDownAfterClass() throws Exception {
+ try {
+ HibernateSession.destory();
+ H2DbServer.shutDown();
+ } catch (Exception e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- @Before
- public void setUp() {
- PackageData data = new PackageData();
- data.setCsarId("10001");
- data.setName("AG");
- try {
- packageDao.create(data);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ /**
+ * create data before test.
+ * @throws Exception e
+ */
+ @Before
+ public void setUp() {
+ PackageData data = new PackageData();
+ data.setCsarId("10001");
+ data.setName("AG");
+ try {
+ packageDao.create(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- @After
- public void tearDown() {
- PackageData data = new PackageData();
- data.setCsarId("10001");
- try {
- packageDao.delete(data);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
+ /**
+ * delete data after test.
+ * @throws Exception e
+ */
+ @After
+ public void tearDown() {
+ PackageData data = new PackageData();
+ data.setCsarId("10001");
+ try {
+ packageDao.delete(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ }
- @Test
- public void testQueryPackageById() {
- Map<String, String> queryParam = new HashMap<String, String>();
- queryParam.put(Parameters.csarId.name(), "10001");
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = (ArrayList<PackageData>) packageDao.query(queryParam);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- Assert.assertTrue(list.size() > 0);
+ @Test
+ public void testQueryPackageById() {
+ Map<String, String> queryParam = new HashMap<String, String>();
+ queryParam.put(Parameters.csarId.name(), "10001");
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = (ArrayList<PackageData>) packageDao.query(queryParam);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ Assert.assertTrue(list.size() > 0);
+ }
- @Test
- public void testUpdatePackage() {
- PackageData data = new PackageData();
- data.setSize("20M");
- try {
- packageDao.update(data, HqlFactory.getOidFilter(Parameters.csarId.name(), "10001"));
- } catch (CatalogResourceException e1) {
- Assert.fail("Exception" + e1.getMessage());
- }
- Map<String, String> queryParam = new HashMap<String, String>();
- queryParam.put(Parameters.csarId.name(), "10001");
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = (ArrayList<PackageData>) packageDao.query(queryParam);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- assertTrue(list.size() > 0 && list.get(0).getSize().equals("20M"));
+ @Test
+ public void testUpdatePackage() {
+ PackageData data = new PackageData();
+ data.setSize("20M");
+ try {
+ packageDao.update(data, HqlFactory.getOidFilter(Parameters.csarId.name(), "10001"));
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
+ }
+ Map<String, String> queryParam = new HashMap<String, String>();
+ queryParam.put(Parameters.csarId.name(), "10001");
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = (ArrayList<PackageData>) packageDao.query(queryParam);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ assertTrue(list.size() > 0 && list.get(0).getSize().equals("20M"));
+ }
- @Test
- public void testDeleteByOid() {
- PackageData data = new PackageData();
- data.setCsarId("10001");
- try {
- packageDao.delete(data);
- } catch (CatalogResourceException e1) {
- Assert.fail("Exception" + e1.getMessage());
- }
- Map<String, String> queryParam = new HashMap<String, String>();
- queryParam.put(Parameters.csarId.name(), "10001");
- ArrayList<PackageData> list = new ArrayList<PackageData>();
- try {
- list = (ArrayList<PackageData>) packageDao.query(queryParam);
- } catch (CatalogResourceException e) {
- Assert.fail("Exception" + e.getMessage());
- }
- assertEquals(list.size(), 0);
+ @Test
+ public void testDeleteByOid() {
+ PackageData data = new PackageData();
+ data.setCsarId("10001");
+ try {
+ packageDao.delete(data);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
+ }
+ Map<String, String> queryParam = new HashMap<String, String>();
+ queryParam.put(Parameters.csarId.name(), "10001");
+ ArrayList<PackageData> list = new ArrayList<PackageData>();
+ try {
+ list = (ArrayList<PackageData>) packageDao.query(queryParam);
+ } catch (CatalogResourceException e1) {
+ Assert.fail("Exception" + e1.getMessage());
}
+ assertEquals(list.size(), 0);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.util;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+
+//import static org.junit.Assert.*;
import org.junit.Test;
public class CatalogDbUtilTest {
- @Test
- public void when_generate_id_is_not_null() {
- String actual_uuid = CatalogDbUtil.generateId();
- assertNotNull(actual_uuid);
- }
-
- @Test
- public void when_input_empty_string_output_false() {
- boolean expect = false;
- boolean actual = CatalogDbUtil.isNotEmpty("");
- assertEquals(expect, actual);
- }
-
- @Test
- public void when_input_blan_string_output_true() {
- boolean expect = true;
- boolean actual = CatalogDbUtil.isNotEmpty(" ");
- assertEquals(expect, actual);
- }
-
- @Test
- public void when_input_null_string_output_false() {
- boolean expect = false;
- boolean actual = CatalogDbUtil.isNotEmpty(null);
- assertEquals(expect, actual);
- }
-
- @Test
- public void when_input_str_string_output_true() {
- boolean expect = true;
- boolean actual = CatalogDbUtil.isNotEmpty("str");
- assertEquals(expect, actual);
- }
+ @Test
+ public void when_generate_id_is_not_null() {
+ String actualUuid = CatalogDbUtil.generateId();
+ assertNotNull(actualUuid);
+ }
+
+ @Test
+ public void when_input_empty_string_output_false() {
+ boolean expect = false;
+ boolean actual = CatalogDbUtil.isNotEmpty("");
+ assertEquals(expect, actual);
+ }
+
+ @Test
+ public void when_input_blan_string_output_true() {
+ boolean expect = true;
+ boolean actual = CatalogDbUtil.isNotEmpty(" ");
+ assertEquals(expect, actual);
+ }
+
+ @Test
+ public void when_input_null_string_output_false() {
+ boolean expect = false;
+ boolean actual = CatalogDbUtil.isNotEmpty(null);
+ assertEquals(expect, actual);
+ }
+
+ @Test
+ public void when_input_str_string_output_true() {
+ boolean expect = true;
+ boolean actual = CatalogDbUtil.isNotEmpty("str");
+ assertEquals(expect, actual);
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.util;
+import org.h2.tools.Server;
+
import java.sql.SQLException;
-import org.h2.tools.Server;
public class H2DbServer {
- private static Server h2DbWebServer;
- private static Server h2DbTcpServer;
-
- public static void startUp() {
- try {
- h2DbWebServer =
- Server.createWebServer(new String[] {"-web", "-webAllowOthers", "-webPort",
- "8206"});
- h2DbWebServer.start();
-
- h2DbTcpServer =
- Server.createTcpServer(new String[] {"-tcp", "-tcpAllowOthers", "-tcpPort",
- "8205"});
- h2DbTcpServer.start();
- } catch (SQLException e) {
- e.printStackTrace();
- }
+ private static Server h2DbWebServer;
+ private static Server h2DbTcpServer;
+
+ /**
+ * start up db service.
+ */
+ public static void startUp() {
+ try {
+ h2DbWebServer =
+ Server.createWebServer(new String[] {"-web", "-webAllowOthers", "-webPort", "8206"});
+ h2DbWebServer.start();
+
+ h2DbTcpServer =
+ Server.createTcpServer(new String[] {"-tcp", "-tcpAllowOthers", "-tcpPort", "8205"});
+ h2DbTcpServer.start();
+ } catch (SQLException e1) {
+ e1.printStackTrace();
}
+ }
- public static void shutDown() {
- if (h2DbWebServer.isRunning(true)) {
- h2DbWebServer.shutdown();
- }
- if (h2DbTcpServer.isRunning(true)) {
- h2DbTcpServer.shutdown();
- }
+ /**
+ * shut down db service.
+ */
+ public static void shutDown() {
+ if (h2DbWebServer.isRunning(true)) {
+ h2DbWebServer.shutdown();
+ }
+ if (h2DbTcpServer.isRunning(true)) {
+ h2DbTcpServer.shutdown();
}
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.util;
-import java.io.File;
-import java.net.URISyntaxException;
+package org.openo.commontosca.catalog.db.util;
import org.apache.tools.ant.Project;
import org.apache.tools.ant.taskdefs.SQLExec;
import org.apache.tools.ant.types.EnumeratedAttribute;
+import java.io.File;
+import java.net.URISyntaxException;
+
public class H2DbServerUtil {
- private static String resourcePath;
+ private static String resourcePath;
- public static void initTable() {
- init();
- SQLExec sqlExec = new SQLExec();
- // set db connetc parameter
- sqlExec.setDriver("org.h2.Driver");
- sqlExec.setUrl("jdbc:h2:tcp://localhost:8205/" + resourcePath + "db/catalog");
- sqlExec.setUserid("catalog");
- sqlExec.setPassword("catalog");
- // execute sql
- sqlExec.setSrc(new File(resourcePath + "sql/catalog-resource-createObj-mysql.sql"));
- sqlExec.setOnerror((SQLExec.OnError) (EnumeratedAttribute.getInstance(
- SQLExec.OnError.class, "abort")));
- sqlExec.setPrint(true); // set print
- sqlExec.setProject(new Project());
- sqlExec.execute();
- }
+ /**
+ * init data table.
+ */
+ public static void initTable() {
+ init();
+ SQLExec sqlExec = new SQLExec();
+ // set db connetc parameter
+ sqlExec.setDriver("org.h2.Driver");
+ sqlExec.setUrl("jdbc:h2:tcp://localhost:8205/" + resourcePath + "db/catalog");
+ sqlExec.setUserid("catalog");
+ sqlExec.setPassword("catalog");
+ // execute sql
+ sqlExec.setSrc(new File(resourcePath + "sql/catalog-resource-createObj-mysql.sql"));
+ sqlExec.setOnerror((SQLExec.OnError) (EnumeratedAttribute.getInstance(SQLExec.OnError.class,
+ "abort")));
+ sqlExec.setPrint(true); // set print
+ sqlExec.setProject(new Project());
+ sqlExec.execute();
+ }
- private static void init() {
- try {
- resourcePath = HibernateSession.class.getResource("/").toURI().getPath();
- } catch (URISyntaxException e) {
- e.printStackTrace();
- }
+ private static void init() {
+ try {
+ resourcePath = HibernateSession.class.getResource("/").toURI().getPath();
+ } catch (URISyntaxException e1) {
+ e1.printStackTrace();
}
+ }
- public static void main(String args[]) {
- H2DbServer.startUp();
- H2DbServerUtil.initTable();
- H2DbServer.shutDown();
- }
+ /**
+ * test.
+ */
+ public static void main() {
+ H2DbServer.startUp();
+ H2DbServerUtil.initTable();
+ H2DbServer.shutDown();
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.openo.commontosca.catalog.db.util;
-import java.io.File;
-import java.net.URISyntaxException;
+package org.openo.commontosca.catalog.db.util;
import org.hibernate.SessionFactory;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
import org.hibernate.service.ServiceRegistry;
+import java.io.File;
+import java.net.URISyntaxException;
+
public class HibernateSession {
- private static File cfgfile = null;
+ private static File cfgfile = null;
- private static ServiceRegistry serviceRegistry = null;
- private static Configuration configuration = null;
- private static SessionFactory sessionFactory = null;
- private static String resourcePath;
+ private static ServiceRegistry serviceRegistry = null;
+ private static Configuration configuration = null;
+ private static SessionFactory sessionFactory = null;
+ private static String resourcePath;
- /**
- * Get a hibernate sessionFactory.
- */
- public static SessionFactory init() {
- initConfigure();
- configuration = new Configuration().configure(cfgfile);
- configuration.setProperty("hibernate.connection.url", "jdbc:h2:tcp://localhost:8205/"
- + resourcePath + "db/catalog");
- serviceRegistry =
- new StandardServiceRegistryBuilder().applySettings(configuration.getProperties())
- .build();
- sessionFactory = configuration.buildSessionFactory(serviceRegistry);
- return sessionFactory;
- }
+ /**
+ * Get a hibernate sessionFactory.
+ */
+ public static SessionFactory init() {
+ initConfigure();
+ configuration = new Configuration().configure(cfgfile);
+ configuration.setProperty("hibernate.connection.url", "jdbc:h2:tcp://localhost:8205/"
+ + resourcePath + "db/catalog");
+ serviceRegistry =
+ new StandardServiceRegistryBuilder().applySettings(configuration.getProperties()).build();
+ sessionFactory = configuration.buildSessionFactory(serviceRegistry);
+ return sessionFactory;
+ }
- private static void initConfigure() {
- try {
- resourcePath = HibernateSession.class.getResource("/").toURI().getPath();
- } catch (URISyntaxException e) {
- e.printStackTrace();
- }
- final String filename = "Hibernate.cfg.xml";
- cfgfile = new File(resourcePath + filename);
+ private static void initConfigure() {
+ try {
+ resourcePath = HibernateSession.class.getResource("/").toURI().getPath();
+ } catch (URISyntaxException e1) {
+ e1.printStackTrace();
}
+ final String filename = "Hibernate.cfg.xml";
+ cfgfile = new File(resourcePath + filename);
+ }
- /**
- * Destory a hibernate sessionFactory.
- */
- public static void destory() {
- sessionFactory.close();
- }
+ /**
+ * Destory a hibernate sessionFactory.
+ */
+ public static void destory() {
+ sessionFactory.close();
+ }
- /* Maybe you don't need it. */
- private static void removeCfgFile() {
- if (cfgfile.exists()) {
- cfgfile.deleteOnExit();
- }
+ /* Maybe you don't need it. */
+ private static void removeCfgFile() {
+ if (cfgfile.exists()) {
+ cfgfile.deleteOnExit();
}
+ }
- public static void main(String[] args) {
- // createCfgFile();
- // removeCfgFile();
+ /**
+ * test.
+ * @param args param
+ */
+ public static void main(String[] args) {
+ // createCfgFile();
+ // removeCfgFile();
- }
+ }
}
* See the License for the specific language governing permissions and
* limitations under the License.
*/
+
package org.openo.commontosca.catalog.db.util;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
import org.junit.Test;
import org.openo.commontosca.catalog.db.entity.PackageData;
public class HqlFactoryTest {
- @Test
- public void when_input_entity_output_udatehql() {
- PackageData data = new PackageData();
- String filter = "csarId='xd03dsfsdfsfsdfsd'";
- data.setName("csarName");
- data.setType("NS");
- String expect =
- "update PackageData set name='csarName',type='NS' where csarId='xd03dsfsdfsfsdfsd'";
- String actual = HqlFactory.getUpdateHql(data, null, filter);
- assertEquals(expect, actual);
- }
+ @Test
+ public void when_input_entity_output_udatehql() {
+ PackageData data = new PackageData();
+ String filter = "csarId='xd03dsfsdfsfsdfsd'";
+ data.setName("csarName");
+ data.setType("NS");
+ String expect =
+ "update PackageData set name='csarName',type='NS' where csarId='xd03dsfsdfsfsdfsd'";
+ String actual = HqlFactory.getUpdateHql(data, null, filter);
+ assertEquals(expect, actual);
+ }
- @Test
- public void when_input_null_testContain_output_false() {
- boolean expect = false;
- boolean actual = HqlFactory.contain(null, "name");
- assertEquals(expect, actual);
- String[] src = new String[0];
- actual = HqlFactory.contain(src, "name");
- assertEquals(expect, actual);
- src = new String[1];
- actual = HqlFactory.contain(src, null);
- assertEquals(expect, actual);
- }
+ @Test
+ public void when_input_null_testContain_output_false() {
+ boolean expect = false;
+ boolean actual = HqlFactory.contain(null, "name");
+ assertEquals(expect, actual);
+ String[] src = new String[0];
+ actual = HqlFactory.contain(src, "name");
+ assertEquals(expect, actual);
+ src = new String[1];
+ actual = HqlFactory.contain(src, null);
+ assertEquals(expect, actual);
+ }
- @Test
- public void when_input_src_contain_target_testContain_output_true() {
- boolean expect = true;
- String src[] = {"name", "type"};
- String target = "name";
- boolean actual = HqlFactory.contain(src, target);
- assertEquals(expect, actual);
- }
+ @Test
+ public void when_input_src_contain_target_testContain_output_true() {
+ boolean expect = true;
+ String[] src = {"name", "type"};
+ String target = "name";
+ boolean actual = HqlFactory.contain(src, target);
+ assertEquals(expect, actual);
+ }
- @Test
- public void when_input_src_not_contain_target_testContain_output_false() {
- boolean expect = false;
- String src[] = {"name", "type"};
- String target = "version";
- boolean actual = HqlFactory.contain(src, target);
- assertEquals(expect, actual);
- }
+ @Test
+ public void when_input_src_not_contain_target_testContain_output_false() {
+ boolean expect = false;
+ String[] src = {"name", "type"};
+ String target = "version";
+ boolean actual = HqlFactory.contain(src, target);
+ assertEquals(expect, actual);
+ }
- @Test
- public void testGetOidFilter() {
- // fail("Not yet implemented");
- String key = "csarId";
- String value = "xd03dsfsdfsfsdfsd";
- String expect = "csarId= 'xd03dsfsdfsfsdfsd'";
- String actual = HqlFactory.getOidFilter(key, value);
- assertEquals(expect, actual);
- }
+ @Test
+ public void testGetOidFilter() {
+ // fail("Not yet implemented");
+ String key = "csarId";
+ String value = "xd03dsfsdfsfsdfsd";
+ String expect = "csarId= 'xd03dsfsdfsfsdfsd'";
+ String actual = HqlFactory.getOidFilter(key, value);
+ assertEquals(expect, actual);
+ }
- @Test
- public void when_input_entity_output_queryhql() {
- PackageData data = new PackageData();
- String filter = "csarId";
- data.setName("csarName");
- data.setType("NS");
- String expect =
- "select q.csarId from PackageData as q where q.name='csarName' and q.type='NS'";
- String actual = HqlFactory.getQueryHql(data, filter);
- assertEquals(expect, actual);
- }
+ @Test
+ public void when_input_entity_output_queryhql() {
+ PackageData data = new PackageData();
+ String filter = "csarId";
+ data.setName("csarName");
+ data.setType("NS");
+ String expect = "select q.csarId from PackageData as q where q.name='csarName' and q.type='NS'";
+ String actual = HqlFactory.getQueryHql(data, filter);
+ assertEquals(expect, actual);
+ }
- @Test
- public void when_input_entity_output_getQueryHqlByFilter() {
- PackageData data = new PackageData();
- String filter = "csarId";
- data.setName("csarName");
- data.setType("NS");
- String expect =
- " from ServiceTemplateData as a where a.csarId in(select q.csarId from PackageData as q where q.name='csarName' and q.type='NS')";
- String actual = HqlFactory.getQueryHqlByFilter(ServiceTemplateData.class, data, filter);
- assertEquals(expect, actual);
- }
+ @Test
+ public void when_input_entity_output_getQueryHqlByFilter() {
+ PackageData data = new PackageData();
+ String filter = "csarId";
+ data.setName("csarName");
+ data.setType("NS");
+ String expect =
+ " from ServiceTemplateData as a where a.csarId "
+ + "in(select q.csarId from PackageData as q "
+ + "where q.name='csarName' and q.type='NS')";
+ String actual = HqlFactory.getQueryHqlByFilter(ServiceTemplateData.class, data, filter);
+ assertEquals(expect, actual);
+ }
- @Test
- public void when_input_entity_output_getDeleteHqlByFilter() {
- PackageData data = new PackageData();
- String filter = "csarId";
- data.setName("csarName");
- data.setType("NS");
- String expect =
- "delete from ServiceTemplateData as b where b.csarId in(select q.csarId from PackageData as q where q.name='csarName' and q.type='NS')";
- String actual = HqlFactory.getDeleteHqlByFilter(ServiceTemplateData.class, data, filter);
- assertEquals(expect, actual);
- }
+ @Test
+ public void when_input_entity_output_getDeleteHqlByFilter() {
+ PackageData data = new PackageData();
+ String filter = "csarId";
+ data.setName("csarName");
+ data.setType("NS");
+ String expect =
+ "delete from ServiceTemplateData as b where b.csarId "
+ + "in(select q.csarId from PackageData as q "
+ + "where q.name='csarName' and q.type='NS')";
+ String actual = HqlFactory.getDeleteHqlByFilter(ServiceTemplateData.class, data, filter);
+ assertEquals(expect, actual);
+ }
}
* See the License for the specific language governing permissions and\r
* limitations under the License.\r
*/\r
-package org.openo.commontosca.catalog.wrapper;\r
\r
-import java.io.File;\r
-import java.io.FileInputStream;\r
-import java.io.FileNotFoundException;\r
-import java.io.InputStream;\r
-import java.net.URISyntaxException;\r
-import java.util.ArrayList;\r
+package org.openo.commontosca.catalog.wrapper;\r
\r
-import javax.ws.rs.core.Response;\r
+import static org.junit.Assert.assertEquals;\r
+import static org.junit.Assert.assertNotNull;\r
\r
import org.glassfish.jersey.media.multipart.FormDataContentDisposition;\r
import org.junit.After;\r
import org.junit.Test;\r
import org.openo.commontosca.catalog.CatalogAppConfiguration;\r
import org.openo.commontosca.catalog.common.Config;\r
-import org.openo.commontosca.catalog.common.MsbAddrConfig;\r
-import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
-import org.openo.commontosca.catalog.db.resource.PackageManager;\r
-import org.openo.commontosca.catalog.filemanage.entity.FileLink;\r
import org.openo.commontosca.catalog.common.HttpServerAddrConfig;\r
import org.openo.commontosca.catalog.common.HttpServerPathConfig;\r
+import org.openo.commontosca.catalog.common.MsbAddrConfig;\r
import org.openo.commontosca.catalog.db.dao.DaoManager;\r
import org.openo.commontosca.catalog.db.entity.PackageData;\r
+import org.openo.commontosca.catalog.db.exception.CatalogResourceException;\r
+import org.openo.commontosca.catalog.db.resource.PackageManager;\r
import org.openo.commontosca.catalog.db.util.H2DbServer;\r
import org.openo.commontosca.catalog.db.util.HibernateSession;\r
import org.openo.commontosca.catalog.entity.EnumOnboardState;\r
import org.openo.commontosca.catalog.entity.EnumUsageState;\r
import org.openo.commontosca.catalog.entity.response.CsarFileUriResponse;\r
import org.openo.commontosca.catalog.entity.response.PackageMeta;\r
+import org.openo.commontosca.catalog.filemanage.entity.FileLink;\r
\r
-import static org.junit.Assert.*;\r
+import java.io.File;\r
+import java.io.FileInputStream;\r
+import java.io.FileNotFoundException;\r
+import java.io.InputStream;\r
+import java.net.URISyntaxException;\r
+import java.util.ArrayList;\r
\r
-/**\r
- * @author 00164331\r
- * \r
- */\r
-public class PackageWrapperTest {\r
- private static String resourcePath;\r
+import javax.ws.rs.core.Response;\r
\r
- static {\r
- MsbAddrConfig.setMsbAddress("http://127.0.0.1:80");\r
- }\r
- static {\r
- HttpServerAddrConfig.setHttpServerAddress("http://127.0.0.1:8080");\r
- }\r
- static {\r
- HttpServerPathConfig.setHttpServerPath("../tomcat/webapps/ROOT/");\r
- }\r
+public class PackageWrapperTest {\r
+ private static String resourcePath;\r
\r
- // @Mock\r
- private static PackageManager manager;\r
+ static {\r
+ MsbAddrConfig.setMsbAddress("http://127.0.0.1:80");\r
+ }\r
+ \r
+ static {\r
+ HttpServerAddrConfig.setHttpServerAddress("http://127.0.0.1:8080");\r
+ }\r
+ \r
+ static {\r
+ HttpServerPathConfig.setHttpServerPath("../tomcat/webapps/ROOT/");\r
+ }\r
\r
+ private static PackageManager manager;\r
\r
- @BeforeClass\r
- public static void setUpBeforeClass() throws CatalogResourceException {\r
- CatalogAppConfiguration configuration = new CatalogAppConfiguration();\r
- H2DbServer.startUp();\r
- DaoManager.getInstance().setSessionFactory(HibernateSession.init());\r
- manager = PackageManager.getInstance();\r
- Config.setConfigration(configuration);\r
- System.out.println("Set up before class");\r
- }\r
\r
- @Before\r
- public void setUp() throws Exception {\r
- ArrayList<PackageData> packageList = manager.queryPackage(null, null, null, null, null);\r
- if (packageList != null && packageList.size() > 0) {\r
- for (int i = 0; i < packageList.size(); i++) {\r
- String package_oid = packageList.get(i).getCsarId();\r
- manager.deletePackage(package_oid);\r
- }\r
- }\r
+ /**\r
+ * startup db session before class.\r
+ * @throws Exception e\r
+ */\r
+ @BeforeClass\r
+ public static void setUpBeforeClass() throws CatalogResourceException {\r
+ H2DbServer.startUp();\r
+ DaoManager.getInstance().setSessionFactory(HibernateSession.init());\r
+ manager = PackageManager.getInstance();\r
+ CatalogAppConfiguration configuration = new CatalogAppConfiguration();\r
+ Config.setConfigration(configuration);\r
+ System.out.println("Set up before class");\r
+ }\r
\r
- // PowerMockito.mockStatic(PackageManager.class);\r
- // PowerMockito.when(manager.addPackage(packageData)).thenReturn(packageData);\r
- // PowerMock.replayAll();\r
- PackageData packageData = new PackageData();\r
- packageData = getPackageData();\r
- manager.addPackage(packageData);\r
+ /**\r
+ * create data before test.\r
+ */\r
+ @Before\r
+ public void setUp() throws Exception {\r
+ ArrayList<PackageData> packageList = manager.queryPackage(null, null, null, null, null);\r
+ if (packageList != null && packageList.size() > 0) {\r
+ for (int i = 0; i < packageList.size(); i++) {\r
+ String packageOid = packageList.get(i).getCsarId();\r
+ manager.deletePackage(packageOid);\r
+ }\r
}\r
\r
- // @Ignore\r
- @Test\r
- public void testUploadPackage() throws Exception {\r
- InputStream ins = null;\r
- Response result = null;\r
- Response result1 = null;\r
- Response result2 = null;\r
- // PackageData packageData = new PackageData();\r
- // packageData = getPackageData();\r
+ // PowerMockito.mockStatic(PackageManager.class);\r
+ // PowerMockito.when(manager.addPackage(packageData)).thenReturn(packageData);\r
+ // PowerMock.replayAll();\r
+ PackageData packageData = new PackageData();\r
+ packageData = getPackageData();\r
+ manager.addPackage(packageData);\r
+ }\r
\r
- FormDataContentDisposition fileDetail =\r
- FormDataContentDisposition.name("fileName").fileName("NanocellGW.csar").build();\r
+ // @Ignore\r
+ @Test\r
+ public void testUploadPackage() throws Exception {\r
+ InputStream ins = null;\r
+ Response result = null;\r
+ Response result1 = null;\r
+ Response result2 = null;\r
+ // PackageData packageData = new PackageData();\r
+ // packageData = getPackageData();\r
\r
- try {\r
- resourcePath = HibernateSession.class.getResource("/").toURI().getPath();\r
- } catch (URISyntaxException e) {\r
- e.printStackTrace();\r
- }\r
- final String filename = "NanocellGW.csar";\r
- File packageFile = new File(resourcePath + filename);\r
- try {\r
- ins = new FileInputStream(packageFile);\r
- } catch (FileNotFoundException e) {\r
- e.printStackTrace();\r
- }\r
- if (ins != null) {\r
- try {\r
- result = PackageWrapper.getInstance().uploadPackage(ins, fileDetail, null);\r
- } catch (Exception e) {\r
- e.printStackTrace();\r
- }\r
- }\r
- assertEquals(200, result.getStatus());\r
- assertNotNull(result.getEntity());\r
+ FormDataContentDisposition fileDetail =\r
+ FormDataContentDisposition.name("fileName").fileName("NanocellGW.csar").build();\r
+\r
+ try {\r
+ resourcePath = HibernateSession.class.getResource("/").toURI().getPath();\r
+ } catch (URISyntaxException e1) {\r
+ e1.printStackTrace();\r
+ }\r
+ final String filename = "NanocellGW.csar";\r
+ File packageFile = new File(resourcePath + filename);\r
+ try {\r
+ ins = new FileInputStream(packageFile);\r
+ } catch (FileNotFoundException e2) {\r
+ e2.printStackTrace();\r
+ }\r
+ if (ins != null) {\r
+ try {\r
+ result = PackageWrapper.getInstance().uploadPackage(ins, fileDetail, null);\r
+ } catch (Exception e3) {\r
+ e3.printStackTrace();\r
+ }\r
+ }\r
+ assertEquals(200, result.getStatus());\r
+ assertNotNull(result.getEntity());\r
\r
- try {\r
- result1 = PackageWrapper.getInstance().uploadPackage(null, fileDetail, null);\r
- } catch (Exception e) {\r
- e.printStackTrace();\r
- }\r
- assertEquals(500, result1.getStatus());\r
+ try {\r
+ result1 = PackageWrapper.getInstance().uploadPackage(null, fileDetail, null);\r
+ } catch (Exception e4) {\r
+ e4.printStackTrace();\r
+ }\r
+ assertEquals(500, result1.getStatus());\r
\r
- try {\r
- result2 = PackageWrapper.getInstance().uploadPackage(ins, null, null);\r
- } catch (Exception e) {\r
- e.printStackTrace();\r
- }\r
- assertEquals(500, result2.getStatus());\r
+ try {\r
+ result2 = PackageWrapper.getInstance().uploadPackage(ins, null, null);\r
+ } catch (Exception e5) {\r
+ e5.printStackTrace();\r
}\r
+ assertEquals(500, result2.getStatus());\r
+ }\r
\r
- @Test\r
- public void testQueryPackageById() throws Exception {\r
-
ArrayList<PackageMeta> metas = new ArrayList<PackageMeta>();
\r- metas = getPackageMetaList();\r
- // PackageManager packageManager = mock(PackageManager.class);\r
- // when(packageManager.queryPackageByCsarId(anyString())).thenThrow(new Exception());\r
- // PowerMockito.whenNew(PackageManager.class).withNoArguments().thenReturn(packageManager);\r
- // PowerMockito.mockStatic(PackageManager.class);\r
- // PowerMockito.when(PackageManager.getInstance()).thenReturn(manager);\r
- // PowerMock.replayAll();\r
- // when(manager.queryPackageByCsarId(anyString())).thenThrow(new Exception());\r
- // PowerMockito.whenNew(PackageManager.class).withNoArguments().thenReturn(manager);\r
+ @Test\r
+ public void testQueryPackageById() throws Exception {\r
+ ArrayList<PackageMeta> metas = new ArrayList<PackageMeta>();\r
+ metas = getPackageMetaList();\r
+ // PackageManager packageManager = mock(PackageManager.class);\r
+ // when(packageManager.queryPackageByCsarId(anyString())).thenThrow(new Exception());\r
+ // PowerMockito.whenNew(PackageManager.class).withNoArguments().thenReturn(packageManager);\r
+ // PowerMockito.mockStatic(PackageManager.class);\r
+ // PowerMockito.when(PackageManager.getInstance()).thenReturn(manager);\r
+ // PowerMock.replayAll();\r
+ // when(manager.queryPackageByCsarId(anyString())).thenThrow(new Exception());\r
+ // PowerMockito.whenNew(PackageManager.class).withNoArguments().thenReturn(manager);\r
\r
- Response result = PackageWrapper.getInstance().queryPackageById("1");\r
- assertEquals(200, result.getStatus());\r
- assertEquals(metas, result.getEntity());\r
+ Response result = PackageWrapper.getInstance().queryPackageById("1");\r
+ assertEquals(200, result.getStatus());\r
+ assertEquals(metas, result.getEntity());\r
\r
- }\r
+ }\r
\r
- @Test\r
- public void testQueryPackageByCond() {\r
-
ArrayList<PackageMeta> metas = new ArrayList<PackageMeta>();
\r- metas = getPackageMetaList();\r
- System.out.println("Test query package by Id");\r
- Response result =\r
- PackageWrapper.getInstance().queryPackageListByCond("NanocellGW", "ZTE", "V1.0",\r
- "false", "NSAR");\r
- assertEquals(200, result.getStatus());\r
- assertEquals(metas, result.getEntity());\r
- }\r
+ @Test\r
+ public void testQueryPackageByCond() {\r
+ ArrayList<PackageMeta> metas = new ArrayList<PackageMeta>();\r
+ metas = getPackageMetaList();\r
+ System.out.println("Test query package by Id");\r
+ Response result =\r
+ PackageWrapper.getInstance().queryPackageListByCond("NanocellGW", "ZTE", "V1.0", "false",\r
+ "NSAR");\r
+ assertEquals(200, result.getStatus());\r
+ assertEquals(metas, result.getEntity());\r
+ }\r
\r
- @Test\r
- public void testUpdatePackageStatus() {\r
- System.out.println("Test update package status");\r
- Response result =\r
- PackageWrapper.getInstance().updatePackageStatus("1", "Enabled", "NotInUse",\r
- "true", "onBoarding", "true");\r
- assertEquals(200, result.getStatus());\r
- }\r
+ @Test\r
+ public void testUpdatePackageStatus() {\r
+ System.out.println("Test update package status");\r
+ Response result =\r
+ PackageWrapper.getInstance().updatePackageStatus("1", "Enabled", "NotInUse", "true",\r
+ "onBoarding", "true");\r
+ assertEquals(200, result.getStatus());\r
+ }\r
\r
- @Test\r
- public void testGetCsarFileUri() {\r
- System.out.println("Test get csar file uri ");\r
- CsarFileUriResponse expectResult = new CsarFileUriResponse();\r
- String csarFileUri =\r
- MsbAddrConfig.getMsbAddress()\r
- + "/NSAR/ZTE/NanocellGW/v1.0/NanocellGW/images/segw.img";\r
- String localUri =\r
- HttpServerPathConfig.getHttpServerPath()\r
- + "NSAR/ZTE/NanocellGW/v1.0/NanocellGW/images/segw.img";\r
- File srcDir = new File(localUri);\r
- String localPath = srcDir.getAbsolutePath().replace("\\", "/");\r
+ @Test\r
+ public void testGetCsarFileUri() {\r
+ System.out.println("Test get csar file uri ");\r
+ CsarFileUriResponse expectResult = new CsarFileUriResponse();\r
+ String csarFileUri =\r
+ MsbAddrConfig.getMsbAddress() + "/NSAR/ZTE/NanocellGW/v1.0/NanocellGW/images/segw.img";\r
+ String localUri =\r
+ HttpServerPathConfig.getHttpServerPath()\r
+ + "NSAR/ZTE/NanocellGW/v1.0/NanocellGW/images/segw.img";\r
+ File srcDir = new File(localUri);\r
+ String localPath = srcDir.getAbsolutePath().replace("\\", "/");\r
\r
- expectResult.setDownloadUri(csarFileUri);\r
- expectResult.setLocalPath(localPath);\r
- Response result = PackageWrapper.getInstance().getCsarFileUri("1", "/images/segw.img");\r
- assertEquals(200, result.getStatus());\r
- assertEquals(expectResult, result.getEntity());\r
- }\r
+ expectResult.setDownloadUri(csarFileUri);\r
+ expectResult.setLocalPath(localPath);\r
+ Response result = PackageWrapper.getInstance().getCsarFileUri("1", "/images/segw.img");\r
+ assertEquals(200, result.getStatus());\r
+ assertEquals(expectResult, result.getEntity());\r
+ }\r
\r
- @Ignore\r
- @Test\r
- public void testGetPlansUri() {\r
- System.out.println("Test get csar plans uri ");\r
- ArrayList<FileLink> expectResult = new ArrayList<FileLink>();\r
- FileLink fileLink1 = new FileLink();\r
- FileLink fileLink2 = new FileLink();\r
- fileLink1.setFileName("init.zip");\r
- fileLink1.setDownloadUri(MsbAddrConfig.getMsbAddress()\r
- + "/NSAR/ZTE/NanocellGW/v1.0/Plans/init.zip");\r
- expectResult.add(fileLink1);\r
- fileLink2.setFileName("delete.zip");\r
- fileLink2.setDownloadUri(MsbAddrConfig.getMsbAddress()\r
- + "/NSAR/ZTE/NanocellGW/v1.0/Plans/delete.zip");\r
- expectResult.add(fileLink2);\r
- Response result = PackageWrapper.getInstance().getCsarPlansUri("1");\r
- assertEquals(200, result.getStatus());\r
- assertEquals(expectResult, result.getEntity());\r
- }\r
+ @Ignore\r
+ @Test\r
+ public void testGetPlansUri() {\r
+ System.out.println("Test get csar plans uri ");\r
+ ArrayList<FileLink> expectResult = new ArrayList<FileLink>();\r
+ FileLink fileLink1 = new FileLink();\r
+ fileLink1.setFileName("init.zip");\r
+ fileLink1.setDownloadUri(MsbAddrConfig.getMsbAddress()\r
+ + "/NSAR/ZTE/NanocellGW/v1.0/Plans/init.zip");\r
+ expectResult.add(fileLink1);\r
+ FileLink fileLink2 = new FileLink();\r
+ fileLink2.setFileName("delete.zip");\r
+ fileLink2.setDownloadUri(MsbAddrConfig.getMsbAddress()\r
+ + "/NSAR/ZTE/NanocellGW/v1.0/Plans/delete.zip");\r
+ expectResult.add(fileLink2);\r
+ Response result = PackageWrapper.getInstance().getCsarPlansUri("1");\r
+ assertEquals(200, result.getStatus());\r
+ assertEquals(expectResult, result.getEntity());\r
+ }\r
\r
- @Test\r
- public void testDelPackage() {\r
- System.out.println("Test delete package ");\r
- Response result = PackageWrapper.getInstance().delPackage("1");\r
- assertEquals(204, result.getStatus());\r
- try {\r
- Thread.sleep(5000);\r
- } catch (InterruptedException e) {\r
- e.printStackTrace();\r
- }\r
+ @Test\r
+ public void testDelPackage() {\r
+ System.out.println("Test delete package ");\r
+ Response result = PackageWrapper.getInstance().delPackage("1");\r
+ assertEquals(204, result.getStatus());\r
+ try {\r
+ Thread.sleep(5000);\r
+ } catch (InterruptedException e1) {\r
+ e1.printStackTrace();\r
}\r
+ }\r
\r
- @After\r
- public void tearDown() throws Exception {\r
- ArrayList<PackageData> packageList = manager.queryPackageByCsarId("1");\r
- if (packageList != null && packageList.size() != 0) {\r
- manager.deletePackage("1");\r
- } else {\r
- return;\r
- }\r
- System.out.println("Tear down");\r
+ /**\r
+ * delete data after test.\r
+ */\r
+ @After\r
+ public void tearDown() throws Exception {\r
+ ArrayList<PackageData> packageList = manager.queryPackageByCsarId("1");\r
+ if (packageList != null && packageList.size() != 0) {\r
+ manager.deletePackage("1");\r
+ } else {\r
+ return;\r
}\r
+ System.out.println("Tear down");\r
+ }\r
\r
- @AfterClass\r
- public static void tearDownAfterClass() {\r
- try {\r
- HibernateSession.destory();\r
- DaoManager.getInstance().setDaoNull();\r
- H2DbServer.shutDown();\r
- } catch (Exception e) {\r
- Assert.fail("Exception" + e.getMessage());\r
- }\r
+ /**\r
+ * destory db session after class.\r
+ * @throws Exception e\r
+ */\r
+ @AfterClass\r
+ public static void tearDownAfterClass() {\r
+ try {\r
+ HibernateSession.destory();\r
+ DaoManager.getInstance().setDaoNull();\r
+ H2DbServer.shutDown();\r
+ } catch (Exception e1) {\r
+ Assert.fail("Exception" + e1.getMessage());\r
}\r
+ }\r
\r
- private PackageData getPackageData() {\r
- PackageData packageData = new PackageData();\r
- packageData.setCsarId("1");\r
- packageData.setCreateTime("2016-06-29 03:33:15");\r
- packageData.setDeletionPending("false");\r
- packageData.setDownloadUri("/NSAR/ZTE/NanocellGW/v1.0/");\r
- packageData.setFormat("yml");\r
- packageData.setModifyTime("2016-06-29 03:33:15");\r
- packageData.setName("NanocellGW");\r
- packageData.setOnBoardState("non-onBoarded");\r
- packageData.setOperationalState("Disabled");\r
- packageData.setProvider("ZTE");\r
- packageData.setSize("0.93M");\r
- packageData.setType("NSAR");\r
- packageData.setUsageState("InUse");\r
- packageData.setVersion("V1.0");\r
- packageData.setProcessState("normal");\r
- return packageData;\r
- }\r
+ private PackageData getPackageData() {\r
+ PackageData packageData = new PackageData();\r
+ packageData.setCsarId("1");\r
+ packageData.setCreateTime("2016-06-29 03:33:15");\r
+ packageData.setDeletionPending("false");\r
+ packageData.setDownloadUri("/NSAR/ZTE/NanocellGW/v1.0/");\r
+ packageData.setFormat("yml");\r
+ packageData.setModifyTime("2016-06-29 03:33:15");\r
+ packageData.setName("NanocellGW");\r
+ packageData.setOnBoardState("non-onBoarded");\r
+ packageData.setOperationalState("Disabled");\r
+ packageData.setProvider("ZTE");\r
+ packageData.setSize("0.93M");\r
+ packageData.setType("NSAR");\r
+ packageData.setUsageState("InUse");\r
+ packageData.setVersion("V1.0");\r
+ packageData.setProcessState("normal");\r
+ return packageData;\r
+ }\r
\r
-
private ArrayList<PackageData> getPackageDataList() {
\r-
ArrayList<PackageData> packageDataList = new ArrayList<PackageData>();
\r- PackageData packageData = new PackageData();\r
- packageData = getPackageData();\r
- packageDataList.add(packageData);\r
- return packageDataList;\r
- }\r
+ private ArrayList<PackageData> getPackageDataList() {\r
+ ArrayList<PackageData> packageDataList = new ArrayList<PackageData>();\r
+ PackageData packageData = new PackageData();\r
+ packageData = getPackageData();\r
+ packageDataList.add(packageData);\r
+ return packageDataList;\r
+ }\r
\r
-
private ArrayList<PackageMeta> getPackageMetaList() {
\r- ArrayList<PackageMeta> metas = new ArrayList<PackageMeta>();\r
- PackageMeta meta = new PackageMeta();\r
- meta.setCreateTime("2016-06-29 03:33:15");\r
- meta.setCsarId("1");\r
- meta.setDeletionPending(false);\r
- meta.setDownloadUri(MsbAddrConfig.getMsbAddress()\r
- + "/NSAR/ZTE/NanocellGW/v1.0/NanocellGW.csar");\r
- meta.setFormat("yml");\r
- meta.setModifyTime("2016-06-29 03:33:15");\r
- meta.setName("NanocellGW");\r
- meta.setOperationalState(EnumOperationalState.valueOf("Disabled"));\r
- meta.setProvider("ZTE");\r
- meta.setSize("0.93M");\r
- meta.setType("NSAR");\r
- meta.setUsageState(EnumUsageState.valueOf("InUse"));\r
- meta.setVersion("V1.0");\r
- meta.setOnBoardState(EnumOnboardState.nonOnBoarded.getValue());\r
- meta.setProcessState(EnumProcessState.valueOf("normal"));\r
- metas.add(meta);\r
- return metas;\r
- }\r
+ private ArrayList<PackageMeta> getPackageMetaList() {\r
+ PackageMeta meta = new PackageMeta();\r
+ meta.setCreateTime("2016-06-29 03:33:15");\r
+ meta.setCsarId("1");\r
+ meta.setDeletionPending(false);\r
+ meta.setDownloadUri(MsbAddrConfig.getMsbAddress() \r
+ + "/NSAR/ZTE/NanocellGW/v1.0/NanocellGW.csar");\r
+ meta.setFormat("yml");\r
+ meta.setModifyTime("2016-06-29 03:33:15");\r
+ meta.setName("NanocellGW");\r
+ meta.setOperationalState(EnumOperationalState.valueOf("Disabled"));\r
+ meta.setProvider("ZTE");\r
+ meta.setSize("0.93M");\r
+ meta.setType("NSAR");\r
+ meta.setUsageState(EnumUsageState.valueOf("InUse"));\r
+ meta.setVersion("V1.0");\r
+ meta.setOnBoardState(EnumOnboardState.nonOnBoarded.getValue());\r
+ meta.setProcessState(EnumProcessState.valueOf("normal"));\r
+ ArrayList<PackageMeta> metas = new ArrayList<PackageMeta>();\r
+ metas.add(meta);\r
+ return metas;\r
+ }\r
}\r
@REM\r
-@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+@REM Copyright 2016 [ZTE] and others.\r
@REM\r
@REM Licensed under the Apache License, Version 2.0 (the "License");\r
@REM you may not use this file except in compliance with the License.\r
@REM You may obtain a copy of the License at\r
@REM\r
-@REM http://www.apache.org/licenses/LICENSE-2.0\r
+@REM http://www.apache.org/licenses/LICENSE-2.0\r
@REM\r
@REM Unless required by applicable law or agreed to in writing, software\r
@REM distributed under the License is distributed on an "AS IS" BASIS,\r
@REM See the License for the specific language governing permissions and\r
@REM limitations under the License.\r
@REM\r
+\r
@echo off\r
title catalog\r
\r
-#!/bin/sh
-#
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+#
+# Copyright 2016 [ZTE] and others.
#
# 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
+# 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,
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
DIRNAME=`dirname $0`
RUNHOME=`cd $DIRNAME/; pwd`
echo @RUNHOME@ $RUNHOME
@REM\r
-@REM Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)\r
+@REM Copyright 2016 [ZTE] and others.\r
@REM\r
@REM Licensed under the Apache License, Version 2.0 (the "License");\r
@REM you may not use this file except in compliance with the License.\r
@REM You may obtain a copy of the License at\r
@REM\r
-@REM http://www.apache.org/licenses/LICENSE-2.0\r
+@REM http://www.apache.org/licenses/LICENSE-2.0\r
@REM\r
@REM Unless required by applicable law or agreed to in writing, software\r
@REM distributed under the License is distributed on an "AS IS" BASIS,\r
@REM See the License for the specific language governing permissions and\r
@REM limitations under the License.\r
@REM\r
+\r
@echo off\r
title catalog\r
\r
#!/bin/sh
#
-# Copyright (C) 2016 ZTE, Inc. and others. All rights reserved. (ZTE)
+# Copyright 2016 [ZTE] and others.
#
# 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
+# 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,
# See the License for the specific language governing permissions and
# limitations under the License.
#
+
+
DIRNAME=`dirname $0`
RUNHOME=`cd $DIRNAME/; pwd`
echo @RUNHOME@ $RUNHOME
<?xml version='1.0' encoding='utf-8'?>\r
<!--\r
- Licensed to the Apache Software Foundation (ASF) under one or more\r
- contributor license agreements. See the NOTICE file distributed with\r
- this work for additional information regarding copyright ownership.\r
- The ASF licenses this file to You under the Apache License, Version 2.0\r
- (the "License"); you may not use this file except in compliance with\r
- the License. You may obtain a copy of the License at\r
-\r
- http://www.apache.org/licenses/LICENSE-2.0\r
-\r
- Unless required by applicable law or agreed to in writing, software\r
- distributed under the License is distributed on an "AS IS" BASIS,\r
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
- See the License for the specific language governing permissions and\r
- limitations under the License.\r
+\r
+ Copyright 2016 [ZTE] and others.\r
+\r
+ Licensed under the Apache License, Version 2.0 (the "License");\r
+ you may not use this file except in compliance with the License.\r
+ You may obtain a copy of the License at\r
+\r
+ http://www.apache.org/licenses/LICENSE-2.0\r
+\r
+ Unless required by applicable law or agreed to in writing, software\r
+ distributed under the License is distributed on an "AS IS" BASIS,\r
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.\r
+ See the License for the specific language governing permissions and\r
+ limitations under the License.\r
+\r
-->\r
<!-- Note: A "Server" is not itself a "Container", so you may not\r
define subcomponents such as "Valves" at this level.\r
Code Review / vfc / nfvo / catalog.git / commitdiff