Amit Aviram has uploaded a new change for review. Change subject: <core | restapi | tools | history | engine | userportal | webadmin>: short summary under 50 chars ......................................................................
<core | restapi | tools | history | engine | userportal | webadmin>: short summary under 50 chars Longer description using lines' length under 72 chars. With multiple paragraphs if necessary. Change-Id: Iec3eb2154ad6f64ba78ede6fec9d1dc51e648cd2 Bug-Url: https://bugzilla.redhat.com/?????? Signed-off-by: Amit Aviram <[email protected]> --- M backend/manager/modules/ovirt-import-proxy/pom.xml M backend/manager/modules/ovirt-import-proxy/src/main/java/org/ovirt/import_proxy/ImportServlet.java 2 files changed, 100 insertions(+), 7 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/87/41287/1 diff --git a/backend/manager/modules/ovirt-import-proxy/pom.xml b/backend/manager/modules/ovirt-import-proxy/pom.xml index 124cd6e..e2f4bc0 100644 --- a/backend/manager/modules/ovirt-import-proxy/pom.xml +++ b/backend/manager/modules/ovirt-import-proxy/pom.xml @@ -1,4 +1,22 @@ -<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; +<!--<project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";>--> + <!--<modelVersion>4.0.0</modelVersion>--> + + <!--<parent>--> + <!--<groupId>org.ovirt.engine.core</groupId>--> + <!--<artifactId>manager-modules</artifactId>--> + <!--<version>3.6.0-SNAPSHOT</version>--> + <!--</parent>--> + + <!--<artifactId>import-proxy</artifactId>--> + <!--<groupId>org.ovirt.engine.import</groupId>--> + <!--<packaging>pom</packaging>--> + <!--<name>amit the king</name>--> +<!--</project>--> + + + + + <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd";> <modelVersion>4.0.0</modelVersion> <groupId>org.ovirt</groupId> @@ -35,6 +53,12 @@ </dependencyManagement> + <parent> + <groupId>org.ovirt.engine.core</groupId> + <artifactId>manager-modules</artifactId> + <version>3.6.0-SNAPSHOT</version> + </parent> + <dependencies> <!-- not sure if we need this --> <!-- @@ -44,12 +68,43 @@ <scope>provided</scope> </dependency> --> + <!--<dependency>--> + <!--<groupId>org.ovirt.engine.core</groupId>--> + <!--<artifactId>manager-modules</artifactId>--> + <!--<version>3.6.0-SNAPSHOT</version>--> + <!--</dependency>--> + + + <!--<dependency>--> + <!--<groupId>org.ovirt.engine.core</groupId>--> + <!--<artifactId>bll</artifactId>--> + <!--<version>3.6.0-SNAPSHOT</version>--> + <!--<scope>provided</scope>--> + <!--</dependency>--> <dependency> <groupId>org.ovirt.engine.core</groupId> - <artifactId>bll</artifactId> + <artifactId>common</artifactId> <version>3.6.0-SNAPSHOT</version> - <scope>provided</scope> + <scope>compile</scope> </dependency> + <dependency> + <groupId>org.ovirt.engine.core</groupId> + <artifactId>compat</artifactId> + <version>3.6.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <dependency> + <groupId>org.ovirt.engine.core</groupId> + <artifactId>vdsbroker</artifactId> + <version>3.6.0-SNAPSHOT</version> + <scope>compile</scope> + </dependency> + <!--<dependency>--> + <!--<groupId>org.ovirt.engine.core</groupId>--> + <!--<artifactId>dal</artifactId>--> + <!--<version>3.6.0-SNAPSHOT</version>--> + <!--<scope>compile</scope>--> + <!--</dependency>--> <dependency> <groupId>org.jboss.spec.javax.servlet</groupId> diff --git a/backend/manager/modules/ovirt-import-proxy/src/main/java/org/ovirt/import_proxy/ImportServlet.java b/backend/manager/modules/ovirt-import-proxy/src/main/java/org/ovirt/import_proxy/ImportServlet.java index ed3e7ac..5e52e98 100644 --- a/backend/manager/modules/ovirt-import-proxy/src/main/java/org/ovirt/import_proxy/ImportServlet.java +++ b/backend/manager/modules/ovirt-import-proxy/src/main/java/org/ovirt/import_proxy/ImportServlet.java @@ -1,15 +1,17 @@ package org.ovirt.import_proxy; -import org.ovirt.engine.core.bll.AddDiskCommand; +import org.ovirt.engine.core.common.vdscommands.UploadStreamVDSCommandParameters; +import org.ovirt.engine.core.compat.Guid; +import org.ovirt.engine.core.vdsbroker.irsbroker.UploadStreamVDSCommand; import javax.servlet.ServletException; import javax.servlet.annotation.WebServlet; import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import java.io.BufferedOutputStream; import java.io.File; -import java.io.FileOutputStream; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; import java.io.RandomAccessFile; @@ -41,7 +43,7 @@ @Override protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException { addCORS(response); - + testHttpUpload(); deb("Reached doPost. getting info."); String name = request.getHeader("X-File-Name"); @@ -65,6 +67,42 @@ response.setStatus(HttpServletResponse.SC_OK); } + private void testHttpUpload() { + //updateParameters(); + //MoveDiskParameters params = moveDiskParametersList.get(0); + + File file = new File("/delMe"); + FileInputStream fis = null; + + try { + fis = new FileInputStream(file); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } + + // 1. vds ID + // 2. pool + // 3. disk + Guid a; + Guid vdsID = new Guid("32086278-d9ff-481e-8161-493b10e6e824"); + Guid poolID = new Guid("00000001-0001-0001-0001-00000000019b"); + Guid domainID = new Guid("88d88fd2-a03b-4bc6-a3d9-6b454494b6fa"); + Guid diskID = new Guid("67337836-92e4-480b-815e-c8732814c922"); + Guid imageID = new Guid("7bfd32a3-2ec1-4950-9094-bf5b1c980998"); + UploadStreamVDSCommandParameters vdsCommandParameters = + new UploadStreamVDSCommandParameters( + vdsID, + poolID, + domainID, + diskID, + imageID, + file.length(), + fis); + + UploadStreamVDSCommand uploadCommand = new UploadStreamVDSCommand(vdsCommandParameters); + uploadCommand.execute(); + } + private void writeToFile(String name, byte[] buffer, long offset, int bytes) throws ServletException, IOException { deb("Writing part: offset is " + Long.toString(offset)); File file = new File(this.path + name); -- To view, visit https://gerrit.ovirt.org/41287 To unsubscribe, visit https://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iec3eb2154ad6f64ba78ede6fec9d1dc51e648cd2 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Amit Aviram <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
