[workspace-commit] CVS update: MODIFIED: network

[Tim Freeman]

, AssociationAdapter.java ...

  User: tfreeman
  Date: 08/04/17 10:23:02

  Modified:    vm/service/service/java/source/src/org/globus/workspace/network
                        AssociationAdapter.java AssociationEntry.java
  Log:
  centralized MAC allocation (this means backend .conf file may finally be exactly duplicated across cluster)
  
  Revision  Changes    Path
  1.3       +11 -0     workspace/vm/service/service/java/source/src/org/globus/workspace/network/AssociationAdapter.java
  
  http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/service/java/source/src/org/globus/workspace/network/AssociationAdapter.java.diff?r1=1.2&r2=1.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AssociationAdapter.java
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/service/java/source/src/org/globus/workspace/network/AssociationAdapter.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- AssociationAdapter.java	2 Nov 2007 14:47:08 -0000	1.2
  +++ AssociationAdapter.java	17 Apr 2008 15:23:02 -0000	1.3
  @@ -51,4 +51,15 @@
   
               throws WorkspaceException;
   
  +    /**
  +     * @return new, unique MAC address; NULL if adapter is not configured to
  +     *         assign MAC addresses
  +     * @throws WorkspaceResourceRequestDeniedException thrown if adapter is
  +     *         configured to assign MAC addrs but no unique MACs are available
  +     */
  +    public String newMAC()
  +            
  +            throws WorkspaceResourceRequestDeniedException;
  +    
  +
   }
  
  
  
  1.3       +14 -0     workspace/vm/service/service/java/source/src/org/globus/workspace/network/AssociationEntry.java
  
  http://viewcvs.globus.org/viewcvs.cgi/workspace/vm/service/service/java/source/src/org/globus/workspace/network/AssociationEntry.java.diff?r1=1.2&r2=1.3
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: AssociationEntry.java
  ===================================================================
  RCS file: /home/globdev/CVS/globus-packages/workspace/vm/service/service/java/source/src/org/globus/workspace/network/AssociationEntry.java,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -b -r1.2 -r1.3
  --- AssociationEntry.java	2 Nov 2007 14:47:08 -0000	1.2
  +++ AssociationEntry.java	17 Apr 2008 15:23:02 -0000	1.3
  @@ -20,12 +20,14 @@
   
       private String hostname;
       private String ipAddress;
  +    private String mac;
       private String broadcast;
       private String subnetMask;
       private String gateway;
       private boolean inUse;
   
       public AssociationEntry(String ipAddress,
  +                            String macAddress,
                               String hostname,
                               String gateway,
                               String broadcast,
  @@ -34,6 +36,9 @@
           if (ipAddress != null) {
               this.ipAddress = ipAddress.trim();
           }
  +        if (macAddress != null) {
  +            this.mac = macAddress.trim();
  +        }
           if (hostname != null) {
               this.hostname = hostname.trim();
           }
  @@ -72,6 +77,14 @@
           this.ipAddress = ipAddress;
       }
   
  +    public String getMac() {
  +        return this.mac;
  +    }
  +
  +    public void setMac(String macAddress) {
  +        this.mac = macAddress;
  +    }
  +
       public String getBroadcast() {
           return this.broadcast;
       }
  @@ -100,6 +113,7 @@
           return "Entry{" +
                   "hostname='" + this.hostname + '\'' +
                   ", ipAddress='" + this.ipAddress + '\'' +
  +                ", mac='" + this.mac + '\'' +
                   ", gateway='" + this.gateway + '\'' +
                   ", broadcast='" + this.broadcast + '\'' +
                   ", subnetMask='" + this.subnetMask + '\'' +