renamed objects from Czech to English

Author: martin-kuba

cloud/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.33</version>
+        <version>3.34</version>
     </parent>
 
     <artifactId>cloud</artifactId>

cloud/src/main/java/cz/cesnet/meta/cloud/NebulaCloudLoader.java

@@ -7,7 +7,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.33</version>
+        <version>3.34</version>
     </parent>
 
     <artifactId>metaacct</artifactId>

cloud/src/main/java/cz/cesnet/meta/cloud/Owner.java

@@ -5,7 +5,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.33</version>
+        <version>3.34</version>
     </parent>
 
     <artifactId>metaacct_cmd</artifactId>

metaacct/pom.xml

@@ -1,10 +1,10 @@
 package cz.cesnet.meta.acct.hw.perun;
 
 import cz.cesnet.meta.acct.hw.Perun;
+import cz.cesnet.meta.perun.api.PerunMachine;
 import cz.cesnet.meta.perun.api.PerunUser;
-import cz.cesnet.meta.perun.api.Stroj;
-import cz.cesnet.meta.perun.api.VypocetniCentrum;
-import cz.cesnet.meta.perun.api.VypocetniZdroj;
+import cz.cesnet.meta.perun.api.OwnerOrganisation;
+import cz.cesnet.meta.perun.api.PerunComputingResource;
 import cz.cesnet.meta.perun.impl.PerunJsonImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -31,12 +31,12 @@ public void setPerunJson(PerunJsonImpl perunJson) {
 
     @Override
     public Set<String> getFrontendNames() {
-        return this.perunJson.getVyhledavacFrontendu().getMnozinaJmen();
+        return this.perunJson.getFrontendFinder().getNames();
     }
 
     @Override
     public Set<String> getReservedMachinesNames() {
-        return this.perunJson.getVyhledavacVyhrazenychStroju().getMnozinaJmen();
+        return this.perunJson.getReservedMachinesFinder().getNames();
     }
 
     @Override
@@ -47,20 +47,20 @@ public List<PerunUser> getAllUsers() {
     @Override
     public List<ComputingResource> getComputingResources() {
         List<ComputingResource> resources = new ArrayList<ComputingResource>();
-        for (VypocetniCentrum centrum : perunJson.najdiVypocetniCentra()) {
-            for (VypocetniZdroj zdroj : centrum.getZdroje()) {
-                ComputingResource cr = new ComputingResource(zdroj.getId(), zdroj.getNazev(), zdroj.isCluster());
+        for (OwnerOrganisation centrum : perunJson.findOwnerOrganisations()) {
+            for (PerunComputingResource zdroj : centrum.getPerunComputingResources()) {
+                ComputingResource cr = new ComputingResource(zdroj.getId(), zdroj.getName(), zdroj.isCluster());
                 log.debug("zdroj =  {}", zdroj);
                 if (zdroj.isCluster()) {
-                    List<Stroj> stroje = zdroj.getStroje();
+                    List<PerunMachine> stroje = zdroj.getPerunMachines();
                     List<Machine> machines = new ArrayList<>(stroje.size());
-                    for (Stroj stroj : stroje) {
-                        machines.add(new Machine(stroj.getName(), stroj.getCpuNum()));
+                    for (PerunMachine perunMachine : stroje) {
+                        machines.add(new Machine(perunMachine.getName(), perunMachine.getCpuNum()));
                     }
                     cr.setMachines(machines);
                 } else {
-                    Stroj stroj = zdroj.getStroj();
-                    cr.setMachine(new Machine(stroj.getName(), stroj.getCpuNum()));
+                    PerunMachine perunMachine = zdroj.getPerunMachine();
+                    cr.setMachine(new Machine(perunMachine.getName(), perunMachine.getCpuNum()));
                 }
                 resources.add(cr);
             }

metaacct_cmd/pom.xml

@@ -4,7 +4,7 @@
     <parent>
         <groupId>cz.metacentrum</groupId>
         <artifactId>accounting-parent</artifactId>
-        <version>3.33</version>
+        <version>3.34</version>
     </parent>
 
     <artifactId>pbsmon</artifactId>

metaacct_cmd/src/main/java/cz/cesnet/meta/acct/hw/perun/PerunHwJsonImpl.java

@@ -5,8 +5,8 @@
 import cz.cesnet.meta.cloud.OpenStackCloudLoader;
 import cz.cesnet.meta.pbs.*;
 import cz.cesnet.meta.perun.api.Perun;
-import cz.cesnet.meta.perun.api.Stroj;
-import cz.cesnet.meta.perun.api.VypocetniZdroj;
+import cz.cesnet.meta.perun.api.PerunComputingResource;
+import cz.cesnet.meta.perun.api.PerunMachine;
 import cz.cesnet.meta.perun.impl.PerunJsonImpl;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -39,10 +39,10 @@ public static void main(String[] args) {
     }
     public static void main2(String[] args) {
         Perun perun = new PerunJsonImpl(Arrays.asList("/etc/pbsmon/pbsmon_machines.json"), Collections.emptyList());
-        VypocetniZdroj bofurA = perun.getVypocetniZdrojByName("cerit-hde-ostack.priv.cloud.muni.cz");
-        List<Stroj> stroje = bofurA.getStroje();
-        for (Stroj stroj : stroje) {
-            System.out.println("stroj = " + stroj);
+        PerunComputingResource bofurA = perun.getPerunComputingResourceByName("cerit-hde-ostack.priv.cloud.muni.cz");
+        List<PerunMachine> stroje = bofurA.getPerunMachines();
+        for (PerunMachine perunMachine : stroje) {
+            System.out.println("perunMachine = " + perunMachine);
         }
 
     }